Fix compilation error, bug #202704.

Package-Manager: portage-2.1.4.2

4 files changed, 31 insertions, 27 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/Manifest b/app-misc/color/Manifest
index c81a3e7b8634..0b1bc78a6d2b 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST color-1.1.tar.gz 9468 RMD160 06541a0b9b2e07d0b5046ff9d0e717bc9fb05504 SHA1 4a2b5d077c9adefa2edaabdb4e3e89eaab667f56 SHA256 02d5857d83a72b3773e9df22126e9b2013bad888eced3893d0087a74c2da8024
 DIST color-1.2.tar.gz 10040 RMD160 cdddd71e9861b1332746b49f6610d52316e857c3 SHA1 b4270ad17bd61b1f77dee2480625345c7566fe47 SHA256 7862fffb3d948b47435803461732f7dea4af64c2714219df7f929e20cb818bd9
-EBUILD color-1.1.ebuild 1067 RMD160 389ec54e626cdeaae883fde005038c59c7d78164 SHA1 a39ab150a02215d9b5a28f9ed570f14c6ec65037 SHA256 9565ef51f5d156ca082736c2da2fdb84a0fcfad9b2864d6a846eaa13eda91579
-EBUILD color-1.2.ebuild 1073 RMD160 45620c8d60644b60da9da615d3d55e59ca4f2312 SHA1 3f4eae54f6a2dc5fcba8037de1e64ce220a3c04e SHA256 80a05fe894b90b20138bdb020a65869fce56bd1fd96a96f719df64359cb73357
-MISC ChangeLog 1683 RMD160 fa371484191cb1dcd90defd73631a59ee25afe0a SHA1 5d6a3a13462c82d06df51845915d9681c7ae6bf2 SHA256 1d051b327a9e10c7c7be827d281cf318429cfdcedfb6a3c1d011291f75f98fb0
+EBUILD color-1.1.ebuild 999 RMD160 21abe229524b69b6528e0cb5c39ff2fc1b1f1322 SHA1 e4070a10138f0cda6ada3db63c1479dfee1f0dec SHA256 53800dc02337e0a5d333770971d12003246e6143368a2e63c734522c56702592
+EBUILD color-1.2.ebuild 1005 RMD160 e342337316473b3ddce0958bb30b8def677312ea SHA1 f478edacb76a999056f784249e3fb2ba0d940813 SHA256 6a716a97124c2c5e81fa328cbe91454570193c401e8c754b86a25bb3a48e19c8
+MISC ChangeLog 1812 RMD160 70331d149796b2a4bea6d8f0e112c996c31dfefe SHA1 a8ed40527a78ff23c6a7634d3cd8896eae909052 SHA256 070e9fad72282acdc49793f9d83cbc9979edd371c37b53b06592df6e4be28491
 MISC metadata.xml 488 RMD160 ebffcaa4d975c1a27e6a610f7d82a88d10688d0f SHA1 57fb24878319b46ad1e6e8214c6809e70b7c9eb8 SHA256 71bdb432332c41f6143742c332a0188d6659d36df007545c89433611c34275da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrwORI1lqEGTUzyQRAlehAKCX88Orwv8cppxA0cjTDJhWWKeQpgCfZHWQ
+OGxY3/6SH/Yuy4ooURTwkWw=
+=jPuy
+-----END PGP SIGNATURE-----
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() {