Don't use stderr anymore, bug 326279. Move sed to add 'svn mkdir' to the preventcolor array into the patch as well. Use make -j1 for now, bug 335134.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-vcs/colorsvn/ChangeLog b/dev-vcs/colorsvn/ChangeLog
index eadc1cf0a46a..7bef231244bf 100644
--- a/dev-vcs/colorsvn/ChangeLog
+++ b/dev-vcs/colorsvn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/colorsvn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorsvn/ChangeLog,v 1.4 2010/09/08 11:17:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorsvn/ChangeLog,v 1.5 2010/09/16 11:29:12 idl0r Exp $
+
+*colorsvn-0.3.2-r2 (16 Sep 2010)
+
+  16 Sep 2010; Christian Ruppert <idl0r@gentoo.org> +colorsvn-0.3.2-r2.ebuild,
+  +files/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch:
+  Don't use stderr anymore, bug 326279. Move sed to add 'svn mkdir' to the
+  preventcolor array into the patch as well. Use make -j1 for now, bug 335134.
 
   08 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   colorsvn-0.3.2-r1.ebuild:
diff --git a/dev-vcs/colorsvn/Manifest b/dev-vcs/colorsvn/Manifest
index 8cd29a08a1dd..96e17845a99b 100644
--- a/dev-vcs/colorsvn/Manifest
+++ b/dev-vcs/colorsvn/Manifest
@@ -1,15 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch 1453 RMD160 b070d26295b79ea5af7fb2263a77c8fe6df00fa8 SHA1 b96567b573941be292d1020a6dca54d0442625da SHA256 bd202137c5d3771f49121bea1647af60a9e45090584e54cbe25808eb47241f4d
 DIST colorsvn-0.3.2.tar.gz 98460 RMD160 97f72a0eea115484ec23749de2ee366573cdcfaa SHA1 8d9452585d474ad10e9e1fd2372f9ad41e548863 SHA256 ee3bff9b897b268a8a62cee8f6162b562127a4c2becba3f20152f6cde83cdbe4
 EBUILD colorsvn-0.3.2-r1.ebuild 1310 RMD160 86fc0ec7098d39cb4e99af472889a53935d334f8 SHA1 e04926561a733b80100d6cb5015b2e158e59e2b0 SHA256 4ca8780e920ed8dce28b18c0eb55d4cd20cecc906ef80d9a8707ec00dd878c0c
+EBUILD colorsvn-0.3.2-r2.ebuild 1316 RMD160 f212a68cc7f6eb3d29f4531aa3c926b457ca2e42 SHA1 c70afc4eac59f1fca50f5f01db62ba09181ed9b7 SHA256 8bd10a2f0c66cbe771f1a9a80d910841bc4d348d85229ac49a9e779dd4ad4773
 EBUILD colorsvn-0.3.2.ebuild 1191 RMD160 890cc128d603dddd04cb5db04ff2543f93746946 SHA1 c0b4331e45ae3fdf143ecdd5a2fcf09a0ecb716f SHA256 d2e96811bdf2e16b6e1e9b01dad83be347754f68911d67d53977e91a62eca25a
