gentoo auto-resync : 08:10:2023 - 18:03:40

5 files changed, 90 insertions, 55 deletions

diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
index dadcd78f68f2..408c0c47e8bc 100644
--- a/app-admin/fsvs/Manifest
+++ b/app-admin/fsvs/Manifest
@@ -1,4 +1,4 @@
-AUX fsvs-1.2.5-as-needed.patch 1125 BLAKE2B dc21f6df691f5baab4c0510ec5b70c8841034ee1ebeee387c8e4fc8dbbe737b2ca59c0fb4316de024905403e3132b9625e98ae3b11ca814e2d50b8027d47caa9 SHA512 b477dc3525eac7cf3d4377f61e7b471c16f346e2fd357969bf40141ebab7eff817a7d122ac0c707ba4b12177fa849f6f193a18540f0f7e8d251ec468a5435848
-DIST fsvs-1.2.5.tar.bz2 427494 BLAKE2B ac445bd6572ccdc589ec3d9e21127446a0553d29ac62b1e99e60b767cb1c06d8be13469bcdef03382fa6088bb3fdb740a10a0e39fc5707fbfba749472523bc12 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c
-EBUILD fsvs-1.2.5-r2.ebuild 1420 BLAKE2B 08df50f4c875bca0e2fa0b570413fa54ffcd7610860268c8561e9714e3f635de061605035ff74ebe248288d00607a852029c6302f8efcb260401a53ff38f291c SHA512 822aba3587ec4871be28300ce3de3c2da7b4b5882a719aa6c2cbb4f97cdcc5e4d2c554e291125c795ccb746a886cfac49120a8070aec936b775a7e0af42769bc
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+AUX fsvs-1.2.11-makefile.patch 1838 BLAKE2B f86b2d8129ff815da9747732bb9746343b750f492eb594214454200fc1f98e53639fce6aad5af2f6267f60bb4dc88270974a682366d51eb6f3340eabe01a4349 SHA512 20f8279060bdfb82a1123d369ff455dd6a3e8678d95b7607c51268a444910e1efb65a8e4b1d309aee8c27bfc4aa10d9fc0c651727af9f3e0f22487cc1696dfbf
+DIST fsvs-1.2.11.tar.gz 498514 BLAKE2B 8683fe3c22a0ea0d4762d631e520596dc02d69059f4ff5d8719bd44405134e5b5100c594a260d1b55a9dd7c6d240a84a0c5e05a18006a7a5f193ce76178d934c SHA512 72f883dfef85cb8aeb4d3baf3a2de5bfb6b5479273027f86b52edfdd2ea6dac4b2271b83a9879add3d7c9008f80a2fef13671b9e5ed61958c72ff144d9fad086
+EBUILD fsvs-1.2.11.ebuild 1331 BLAKE2B 19f0186c036709c6fc787dbfd6eff0b457360a5274ea6d7167ab517e747f01098e21820ed283699b94305a3649cdf1f7175b7dd09428e4265bad7cabe3efa7c3 SHA512 34f6098226273cdeaec8fb1270cecf1af328c33839facc78963ea8a6cc00fb4e26546e923e99294c105cc3a7cb2dc54366d9427c92619d2a4c69c3e066b22f29
+MISC metadata.xml 245 BLAKE2B da4ea0774c6d8be05dee52714052bb2f9aedff682da3eb2f4f85cd688e126f5512d062fc3a7b2235c52d2cefc5613e68898612afef71477ba0406e75c8b3a251 SHA512 263015528da2df5f412f57b9d7298d5960a44da10de3b0c7edeae2fd7350350a2704ae2221a8db865b950841cd213fee175c37670422dce25fba0c83a3a5a2c5
diff --git a/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch
new file mode 100644
index 000000000000..93daf9521d3e
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch
@@ -0,0 +1,68 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
+ 	@echo ''
+ 	@false
+ 
+-configure:	configure.in
++configure:	configure.ac
+ 	@echo Generating configure.
+ 	autoconf
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -11,10 +11,11 @@
+ ################################ Definitions ################################
+ DIR	:= /usr/share/doc
+ 
+-VERSION	:= $(shell git describe --tags --always)
++VERSION	:= 1.2.11
+ 
++CC		:= @CC@
+ CFLAGS	:= @CFLAGS@
+-CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'  -Wno-deprecated-declarations
++CFLAGS	+= -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"'  -Wno-deprecated-declarations
+ LDFLAGS	:= @LDFLAGS@
+ FSVS_LDFLAGS = $(LDFLAGS)
+ BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl
+@@ -48,11 +49,7 @@
+ 
+ 
+ ################################ Targets ###################################
+-ifeq (@CHROOTER_JAIL@, )
+-all:	deps tags check-version check-dox $(DEST) lsDEST
+-else
+-all:	tools/fsvs-chrooter
+-endif
++all:	fsvs
+ 
+ 
+ check-version: config.h fsvs.c
+@@ -145,18 +142,11 @@
+ 
+ 
+ ################################ Rules ######################################
+-%.o:	%.c
+-	@echo "     CC $<"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ # if the Makefile has changed, the output will (at least sometimes)
+ # change, too.
+ $(DEST): $(C_FILES:%.c=%.o)
+-	@echo "     Link $@"
+-	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) 
+-ifeq (@ENABLE_RELEASE@, 1)
+-	-strip $@
+-endif
++	$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) 
+ 
+ 
+ # For debugging: generate preprocessed, generate assembler
+@@ -171,7 +161,6 @@
+ .%.d:	%.c
+ 	@echo "     deps for $<"
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
+-include $(D_FILES)
+ 
+ tools/fsvs-chrooter: tools/fsvs-chrooter.c
+ tools/fsvs-chrooter: interface.h config.h
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
deleted file mode 100644
index f06070f4beee..000000000000
--- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fixes --as-needed support(bug #294834)
-Verbose build
-Fixes underlinking(bug #463684) - patch went upstream
-
---- fsvs-1.2.5/src/Makefile.in.orig	2011-11-11 22:19:12.000000000 +0400
-+++ fsvs-1.2.5/src/Makefile.in	2013-08-19 13:30:16.186082295 +0400
-@@ -18,7 +18,7 @@
- CFLAGS	:= @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
- CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
- LDFLAGS	:= @LDFLAGS@
--FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm 
-+FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl
- EXTRALIBS	:= @EXTRALIBS@
- WAA_CHARS?= @WAA_WC_MD5_CHARS@
- 
-@@ -146,13 +146,13 @@
- ################################ Rules ######################################
- %.o:	%.c
- 	@echo "     CC $<"
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- # if the Makefile has changed, the output will (at least sometimes)
- # change, too.
- $(DEST): $(C_FILES:%.c=%.o)
- 	@echo "     Link $@"
--	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
-+	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
- ifeq (@ENABLE_RELEASE@, 1)
- 	-strip $@
- endif
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.11.ebuild
index 35d79e90877b..20acd526eda7 100644
--- a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.11.ebuild
@@ -1,38 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Backup/restore for subversion backends"
-HOMEPAGE="http://fsvs.tigris.org/"
-SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+HOMEPAGE="https://github.com/phmarek/fsvs"
+SRC_URI="https://github.com/phmarek/fsvs/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/fsvs-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-vcs/subversion
-	dev-libs/libpcre
-	sys-libs/gdbm
+RDEPEND="
 	dev-libs/apr-util
-	dev-util/ctags"
+	dev-libs/libpcre
+	dev-util/ctags
+	dev-vcs/subversion
+	sys-libs/db:*
+	sys-libs/gdbm"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-as-needed.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_prepare() {
-	# fix #570596 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
 	default
-}
-
-src_compile() {
-	# respect compiler
-	emake CC="$(tc-getCC)"
+	eautoreconf
 }
 
 src_install() {
diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
index 85e4ed814fa2..a2f4c00fbe77 100644
--- a/app-admin/fsvs/metadata.xml
+++ b/app-admin/fsvs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">phmarek/fsvs</remote-id>
+	</upstream>
 </pkgmetadata>