Fix collision with media-radio/unixcw, #351293; make cw work

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

7 files changed, 147 insertions, 9 deletions

diff --git a/app-misc/cw/ChangeLog b/app-misc/cw/ChangeLog
index 02b6d7556aea..3ce50cbbe067 100644
--- a/app-misc/cw/ChangeLog
+++ b/app-misc/cw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/cw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/ChangeLog,v 1.26 2011/01/07 23:25:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/ChangeLog,v 1.27 2011/01/10 19:17:46 jlec Exp $
+
+*cw-1.0.16-r2 (10 Jan 2011)
+
+  10 Jan 2011; Justin Lecher <jlec@gentoo.org> +files/1.0.16-collision.patch,
+  cw-1.0.15.ebuild, cw-1.0.16-r1.ebuild, +cw-1.0.16-r2.ebuild,
+  +files/1.0.16-path.patch:
+  Fix collision with media-radio/unixcw, #351293; make cw work
 
   07 Jan 2011; Brent Baude <ranger@gentoo.org> cw-1.0.16-r1.ebuild:
   Marking cw-1.0.16-r1 ppc for bug 350564
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index fd65b4eaac26..7f0b685fd34b 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0.16-collision.patch 1367 RMD160 bd247c4dd5ab6ea05e779430f68b67c69b58047c SHA1 924dfd0c53d141410e606e42c4eabcaed272d58b SHA256 27a60b8495990c8207e402649cb4cfd4f9b93d40c5762e7f310c00717d3ff6c6
 AUX 1.0.16-ldflags.patch 486 RMD160 0a2786caa4cbd3b3c2b8ace11d7818c2b8f174d0 SHA1 333983355a25daf81a3a9576e507007786fa0ff5 SHA256 b825a9da47e5a06434f23ac092ede9b1e89956f966f342dd50bd6e463230c1a5
+AUX 1.0.16-path.patch 550 RMD160 f3493e2ee2558a13d9eb6ea34c239870cf66963c SHA1 e6d18d5f9493dc196ddda7ef7de408d24947427d SHA256 f423c7f4464be0bc248230bfdec7ca9a5a18a4c0fc03e7755372e1265e54f513
 DIST cw-1.0.15.tar.bz2 75979 RMD160 ad422c0125f7155b0746914852e21b794fd8f772 SHA1 b43ffa1ae8ed8e54d71f63376d54c8ae5fc86156 SHA256 3a85a34c54ac460c92ffbe49ef306e86c541d959d4429736e404714a4aa87c40
 DIST cw-1.0.16.tar.bz2 76035 RMD160 489c27d30f9dfb7695abab918e70f9ad0adcccfe SHA1 ef1ee1be8b1abdf023f997426ece522b317260df SHA256 a12738f13f3ee90b0bd0c875b4d0bd345d51dced6efd5a14dd82a4705c78fbe4