-MISC ChangeLog 1246 RMD160 923cd0764504f3e9b48782371dff5d56d808b6ab SHA1 d75cdf0e69e5a26a5984380657316655c4ed0aba SHA256 19e1d64bdaf095b20035360262091c1045407d0d03634431ae2e5ad3cc414527
+MISC ChangeLog 1585 RMD160 3bfd1e64121e36d854d6331547e1e55a939a951e SHA1 735fd6c9f9aad8bc4f3d229a27c2b1909c5e4890 SHA256 39cf0b4d2886c000f972e4135aa91500213128484cb9fe0786633d177ad35dff
 MISC metadata.xml 454 RMD160 e3e90034e832583bc526e500025f2e17eddb87dd SHA1 a55af11e348de05a474fe197507e6122d35d6223 SHA256 e1f5c1c097a23a03ab0a56de977b44504438d7115582784aef40defec9f67737
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyHcL4ACgkQ9/cejkQaxBC6WwCfXOIcPon+u/31goH1eesfXZwE
-1ZAAn2gYo8IQPk7Oie9z7Db5x6okLdC0
-=HCqv
+iQEcBAEBAgAGBQJMkf+OAAoJEMOx0zmdw4Z1aDoH/RkgIBXjzHwqnUoLeZ+Hj4Ih
+ZugVYoLzg9UzUYi/CQCXr0zQ1+NWmnDXXZiF+28FCB1uFf8hYHMVwmxM/ug/K/d8
+5PogAzA8J21YsTf5vi+f4YK1nSQEx8V6UCksetUkTmSSzCusuFzjDPpV8gx5zLOD
+v32HFIKjmEcvMxF/0mHm95Olxu6xlnvKxPFU9pHYmq2lTgviSmpZHo/r58ARSfrV
+EkQoS0lfISzUQMFXcQDGsujUVjMSEIOBn/cX8qW/L/luD+qdrQwvSFcAQ9jHNEbi
+eyplUYx5DQ/66655ak6wTckUfBEy0ZuaQPfLYkn97ULiHR7n0ieVq8TgY+ht05I=
+=7lJc
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/colorsvn/colorsvn-0.3.2-r2.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..880e39ddfbb4
--- /dev/null
+++ b/dev-vcs/colorsvn/colorsvn-0.3.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorsvn/colorsvn-0.3.2-r2.ebuild,v 1.1 2010/09/16 11:29:12 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Subversion output colorizer"
+HOMEPAGE="http://colorsvn.tigris.org"
+SRC_URI="http://www.console-colors.de/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-vcs/subversion"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# rxvt-unicode isn't listed by default :)
+	sed -i -e 's:rxvt:rxvt rxvt-unicode:' colorsvnrc-original || die
+
+	epatch "${FILESDIR}/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch"
+}
+
+src_compile() {
+	# bug 335134
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CREDITS || die "dodoc failed"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The default settings are stored in /etc/colorsvnrc."
+	einfo "They can be locally overridden by ~/.colorsvnrc."
+	einfo "An alias to colorsvn was installed for the svn command."
+	einfo "In order to immediately activate it do:"
+	einfo "\tsource /etc/profile"
+	einfo "NOTE: If you don't see colors,"
+	einfo "append the output of 'echo \$TERM' to 'colortty' in your colorsvnrc."
+	einfo
+}
diff --git a/dev-vcs/colorsvn/files/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch b/dev-vcs/colorsvn/files/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch
new file mode 100644
index 000000000000..6fb1e4b0313b
--- /dev/null
+++ b/dev-vcs/colorsvn/files/0001-Don-t-colorize-svn-mkdir-bug-321451.-Use-IPC-open2-i.patch
@@ -0,0 +1,43 @@
+From 869595b958e80f8c05b823c0df514d3decbe6686 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 16 Sep 2010 13:04:25 +0200
+Subject: [PATCH] Don't colorize 'svn mkdir', bug 321451. Use IPC::open2 instead of open3 to avoid using STDERR, bug 326279.
+
+---
+ colorsvn-original |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/colorsvn-original b/colorsvn-original
+index 01d7be3..46f105b 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;
+@@ -115,7 +115,7 @@ our %commandmap = ( "add" => ["add"],
+ 					);
+ 					
+ # never colorize this commands
+-our @preventcolor = ("commit", "help", "import", "lock", "switch", "propedit", "resolved", "revert", "unlock");
++our @preventcolor = ("commit", "help", "import", "lock", "switch", "propedit", "resolved", "revert", "unlock", "mkdir");
+ 					
+ #
+ # set default values
+@@ -331,7 +331,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,;
+ 
+-- 
+1.7.2.2
+