commit: 9f434c3ceb21ef9e711ecd94c9f0b73b18199edd Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat May 6 01:06:59 2017 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat May 6 01:06:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f434c3c
dev-vcs/colorsvn: new version 0.3.3. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/colorsvn/Manifest | 1 + ...orsvn-0.3.2-r3.ebuild => colorsvn-0.3.3.ebuild} | 12 ++++------- dev-vcs/colorsvn/files/use-open2-not-open3.patch | 24 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest index 15c497f37ef..4c1fa14a1fa 100644 --- a/dev-vcs/colorsvn/Manifest +++ b/dev-vcs/colorsvn/Manifest @@ -1 +1,2 @@ DIST colorsvn-0.3.2.tar.gz 98460 SHA256 ee3bff9b897b268a8a62cee8f6162b562127a4c2becba3f20152f6cde83cdbe4 SHA512 1918d3609a871d8fa9e43cab5d32c5314505204deb9e7e0e8321c69c2f345b577a4572574fd7da7e428b8fca9228b2a48a81c8f1dc27c0aceca7e2596e13804f WHIRLPOOL 1b88225f871eca25a5cf82fcd6ad6a518fdf02cccebbb875d44df868033c721e17bade916014d0a71a4948e86430306db811edbb62e24f9b6b28e60577bedc9a +DIST colorsvn-0.3.3.tar.gz 107961 SHA256 db58d5b8f60f6d4def14f8f102ff137b87401257680c1acf2bce5680b801394e SHA512 c9aa6eb3a14f156d8f6139ad708782846c561385cb174339443014e83c80b62f5c8d7b9937830ebb5e5e8606517cb2f3f1866a3611c93512b302936b6fe55ffb WHIRLPOOL c18f605db8235cf0aed0a739cbbf6799bb7a1819dc045a7243d9f9bba1ffe07105a403b07c73d24bfd731a771f260bc12eccebb6623d2b504fc609b2c493a0cf diff --git a/dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild similarity index 74% rename from dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild rename to dev-vcs/colorsvn/colorsvn-0.3.3.ebuild index cba12e0c4ea..2ca2efecbd4 100644 --- a/dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild +++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 DESCRIPTION="Subversion output colorizer" HOMEPAGE="http://colorsvn.tigris.org"; -SRC_URI="http://www.console-colors.de/downloads/${PN}/${P}.tar.gz"; +SRC_URI="${HOMEPAGE}/files/documents/4414/49311/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -16,14 +16,10 @@ RDEPEND="dev-lang/perl dev-vcs/subversion" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch" -) +PATCHES=( "${FILESDIR}/use-open2-not-open3.patch" ) src_prepare() { default - # rxvt-unicode isn't listed by default :) - sed -i -e 's:rxvt:rxvt rxvt-unicode:' colorsvnrc-original || die # Fix confdir location for Prefix, #435434 sed -i \ -e '/^confdir/d' \ diff --git a/dev-vcs/colorsvn/files/use-open2-not-open3.patch b/dev-vcs/colorsvn/files/use-open2-not-open3.patch new file mode 100644 index 00000000000..cb295dc1587 --- /dev/null +++ b/dev-vcs/colorsvn/files/use-open2-not-open3.patch @@ -0,0 +1,24 @@ +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,; +
