* [gentoo-commits] gentoo-x86 commit in app-misc/cw: cw-1.0.15.ebuild ChangeLog cw-1.0.16-r1.ebuild cw-1.0.16-r2.ebuild
@ 2011-01-10 19:17 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-01-10 19:17 UTC (permalink / raw
To: gentoo-commits
jlec 11/01/10 19:17:46
Modified: cw-1.0.15.ebuild ChangeLog cw-1.0.16-r1.ebuild
Added: cw-1.0.16-r2.ebuild
Log:
Fix collision with media-radio/unixcw, #351293; make cw work
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Revision Changes Path
1.10 app-misc/cw/cw-1.0.15.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild?r1=1.9&r2=1.10
Index: cw-1.0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.15.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cw-1.0.15.ebuild 1 Jan 2010 18:29:41 -0000 1.9
+++ cw-1.0.15.ebuild 10 Jan 2011 19:17:46 -0000 1.10
@@ -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 @@
IUSE=""
DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
+RDEPEND="!media-radio/unixcw"
src_unpack() {
unpack ${A}
@@ -25,7 +25,7 @@
src_compile() {
tc-export CC
- econf || die "econf failed"
+ econf
emake local || die "emake failed"
}
1.27 app-misc/cw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/cw/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 7 Jan 2011 23:25:12 -0000 1.26
+++ ChangeLog 10 Jan 2011 19:17:46 -0000 1.27
@@ -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
1.5 app-misc/cw/cw-1.0.16-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild?r1=1.4&r2=1.5
Index: cw-1.0.16-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/cw/cw-1.0.16-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cw-1.0.16-r1.ebuild 7 Jan 2011 23:25:12 -0000 1.4
+++ cw-1.0.16-r1.ebuild 10 Jan 2011 19:17:46 -0000 1.5
@@ -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 @@
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 || \
1.1 app-misc/cw/cw-1.0.16-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.16-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cw/cw-1.0.16-r2.ebuild?rev=1.1&content-type=text/plain
Index: cw-1.0.16-r2.ebuild
===================================================================
# 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]'."
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-10 19:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-10 19:17 [gentoo-commits] gentoo-x86 commit in app-misc/cw: cw-1.0.15.ebuild ChangeLog cw-1.0.16-r1.ebuild cw-1.0.16-r2.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox