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

10 files changed, 80 insertions, 52 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 349381b702f8..5511f528ea57 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/colorcvs/Manifest b/dev-vcs/colorcvs/Manifest
index 65aab3891ff1..0256f666d8db 100644
--- a/dev-vcs/colorcvs/Manifest
+++ b/dev-vcs/colorcvs/Manifest
@@ -1,5 +1,5 @@
-AUX colorcvs-1.4-prefix.patch 529 BLAKE2B 7a16954f603df824db1527f9079086d1722867888c4748b0a57f4e00561b5248e3f67de8067aefd3b3c77caf23d2af913b6a841e33962c10aed36ac4c21b26fb SHA512 a86d265c5d37647c89a8e53dd92d4a01bdf378ebe78d69757401c1a51e75ada912c00981781ddf0af3017936673b8f6c2b218a7f9da8100ee1e5a6f094d95512
+AUX colorcvs-1.4-prefix.patch 653 BLAKE2B cd064cba8c2acb7c273ae0fb5892bdedb6d2c75286a1659ace705837d28f7e456c985714b904dfa473edc885ef95b8c143929f86c122cc4a228beb0db460c0a8 SHA512 5d0b241a2334d7f5c6268fc15c9cfde319c5baeba19bd862b709fe2400f0a8b2b1cbb70dbdecf6e482c3072292643a105d6f15501f3b052bde7731c84bbe779f
 AUX colorcvs-profile.sh 47 BLAKE2B b8ed44839f0b4db3624134ade0ec1c053c003d6af3bbca78c6e8b5719f530704fafdb808de2562e7e2c4eda04b50a54165373fa9764720a018a964312bfc8114 SHA512 46e2692476317558cc3d4642e44aeab5b79d9bcacb0ca6b8f3470170cd351adfe156898b3c4f47ce80266eb70ad62bcfac0354b66cd315993d906ab3739acaca
 DIST colorcvs-1.4.tar.bz2 8376 BLAKE2B 329c255f3813ff8452091d15cdff898aa047a2ae84369faf659acd2939de80f0740abf7b52155b9676085bc8198eaa7b2a3039c684a12f1c6a5d3584590f9ba1 SHA512 b8c9f3241318599da40614392045a0bba3952314001f6b411207307e79e20b7dea1a9741d5a84dc91b652319ee434c2c14f03435ce4adbd22160d66181da6e44
-EBUILD colorcvs-1.4-r2.ebuild 926 BLAKE2B d0c5df39c1d3faac0a47de7e74a87fa95262384aab0ad704717c35eb163d980ea261d3e7a09b1cca419316c06703b31b50d09436f4bd76fa21b65321221d262f SHA512 c2e86cd5e7c6d70257be1c626edebd284efda205db9a44c02b07d2fa15ee0262b5f919ffa171255fc608f9a63bb8d2a43bb3465d675fc91319c3c31edb52d897
+EBUILD colorcvs-1.4-r3.ebuild 828 BLAKE2B 1ff4906d9a1c4bcbe6918029bab44b714893802b56208c7963e00a579f7590b1fc37681dce30c301ba6a07e29330f4342c370750f4ffe6e71fd0b0184e0c22e0 SHA512 a49ab3928c6f7df80deec947480c347fe241776a8d653f7a471061cc3ac4e24f54264dada0169ea2fd11e1faf8789b800d12f0f62385b9517e8419a393b540cf
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
index d9d92a12f434..fa9ca9c7b14a 100644
--- a/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit prefix
 
@@ -12,34 +12,28 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	dev-lang/perl
-	dev-vcs/cvs
-"
+	dev-vcs/cvs"
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
 
 src_prepare() {
-	# fix typo
-	sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
-	eapply "${FILESDIR}"/${P}-prefix.patch
-	eprefixify colorcvs
 	default
+	eprefixify colorcvs
 }
 
 src_install() {
-	insinto /etc/profile.d
-	doins "${FILESDIR}/${PN}-profile.sh"
-
 	dobin colorcvs
 	dodoc colorcvsrc-sample
+
+	insinto /etc/profile.d
+	doins "${FILESDIR}"/colorcvs-profile.sh
 }
 
 pkg_postinst() {
-	echo
 	einfo "An alias to colorcvs was installed for the cvs command."
 	einfo "In order to immediately activate it do:"
 	einfo "\tsource /etc/profile"
-	echo
 }
diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
index acc96c42bf65..ab9e35038aa1 100644
--- a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
+++ b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
@@ -1,5 +1,5 @@
---- a/colorcvs	2008-01-26 20:04:54 +0100
-+++ b/colorcvs	2008-01-26 20:05:56 +0100
+--- a/colorcvs
++++ b/colorcvs
 @@ -54,7 +54,7 @@
  
  sub initDefaults
@@ -18,3 +18,12 @@
  	if (-f $configFile)
  	{
  		loadPreferences($configFile);
+@@ -176,7 +176,7 @@
+ }
+ 
+ # Get the return code of the compiler and exit with that.
+-waitpid($compiler_pid, 0);
++waitpid($cvs_pid, 0);
+ exit ($? >> 8);
+ 
+ # arch-tag: colorcvs
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 @@
diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest
index 3aab214e07c2..2b8aa2f7cea4 100644
--- a/dev-vcs/easygit/Manifest
+++ b/dev-vcs/easygit/Manifest
@@ -1,3 +1,3 @@
 DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec
-EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72
+EBUILD easygit-1.7.5.2-r1.ebuild 478 BLAKE2B 4255a360c836b58cdc048729df0353877736041fe545ad1fffbf56c2203afe7adc74123f2d6d40934941dafb17247165340b46a8d630ecd1ab0e0e19af930dab SHA512 793bd035cb09679a4d14e3137963216f898e31cac2e73cd77683654cbbd6e919864e273526ed22fa34e9dbffd721c2b27a44fe5f5c18175a10f6b1d14cdd1636
 MISC metadata.xml 394 BLAKE2B 515ca6f962ff0fd4c3b57b0af00bb61e79b2a9f640d441ea5ad60c298780ce0ae8f9e090fe26d5293627448062cbd8bd78db844e923d61ad0db4644e1410b0bf SHA512 3492dae90b43f94860e1c6d08868d238a60ff13ea060bc6ec7619698d4a8830de6354d67b40b7459149e585209dfd886a94474b92191212f275ae974cc2abf1e
diff --git a/dev-vcs/easygit/easygit-1.7.5.2.ebuild b/dev-vcs/easygit/easygit-1.7.5.2-r1.ebuild
index e70c718cceff..d23469cfefc2 100644
--- a/dev-vcs/easygit/easygit-1.7.5.2.ebuild
+++ b/dev-vcs/easygit/easygit-1.7.5.2-r1.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Easy GIT (eg), a frontend for git designed for former cvs and svn users"
 HOMEPAGE="https://www.gnome.org/~newren/eg/"
 SRC_URI="https://www.gnome.org/~newren/eg/download/${PV}/eg -> ${P}"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND=">=dev-vcs/git-${PV}
+RDEPEND="
+	>=dev-vcs/git-${PV}
 	dev-lang/perl"
 
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" eg || die
-}
-
 src_install() {
-	dobin eg
+	newbin "${DISTDIR}"/${P} eg
 }