| 1 |
commit: 9f434c3ceb21ef9e711ecd94c9f0b73b18199edd |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 6 01:06:59 2017 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 6 01:06:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f434c3c |
| 7 |
|
| 8 |
dev-vcs/colorsvn: new version 0.3.3. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-vcs/colorsvn/Manifest | 1 + |
| 13 |
...orsvn-0.3.2-r3.ebuild => colorsvn-0.3.3.ebuild} | 12 ++++------- |
| 14 |
dev-vcs/colorsvn/files/use-open2-not-open3.patch | 24 ++++++++++++++++++++++ |
| 15 |
3 files changed, 29 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest |
| 18 |
index 15c497f37ef..4c1fa14a1fa 100644 |
| 19 |
--- a/dev-vcs/colorsvn/Manifest |
| 20 |
+++ b/dev-vcs/colorsvn/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST colorsvn-0.3.2.tar.gz 98460 SHA256 ee3bff9b897b268a8a62cee8f6162b562127a4c2becba3f20152f6cde83cdbe4 SHA512 1918d3609a871d8fa9e43cab5d32c5314505204deb9e7e0e8321c69c2f345b577a4572574fd7da7e428b8fca9228b2a48a81c8f1dc27c0aceca7e2596e13804f WHIRLPOOL 1b88225f871eca25a5cf82fcd6ad6a518fdf02cccebbb875d44df868033c721e17bade916014d0a71a4948e86430306db811edbb62e24f9b6b28e60577bedc9a |
| 23 |
+DIST colorsvn-0.3.3.tar.gz 107961 SHA256 db58d5b8f60f6d4def14f8f102ff137b87401257680c1acf2bce5680b801394e SHA512 c9aa6eb3a14f156d8f6139ad708782846c561385cb174339443014e83c80b62f5c8d7b9937830ebb5e5e8606517cb2f3f1866a3611c93512b302936b6fe55ffb WHIRLPOOL c18f605db8235cf0aed0a739cbbf6799bb7a1819dc045a7243d9f9bba1ffe07105a403b07c73d24bfd731a771f260bc12eccebb6623d2b504fc609b2c493a0cf |
| 24 |
|
| 25 |
diff --git a/dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild |
| 26 |
similarity index 74% |
| 27 |
rename from dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild |
| 28 |
rename to dev-vcs/colorsvn/colorsvn-0.3.3.ebuild |
| 29 |
index cba12e0c4ea..2ca2efecbd4 100644 |
| 30 |
--- a/dev-vcs/colorsvn/colorsvn-0.3.2-r3.ebuild |
| 31 |
+++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild |
| 32 |
@@ -1,11 +1,11 @@ |
| 33 |
-# Copyright 1999-2016 Gentoo Foundation |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI="6" |
| 38 |
+EAPI=6 |
| 39 |
|
| 40 |
DESCRIPTION="Subversion output colorizer" |
| 41 |
HOMEPAGE="http://colorsvn.tigris.org" |
| 42 |
-SRC_URI="http://www.console-colors.de/downloads/${PN}/${P}.tar.gz" |
| 43 |
+SRC_URI="${HOMEPAGE}/files/documents/4414/49311/${P}.tar.gz" |
| 44 |
|
| 45 |
LICENSE="GPL-2" |
| 46 |
SLOT="0" |
| 47 |
@@ -16,14 +16,10 @@ RDEPEND="dev-lang/perl |
| 48 |
dev-vcs/subversion" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
|
| 51 |
-PATCHES=( |
| 52 |
- "${FILESDIR}/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch" |
| 53 |
-) |
| 54 |
+PATCHES=( "${FILESDIR}/use-open2-not-open3.patch" ) |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
default |
| 58 |
- # rxvt-unicode isn't listed by default :) |
| 59 |
- sed -i -e 's:rxvt:rxvt rxvt-unicode:' colorsvnrc-original || die |
| 60 |
# Fix confdir location for Prefix, #435434 |
| 61 |
sed -i \ |
| 62 |
-e '/^confdir/d' \ |
| 63 |
|
| 64 |
diff --git a/dev-vcs/colorsvn/files/use-open2-not-open3.patch b/dev-vcs/colorsvn/files/use-open2-not-open3.patch |
| 65 |
new file mode 100644 |
| 66 |
index 00000000000..cb295dc1587 |
| 67 |
--- /dev/null |
| 68 |
+++ b/dev-vcs/colorsvn/files/use-open2-not-open3.patch |
| 69 |
@@ -0,0 +1,24 @@ |
| 70 |
+This is idl0r's fix for bug 326279, rerolled for v0.3.3. |
| 71 |
+ |
| 72 |
+diff --git a/colorsvn-original b/colorsvn-original |
| 73 |
+index 4236121..4edf3c8 100644 |
| 74 |
+--- a/colorsvn-original |
| 75 |
++++ b/colorsvn-original |
| 76 |
+@@ -56,7 +56,7 @@ |
| 77 |
+ # Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. |
| 78 |
+ |
| 79 |
+ use Term::ANSIColor; |
| 80 |
+-use IPC::Open3; |
| 81 |
++use IPC::Open2; |
| 82 |
+ |
| 83 |
+ use strict; |
| 84 |
+ use warnings; |
| 85 |
+@@ -332,7 +332,7 @@ if (! -t STDOUT || $commit == 1 || !$colortty{$terminal} || !$commresolved ) |
| 86 |
+ |
| 87 |
+ # Keep the pid of the svn process so we can get its return |
| 88 |
+ # code and use that as our return code. |
| 89 |
+-my $svn_pid = open3('<&STDIN', \*SVNOUT, \*SVNOUT, $svnPath, @ARGV); |
| 90 |
++my $svn_pid = open2(\*SVNOUT, '<&STDIN', $svnPath, @ARGV); |
| 91 |
+ my $svnName = $svnPath; |
| 92 |
+ $svnName =~ s,.*/(.*)$,$1,; |
| 93 |
+ |
Archives