-EBUILD cw-1.0.15.ebuild 1585 RMD160 8813a77967382393dca74f0f084eae7d930b836d SHA1 f4cd03ad6b6f039284b97da3950d92abec90a12b SHA256 aeeacfbb7137d99cca21d2e5210ece20fcb24e7b52459300f043d56482edfa05
-EBUILD cw-1.0.16-r1.ebuild 1591 RMD160 852c39c8210dab259cb1053ad97352d8910324ae SHA1 f0ea396d18f7f60a03ab48b41d78678704ccebfe SHA256 153f442db61df5e00941651518548aea0b034ba90a6c5cb322fab3a81b6b3b0a
-MISC ChangeLog 3213 RMD160 30754c463065bdce970ef6bd2169124e9f43b657 SHA1 a9700de6bdbc34ce3e1eb1f96b67260c36bf6657 SHA256 04a40ab3df4025ec9b2d83743a1f7337b96b60caa52c436361efbb66088110c7
+EBUILD cw-1.0.15.ebuild 1578 RMD160 e1d060f265b85d6278080c72ac951d33bd5a7dfa SHA1 51850ace6336806dabd594c8874a107b4c006983 SHA256 97592eaf12fd4774a41f5e64224cdf33fb796d6a2cf8c0b3aca4ba248e38998b
+EBUILD cw-1.0.16-r1.ebuild 1646 RMD160 dfcd233ecab05e47eaf466e84d3133a062b6c64f SHA1 5de9e584aeb66c043d337b943d71f61b09d47930 SHA256 b753800acfc52974fbe638e869a1002018a90b2b19a47fc81023ef765ebd5f64
+EBUILD cw-1.0.16-r2.ebuild 1704 RMD160 6ec74bb051b372b0c279969b4dd66ba25ecfd267 SHA1 c10316d816d6126634f2b138115b720460f83afe SHA256 522a70366626a90799ac609a539651df68a314612aa03d27b7072451fc304b2b
+MISC ChangeLog 3473 RMD160 91a40a5fce35a6c86fc0d290207a3561f130b807 SHA1 aba160dacc97d0fbd2aa3e8111e22de9c7c4ef1b SHA256 c0516e663f43e495733a7179debd96526bca3164279777c980efe0551dbb248a
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0rWyMACgkQgAnW8HDreRaqYACfbK3dtMuy/24GmZKx7yj5cFiy
++wQAoIxXc3O3n7e/fFw1YV0D5s3dgvyg
+=L1ep
+-----END PGP SIGNATURE-----
diff --git a/app-misc/cw/cw-1.0.15.ebuild b/app-misc/cw/cw-1.0.15.ebuild
index d3fee4a89124..d2bf325ca96d 100644
--- a/app-misc/cw/cw-1.0.15.ebuild
+++ b/app-misc/cw/cw-1.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild,v 1.9 2010/01/01 18:29:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild,v 1.10 2011/01/10 19:17:46 jlec Exp $
 
 inherit toolchain-funcs
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
+RDEPEND="!media-radio/unixcw"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +25,7 @@ src_unpack() {
 
 src_compile() {
 	tc-export CC
-	econf || die "econf failed"
+	econf
 	emake local || die "emake failed"
 }
 
diff --git a/app-misc/cw/cw-1.0.16-r1.ebuild b/app-misc/cw/cw-1.0.16-r1.ebuild
index 227a5b1e8559..b7d29ba96b6e 100644
--- a/app-misc/cw/cw-1.0.16-r1.ebuild
+++ b/app-misc/cw/cw-1.0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild,v 1.4 2011/01/07 23:25:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild,v 1.5 2011/01/10 19:17:46 jlec Exp $
 
 EAPI="3"
 
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc ~x86"
 IUSE=""
 
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="!media-radio/unixcw"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-ldflags.patch
 	sed -i 's|\(CWLIB=\)/usr/local/lib/cw|\1/usr/libexec/cw|' bin/colorcfg || \
diff --git a/app-misc/cw/cw-1.0.16-r2.ebuild b/app-misc/cw/cw-1.0.16-r2.ebuild
new file mode 100644
index 000000000000..115d0188167e
--- /dev/null
+++ b/app-misc/cw/cw-1.0.16-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.16-r2.ebuild,v 1.1 2011/01/10 19:17:46 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
+HOMEPAGE="http://cwrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-path.patch \
+		"${FILESDIR}"/${PV}-collision.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake local || die "emake failed"
+}
+
+src_install() {
+	insinto /usr/share/cw
+	doins etc/* || die
+
+	exeinto /usr/libexec/cw
+	doexe def/* || die
+
+	doman man/cwu* || die
+	newman man/cw.* color-wrapper || die
+	dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README* || die
+
+	dobin bin/{cwu,colorcfg} || die
+	# app-misc/color currently conflicts; hopefully 'colors' is safe
+	newbin bin/color colors || die
+	# media-radio/unixcw currently conflicts;
+	newbin bin/cw color-wrapper || die
+}
+
+pkg_postinst() {
+	ebegin "Updating definition files"
+	cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
+	eend $?
+
+	elog "To enable color-wrapper, as your user, run:"
+	elog "  colorcfg [1|2|3]"
+	elog "to add relevant environment variables to your ~/.bash_profile"
+	elog "Run colorcfg without options to see what [1|2|3] means."
+	elog
+	elog "After sourcing your ~/.bash_profile, commands for which definitions"
+	elog "are provided should have colored output."
+	elog
+	elog "To enable/disable colored output, run: 'colors [on|off]'."
+}
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
new file mode 100644
index 000000000000..52bb8cab8f3b
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -0,0 +1,34 @@
+diff --git a/src/cw.c b/src/cw.c
+index d7b4875..a7811d8 100644
+--- a/src/cw.c
++++ b/src/cw.c
+@@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
+  s=strlen(buf);
+  if(buf[s]=='\n')s--;
+  if(buf[s]=='\r')s--;
+- if(s>4&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-4),"/cw",3))return(1);
++ if(s>15&&!strncmp(buf,"#!",2)&&!strncmp(buf+(s-15),"/color-wrapper",14))return(1);
+  return(0);
+ }
+ /* sets left and right borders. */
+diff --git a/src/cwu.c b/src/cwu.c
+index 823618d..63f566b 100644
+--- a/src/cwu.c
++++ b/src/cwu.c
+@@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
+  if(argc>1&&!strcmp(argv[1],"-v"))
+   cwuexit(1,"cwu (color wrapper directive updater) v"VERSION);
+  if(argc<2)
+-  cwuexit(1,"syntax: cwu <definitions directory> <cw binary path>");
++  cwuexit(1,"syntax: cwu <definitions directory> <color-wrapper binary path>");
+  if(argc<3)cwuexit(1,"no path provided to update with.");
+- if(strncmp(argv[2]+(strlen(argv[2])-3),"/cw",3))
+-  cwuexit(1,"cw binary path doesn't end with `/cw'.");
++ if(strncmp(argv[2]+(strlen(argv[2])-14),"/color-wrapper",14))
++  cwuexit(1,"cw binary path doesn't end with `/color-wrapper'.");
+  if(access(argv[2],X_OK))
+-  cwuexit(1,"cw binary does not exist or is not executable.");
++  cwuexit(1,"color-wrapper binary does not exist or is not executable.");
+  globcw(argv[1],argv[2]);
+  cwuexit(0,0);
+  exit(0);
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
new file mode 100644
index 000000000000..f62b5bd994d4
--- /dev/null
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -0,0 +1,19 @@
+diff --git a/bin/colorcfg b/bin/colorcfg
+index cf73b50..3e78c73 100755
+--- a/bin/colorcfg
++++ b/bin/colorcfg
+@@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
+ if test -x "${HOME}/.cw/bin/colorcfg";then
+  CWLIB="${HOME}/.cw/def"
+ else
+- SED="`which sed 2>/dev/null`"
+- if test -z "$SED";then
+-  CWLIB="/usr/local/lib/cw"
+-  echo "(NOTE: using static cw library path, this could be invalid)"
+- else
+-  CWLIB="`echo \"$0/lib/cw\"|sed \"s/\/bin\/colorcfg//g\"`"
+- fi
++  CWLIB="/usr/libexec/cw"
+ fi
+ 
+ echo "[ cw library path: $CWLIB ]"