gentoo auto-resync : 14:05:2023 - 22:02:07

4 files changed, 50 insertions, 20 deletions

diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
index d44c3e3ff4d8..81506656b089 100644
--- a/dev-vcs/colorsvn/Manifest
+++ b/dev-vcs/colorsvn/Manifest
@@ -1,4 +1,5 @@
-AUX use-open2-not-open3.patch 760 BLAKE2B 5e4649cea3124b01b7eefceb1a1e8a7635b323c16cce32f78b81352525d9d0122e180a9aab5188bce13fafa39375be5a77e22b5eb3fc3656493f310ce14835f8 SHA512 556511ce5cf34c7568352a7e18b3d4113cb6d3d52445db31eb2cddc599e3cbbb47c28e39151350e10e957a5a94651445484c9c9cb91af355f540103edeac774c
+AUX colorsvn-0.3.3-prefix-fhs.patch 1318 BLAKE2B 4238b40a4b9e2b76cc382e79709bd1a01f9541c88f5697ecfa6dfa9617323a91643963686b33a7df5c772cfe1771565a3a0ae96b7f238dfd6f7c06ffaf4df860 SHA512 05a560b4e7b6569f857374e673ee3a350f06749c6db95cef08419a02a1c1f936a127742958b8c54948f7f32f29f9ca3b9bbb29de43fc9e48bd74e483bc1bcb16
+AUX colorsvn-0.3.3-use-open2-not-open3.patch 653 BLAKE2B 7bc07d9b26d4dbb4b8f3a5a2bc8394ba036ff0e6f6497548e51430326d656a0545cb5e4b560e28498cda9e35f6f7f7b8584224d729fa3ec4bc3c3569235a6ccc SHA512 91145fba618f5fdbb10659df2b12fb23754452d72cbfedcc5d8e023deb40aeed7ba78fd353fb3f13f85b8a8dd4a348ccd1c865cf6a60f2818238580e7340bd36
 DIST colorsvn-0.3.3.tar.gz 107961 BLAKE2B da46181d9eb54709ae2e62aee4e341f1403788b3a460b04bccf628fe0be767b4343f4295d4eeb1062fb9e580a3aa7f5731027d7f5578342b63414f2e03083a75 SHA512 c9aa6eb3a14f156d8f6139ad708782846c561385cb174339443014e83c80b62f5c8d7b9937830ebb5e5e8606517cb2f3f1866a3611c93512b302936b6fe55ffb
-EBUILD colorsvn-0.3.3.ebuild 1066 BLAKE2B 1b7e3f9026d968815cc244064a832f3e3249f7d0e457ac408450864b92cc49d8ceeeead7c8abecc21a3f68e376ad9fc105fabc1003940381a02f2795a8d26d1e SHA512 04d7cba28f46fec34c370c55dd23790a9f95899647cfa7c6a7ef71e32ce2a2e43de2c5708d50237f177fc44581a4002f235f278b4d43a9b7fa4a25135be5c9d2
+EBUILD colorsvn-0.3.3-r1.ebuild 942 BLAKE2B 72a39dfd7ba8153f4f95767c55e70a82328331a4cf2448523f2bf2342cd011271ca90a055fa0817878836e14e5e946068c10d93d96520ea821e592798f97062f SHA512 2a4ffd2add374b23f8da928cbef35a05b9147794bcb2a308dfb4b601a6499534caad61973cc1add1615f4fe52e1b2242419372aeda0edff28055b5af4c038338
 MISC metadata.xml 357 BLAKE2B e7944960b69a94a0a12aab9a377fdf917ea704d224629ed05202ee6d4309471f4b1cda6e65d0d4404634e2111bc951b4a3b8ff01dc827d1b305e5648971fa591 SHA512 6d774b25862c1f0b17160c6281dcf712472d530602dd86c7f55f721f45fcbc72510f0968080f868757d1172caf9921439d9bcd8e8edbba7e8e1e36ae0c82b36b
diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild
index ef47c0be9bd2..0aaf21156588 100644
--- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Subversion output colorizer"
 HOMEPAGE="http://colorsvn.tigris.org"
