summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin31694 -> 31693 bytes
-rw-r--r--app-admin/fsvs/Manifest8
-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.xml5
-rw-r--r--app-admin/gentoo-perl-helpers/Manifest2
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild2
-rw-r--r--app-admin/restart-services/Manifest2
-rw-r--r--app-admin/restart-services/restart-services-0.17.0-r1.ebuild2
10 files changed, 94 insertions, 59 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2e313581ca4f..ef359c4c60b4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
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>
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 966ac37bb77e..e4b8f844add4 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,4 +1,4 @@
DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
-EBUILD gentoo-perl-helpers-0.4.0-r1.ebuild 1286 BLAKE2B 8e9724bda3dbff9d02f82b9f4f7fe56805b3f5f58fe9bf8be7d8dd4cc9f54be18f5435ca63a6dd36227880a9912835004e72e650c4c0eb87212b35775a67c0f4 SHA512 0f90ab5391f8899eee75ea7b5442df089b838ab443443c1f1b4000ef24bf6edffba6e6e32be0b353e54c7d9d8a3465f1689fdee77cef509a6477025c40c49bce
+EBUILD gentoo-perl-helpers-0.4.0-r1.ebuild 1284 BLAKE2B b2ad80ac9299216685e67d6aa6d5916d9aba0a218a256a06c5e07b6c16617ec1afe8d9cf2c814f9c5b6bd93fdd023ffda3d386a771cbc3a04d39726fd1e5f145 SHA512 56ac6e48be1255b1954315b4bb9a778912301d5dd28d1805d6d7b3ddd74bc4edd183fae0a4541f496ce725e6d49ea684c1adcf12d902d2803ce58f8e601730ee
EBUILD gentoo-perl-helpers-0.4.0.ebuild 1292 BLAKE2B 503f577c119232317c4bc208f4c67e78d654d48dd87f7aa0675dc7446d92f578f346dd2a7d99f7d368da3505f77df6857593b28479b0829d8100b8ee14f1ddae SHA512 471393fdcf0fa7fef1c360fa968c15757e15c005512da9fd90a7d3069d8e68b83dc8dc2a07851125ae8a165a399431c8cbe3be8ae030cf5f01ed3576a6bf04cf
MISC metadata.xml 348 BLAKE2B ebb76313771776b978708505761f5a42b3b1d65e5f307d754c26308626c04c414171f39d5c033a00cf990a734e8ca41732ec0ed6f8158157e1f0dbd39a28d56b SHA512 4e12044c5a14c90aecae073df7ef04fb2aee07cbf81965f603c1d7fc45818e78488d7f3d98b86aa7eb2577de90ac3ffff147bc28b0b6f3d2c74bb23b1e1b565d
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
index 87e71a5c3fe0..8e302419914b 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
# Assumed System:
# sys-apps/coreutils
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 66159dd2006b..e5db96eaf1e7 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,4 +1,4 @@
DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab
-EBUILD restart-services-0.17.0-r1.ebuild 1915 BLAKE2B cc98be8943bce051ff758ad5b3aa0d2313a679d137e240512a93d45067019483cd512718ed6a951896c6c9a73b06006b3c14eed5ff89f1f81deec2a1a762a95b SHA512 b6baa83273e2219cecab42f7e47140a8443edc6f5de638c771fe48b774e88934f702886689fc0828ebab406af162449f8ca8610461a37cc68ffcbd2cdac14c93
+EBUILD restart-services-0.17.0-r1.ebuild 1913 BLAKE2B 4fec8b61fff3ce3661404933ec9e5b7a07e175509967d5b88c2c174027452cbd503429d4b1c6e10922001993f12c6626b614f3d167ca241efdc46e66e3a913fe SHA512 7aba7904058a5cc54d03908276e5d1dd816d7827705bc74435d69c2670e3e1855a140930573f588252b4da3a56185da95c540b25121e67f39daea45fc9a43591
EBUILD restart-services-0.17.0.ebuild 1858 BLAKE2B d250a17a9bce19d201d740e9739a8ca3225032e2a24b82857598dab21785ea692319f9d9dfbc1ef53d3b3814878f4ed20eaa4e7c040eed6a75cfb01c6f595d16 SHA512 2fd9eab9d1e096796470fdedb841072641200faae52011048294e3f065d067ae4b333ed7b4eae04583aee1e56597bf1c3af1bf90b976d255eeb4fe9513b92f74
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/app-admin/restart-services/restart-services-0.17.0-r1.ebuild b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
index 7baedbc6e948..aee74d1cc63c 100644
--- a/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
+++ b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
app-admin/lib_users