Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/fsvs
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/fsvs')
-rw-r--r--app-admin/fsvs/Manifest2
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.11-makefile.patch68
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch31
-rw-r--r--app-admin/fsvs/fsvs-1.2.11.ebuild (renamed from app-admin/fsvs/fsvs-1.2.5-r2.ebuild)33
-rw-r--r--app-admin/fsvs/metadata.xml7
5 files changed, 88 insertions, 53 deletions
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
index 6230e2cc48f2..a72a447762d0 100644
--- a/app-admin/fsvs/Manifest
+++ b/app-admin/fsvs/Manifest
@@ -1 +1 @@
-DIST fsvs-1.2.5.tar.bz2 427494 BLAKE2B ac445bd6572ccdc589ec3d9e21127446a0553d29ac62b1e99e60b767cb1c06d8be13469bcdef03382fa6088bb3fdb740a10a0e39fc5707fbfba749472523bc12 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c
+DIST fsvs-1.2.11.tar.gz 498514 BLAKE2B 8683fe3c22a0ea0d4762d631e520596dc02d69059f4ff5d8719bd44405134e5b5100c594a260d1b55a9dd7c6d240a84a0c5e05a18006a7a5f193ce76178d934c SHA512 72f883dfef85cb8aeb4d3baf3a2de5bfb6b5479273027f86b52edfdd2ea6dac4b2271b83a9879add3d7c9008f80a2fef13671b9e5ed61958c72ff144d9fad086
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 6f49eba8f496..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 "http://www.gentoo.org/dtd/metadata.dtd">
+<!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>