diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-02-10 14:00:41 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-02-10 14:00:41 +0000 |
| commit | 1566bc8a24903067547d8dbb25bd00c1a18cefb0 (patch) | |
| tree | df1c14c4b66f7d55bed3a85a70df24bd568e3f10 /app-misc | |
| parent | Move gnome-vfs-obexftp to PDEPEND to avoid circular deps. (diff) | |
| download | gentoo-2-1566bc8a24903067547d8dbb25bd00c1a18cefb0.tar.gz gentoo-2-1566bc8a24903067547d8dbb25bd00c1a18cefb0.tar.bz2 gentoo-2-1566bc8a24903067547d8dbb25bd00c1a18cefb0.zip | |
Fix compilation error, bug #202704.
(Portage version: 2.1.4.2)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/color/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/color/color-1.1.ebuild | 17 | ||||
| -rw-r--r-- | app-misc/color/color-1.2.ebuild | 17 |
3 files changed, 18 insertions, 24 deletions
diff --git a/app-misc/color/ChangeLog b/app-misc/color/ChangeLog index 4ad9eaf55c1f..90c7ced691ec 100644 --- a/app-misc/color/ChangeLog +++ b/app-misc/color/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/color -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/color/ChangeLog,v 1.16 2007/12/25 15:38:27 phreak Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/color/ChangeLog,v 1.17 2008/02/10 14:00:41 swegener Exp $ + + 10 Feb 2008; Sven Wegener <swegener@gentoo.org> color-1.1.ebuild, + color-1.2.ebuild: + Fix compilation error, bug #202704. 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing taviso from metadata.xml as per #202471. diff --git a/app-misc/color/color-1.1.ebuild b/app-misc/color/color-1.1.ebuild index 0e83a3ce8bd5..525443fd0210 100644 --- a/app-misc/color/color-1.1.ebuild +++ b/app-misc/color/color-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.1.ebuild,v 1.18 2007/12/17 21:10:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.1.ebuild,v 1.19 2008/02/10 14:00:41 swegener Exp $ inherit toolchain-funcs @@ -13,21 +13,16 @@ SLOT="0" KEYWORDS="alpha amd64 ~hppa mips ppc ppc64 sparc x86" IUSE="" -src_unpack() { - unpack ${A} - cd "${S}" - - # Use correct compiler and respect CFLAGS - sed -i -e "s/cc/$(tc-getCC)/g" \ - -e "s/-W -Wall -O2 -g/${CFLAGS}/g" Makefile +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" } src_install() { - dobin color + dobin color || die "dobin failed" dodoc CHANGELOG README # symlink for british users. - dosym /usr/bin/color /usr/bin/colour + dosym color /usr/bin/colour } pkg_postinst() { diff --git a/app-misc/color/color-1.2.ebuild b/app-misc/color/color-1.2.ebuild index 520290a2c3f5..39b48dc35a12 100644 --- a/app-misc/color/color-1.2.ebuild +++ b/app-misc/color/color-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.2.ebuild,v 1.1 2007/12/17 21:10:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.2.ebuild,v 1.2 2008/02/10 14:00:41 swegener Exp $ inherit toolchain-funcs @@ -13,21 +13,16 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="" -src_unpack() { - unpack ${A} - cd "${S}" - - # Use correct compiler and respect CFLAGS - sed -i -e "s/cc/$(tc-getCC)/g" \ - -e "s/-W -Wall -O2 -g/${CFLAGS}/g" Makefile +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" } src_install() { - dobin color + dobin color || die "dobin failed" dodoc CHANGELOG README # symlink for british users. - dosym /usr/bin/color /usr/bin/colour + dosym color /usr/bin/colour } pkg_postinst() { |