@@ -10,22 +10,16 @@ SRC_URI="http://colorsvn.tigris.org/files/documents/4414/49311/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x64-macos"
-IUSE=""
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	dev-vcs/subversion"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/use-open2-not-open3.patch" )
-
-src_prepare() {
-	default
-	# Fix confdir location for Prefix, #435434
-	sed -i \
-		-e '/^confdir/d' \
-		-e 's/$(confdir)/$(sysconfdir)/g' \
-		Makefile.in || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-use-open2-not-open3.patch
+	"${FILESDIR}"/${P}-prefix-fhs.patch
+)
 
 src_compile() {
 	# bug 335134
diff --git a/dev-vcs/colorsvn/files/colorsvn-0.3.3-prefix-fhs.patch b/dev-vcs/colorsvn/files/colorsvn-0.3.3-prefix-fhs.patch
new file mode 100644
index 000000000000..e379372d40b0
--- /dev/null
+++ b/dev-vcs/colorsvn/files/colorsvn-0.3.3-prefix-fhs.patch
@@ -0,0 +1,37 @@
+Fix confdir location for Prefix
+https://bugs.gentoo.org/435434
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,7 +13,6 @@
+ mandir=@mandir@
+ sysconfdir=@sysconfdir@
+ 
+-confdir=/etc
+ 
+ CP=@CP@
+ PERL=@PERL@
+@@ -36,10 +35,10 @@
+ install: colorsvn
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) && \
+ 	$(INSTALL) -m 755 $(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE) && \
+-	$(INSTALL) -d $(DESTDIR)/$(confdir) && \
+-	$(INSTALL) -m 644 $(CONFIGFILE) $(DESTDIR)/$(confdir)/$(CONFIGFILE) && \
+-	$(INSTALL) -d $(DESTDIR)/$(confdir)/profile.d && \
+-	$(INSTALL) -m 755 $(PROFFILE) $(DESTDIR)/$(confdir)/profile.d/$(PROFFILE) && \
++	$(INSTALL) -d $(DESTDIR)/$(sysconfdir) && \
++	$(INSTALL) -m 644 $(CONFIGFILE) $(DESTDIR)/$(sysconfdir)/$(CONFIGFILE) && \
++	$(INSTALL) -d $(DESTDIR)/$(sysconfdir)/profile.d && \
++	$(INSTALL) -m 755 $(PROFFILE) $(DESTDIR)/$(sysconfdir)/profile.d/$(PROFFILE) && \
+ 	if [ -f $(srcdir)/colorsvn.1 ] ; then \
+ 	    $(INSTALL) -d $(DESTDIR)$(mandir)/man1/ ; \
+ 	    $(INSTALL) -m 644 $(srcdir)/colorsvn.1 $(DESTDIR)$(mandir)/man1/ ; \
+@@ -54,6 +53,6 @@
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(PACKAGE) && \
+-	$(RM) $(DESTDIR)/$(confdir)/$(CONFIGFILE)  && \
+-	$(RM) $(DESTDIR)/$(confdir)/profile.d/$(PROFFILE)
++	$(RM) $(DESTDIR)/$(sysconfdir)/$(CONFIGFILE)  && \
++	$(RM) $(DESTDIR)/$(sysconfdir)/profile.d/$(PROFFILE)
+ 
diff --git a/dev-vcs/colorsvn/files/use-open2-not-open3.patch b/dev-vcs/colorsvn/files/colorsvn-0.3.3-use-open2-not-open3.patch
index cb295dc15878..32757fb9e95e 100644
--- a/dev-vcs/colorsvn/files/use-open2-not-open3.patch
+++ b/dev-vcs/colorsvn/files/colorsvn-0.3.3-use-open2-not-open3.patch
@@ -1,7 +1,5 @@
-This is idl0r's fix for bug 326279, rerolled for v0.3.3.
+https://bugs.gentoo.org/326279
 
-diff --git a/colorsvn-original b/colorsvn-original
-index 4236121..4edf3c8 100644
 --- a/colorsvn-original
 +++ b/colorsvn-original
 @@ -56,7 +56,7 @@