libre/libretools: upgpkg v20240221.1

2 files changed, 8 insertions, 57 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 7865bf2b3..b4bfb4679 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,12 +9,10 @@ pkgdesc="Programs for Parabola development"
 url="https://git.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20240221
-source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        disable-ronn.patch)
-sha256sums=('b0417f7baec944bbc111560ab0b3bb612e487395104f7c4d8913af9d5cb9a834'
-            'SKIP'
-            '2ba2b2e048db29a12699ba2de0c023b5cc87035a6f26ee25734a35a490345dbf')
+pkgver=20240221.1
+source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+sha256sums=('1058ac92d0e660c23f12bc752490f8ae029c7103f68ea5d7223309efe86602ca'
+            'SKIP')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
               'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
@@ -31,13 +29,12 @@ checkdepends=(
   tokyocabinet
 )
 
-prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  patch -N -p1 -i $srcdir/disable-ronn.patch
-}
-
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
+
+  # Disable the manpages for now.
+  sed -i 's/enable_manpages.*/enable_manpages =/' config.mk
+
   make
 }
 
diff --git a/libre/libretools/disable-ronn.patch b/libre/libretools/disable-ronn.patch
deleted file mode 100644
index 660258365..000000000
--- a/libre/libretools/disable-ronn.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: libretools-20220118/build-aux/Makefile.each.tail/20-libretools.mk
-===================================================================
---- libretools-20220118.orig/build-aux/Makefile.each.tail/20-libretools.mk
-+++ libretools-20220118/build-aux/Makefile.each.tail/20-libretools.mk
-@@ -55,9 +55,9 @@ _is_executable = $(filter $(libretools.o
- $(outdir)/%: $(srcdir)/%.in
- 	@echo 'EDIT < $< > $@'; $(libretools.edit) < '$<' | install -T -m$(if $(_is_executable),755,644) /dev/stdin '$@'
- $(outdir)/%: $(srcdir)/%.ronn
--	ronn --roff $(RONNFLAGS) < '$<' > '$@'
-+	@echo "SKIP ronn --roff $(RONNFLAGS) < '$<' > '$@'"
- $(outdir)/%.html: $(srcdir)/%.ronn
--	ronn --html $(RONNFLAGS) < '$<' > '$@'
-+	@echo "SKIP ronn --html $(RONNFLAGS) < '$<' > '$@'"
- $(srcdir)/%.pot: $(srcdir)/% $(topsrcdir)/src/lib/librexgettext
- 	cd $(<D) && $(abspath $(topsrcdir)/src/lib/librexgettext) $(LIBREXGETTEXT_FLAGS) $(<F) > $(@F)
- $(srcdir)/dir.pot: $(addprefix $(outdir)/,$(addsuffix .pot,$(libretools.pots)))
-Index: libretools-20220118/build-aux/Makefile.once.head/00-libretools.mk
-===================================================================
---- libretools-20220118.orig/build-aux/Makefile.once.head/00-libretools.mk
-+++ libretools-20220118/build-aux/Makefile.once.head/00-libretools.mk
-@@ -43,7 +43,6 @@ define mod.libretools.doc
- #     - Directory variable : `libretools.src`
- #     - Directory variable : `libretools.src.exec`
- #     - Directory variable : `libretools.src.conf`
--#     - Directory variable : `libretools.src.ronn`
- #     - Directory variable : `libretools.src.md`
- #     - Directory variable : `libretools.src.sh`
- #     - File               : `$(topsrcdir)/.srcversion-libretools.mk`
-@@ -62,8 +61,6 @@ define mod.libretools.doc
- #     - Directory variable : `files.out.int`
- #     - Target             : `$(srcdir)/%.in: $(devtoolsdir)/%.in`
- #     - Target             : `$(outdir)/%: $(srcdir)/%.in`
--#     - Target             : `$(outdir)/%     : $(srcdir)/%.ronn`
--#     - Target             : `$(outdir)/%.html: $(srcdir)/%.ronn`
- #     - Target             : `$(outdir)/%.pot: $(outdir)/%`
- #     - Target             : `$(outdir)/%.pot: $(srcdir)/%`
- #     - Target             : `$(srcdir)/dir.pot`
-@@ -110,8 +107,6 @@ libretools.src.git  = $(files.src.src)
- libretools.src.exec = $(patsubst $(srcdir)/%,%,$(shell find $(addprefix $(srcdir)/,$(libretools.src.git)) -maxdepth 0 -executable -type f 2>/dev/null))
- libretools.src.conf = $(filter %.conf,$(libretools.src.git))
- libretools.src.sh   = $(filter %.sh  ,$(libretools.src.git))
--libretools.src.ronn = $(filter %.ronn,$(libretools.src.git))
--libretools.src.md   = $(filter-out HACKING.md,$(filter %.ronn %.md,$(libretools.src.git)))
- 
- LIBREXGETTEXT_FLAGS ?=
-