From c6e5b4b23706b8af8fd9743bce842b9b7f215ce9 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 14 May 2023 18:02:23 +0200 Subject: dev-vcs/colorsvn: update EAPI 6 -> 8 Signed-off-by: David Seifert --- dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild | 39 +++++++++++++++++++ dev-vcs/colorsvn/colorsvn-0.3.3.ebuild | 45 ---------------------- .../colorsvn/files/colorsvn-0.3.3-prefix-fhs.patch | 37 ++++++++++++++++++ .../files/colorsvn-0.3.3-use-open2-not-open3.patch | 22 +++++++++++ dev-vcs/colorsvn/files/use-open2-not-open3.patch | 24 ------------ 5 files changed, 98 insertions(+), 69 deletions(-) create mode 100644 dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild delete mode 100644 dev-vcs/colorsvn/colorsvn-0.3.3.ebuild create mode 100644 dev-vcs/colorsvn/files/colorsvn-0.3.3-prefix-fhs.patch create mode 100644 dev-vcs/colorsvn/files/colorsvn-0.3.3-use-open2-not-open3.patch delete mode 100644 dev-vcs/colorsvn/files/use-open2-not-open3.patch diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild new file mode 100644 index 000000000000..0aaf21156588 --- /dev/null +++ b/dev-vcs/colorsvn/colorsvn-0.3.3-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Subversion output colorizer" +HOMEPAGE="http://colorsvn.tigris.org" +SRC_URI="http://colorsvn.tigris.org/files/documents/4414/49311/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 ~x64-macos" + +RDEPEND=" + dev-lang/perl + dev-vcs/subversion" +BDEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-use-open2-not-open3.patch + "${FILESDIR}"/${P}-prefix-fhs.patch +) + +src_compile() { + # bug 335134 + emake -j1 +} + +pkg_postinst() { + elog + elog "The default settings are stored in /etc/colorsvnrc." + elog "They can be locally overridden by ~/.colorsvnrc." + elog "An alias to colorsvn was installed for the svn command." + elog "In order to immediately activate it do:" + elog "\tsource /etc/profile" + elog "NOTE: If you don't see colors," + elog "append the output of 'echo \$TERM' to 'colortty' in your colorsvnrc." + elog +} diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild deleted file mode 100644 index ef47c0be9bd2..000000000000 --- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Subversion output colorizer" -HOMEPAGE="http://colorsvn.tigris.org" -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 - dev-vcs/subversion" -DEPEND="${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 -} - -src_compile() { - # bug 335134 - emake -j1 -} - -pkg_postinst() { - elog - elog "The default settings are stored in /etc/colorsvnrc." - elog "They can be locally overridden by ~/.colorsvnrc." - elog "An alias to colorsvn was installed for the svn command." - elog "In order to immediately activate it do:" - elog "\tsource /etc/profile" - elog "NOTE: If you don't see colors," - elog "append the output of 'echo \$TERM' to 'colortty' in your colorsvnrc." - elog -} 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/colorsvn-0.3.3-use-open2-not-open3.patch b/dev-vcs/colorsvn/files/colorsvn-0.3.3-use-open2-not-open3.patch new file mode 100644 index 000000000000..32757fb9e95e --- /dev/null +++ b/dev-vcs/colorsvn/files/colorsvn-0.3.3-use-open2-not-open3.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/326279 + +--- a/colorsvn-original ++++ b/colorsvn-original +@@ -56,7 +56,7 @@ + # Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. + + use Term::ANSIColor; +-use IPC::Open3; ++use IPC::Open2; + + use strict; + use warnings; +@@ -332,7 +332,7 @@ if (! -t STDOUT || $commit == 1 || !$colortty{$terminal} || !$commresolved ) + + # Keep the pid of the svn process so we can get its return + # code and use that as our return code. +-my $svn_pid = open3('<&STDIN', \*SVNOUT, \*SVNOUT, $svnPath, @ARGV); ++my $svn_pid = open2(\*SVNOUT, '<&STDIN', $svnPath, @ARGV); + my $svnName = $svnPath; + $svnName =~ s,.*/(.*)$,$1,; + diff --git a/dev-vcs/colorsvn/files/use-open2-not-open3.patch b/dev-vcs/colorsvn/files/use-open2-not-open3.patch deleted file mode 100644 index cb295dc15878..000000000000 --- a/dev-vcs/colorsvn/files/use-open2-not-open3.patch +++ /dev/null @@ -1,24 +0,0 @@ -This is idl0r's fix for bug 326279, rerolled for v0.3.3. - -diff --git a/colorsvn-original b/colorsvn-original -index 4236121..4edf3c8 100644 ---- a/colorsvn-original -+++ b/colorsvn-original -@@ -56,7 +56,7 @@ - # Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. - - use Term::ANSIColor; --use IPC::Open3; -+use IPC::Open2; - - use strict; - use warnings; -@@ -332,7 +332,7 @@ if (! -t STDOUT || $commit == 1 || !$colortty{$terminal} || !$commresolved ) - - # Keep the pid of the svn process so we can get its return - # code and use that as our return code. --my $svn_pid = open3('<&STDIN', \*SVNOUT, \*SVNOUT, $svnPath, @ARGV); -+my $svn_pid = open2(\*SVNOUT, '<&STDIN', $svnPath, @ARGV); - my $svnName = $svnPath; - $svnName =~ s,.*/(.*)$,$1,; - -- cgit v1.2.3-65-gdbad