Use users CFLAGS, LDFLAGS, CC, add die and fix RDEPEND.

Fix bug 280400.
Thanks to Jeroen Roovers (jer).
Package-Manager: portage-13870-svn/cvs/Linux ppc
RepoMan-Options: --force

4 files changed, 34 insertions, 60 deletions

diff --git a/sys-apps/powerpc-utils/ChangeLog b/sys-apps/powerpc-utils/ChangeLog
index 81d138c13760..abc1eb628b55 100644
--- a/sys-apps/powerpc-utils/ChangeLog
+++ b/sys-apps/powerpc-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/powerpc-utils
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/ChangeLog,v 1.27 2009/04/17 14:47:46 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/ChangeLog,v 1.28 2009/08/07 20:58:07 volkmar Exp $
+
+*powerpc-utils-1.1.3.18-r2 (07 Aug 2009)
+
+  07 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -powerpc-utils-1.1.3.18.ebuild, -powerpc-utils-1.1.3.18-r1.ebuild,
+  +powerpc-utils-1.1.3.18-r2.ebuild:
+  Use users CFLAGS, LDFLAGS, CC, add die and fix RDEPEND. Fix bug 280400.
+	Thanks to Jeroen Roovers (jer).
 
   17 Apr 2009; Brent Baude <ranger@gentoo.org>
   powerpc-utils-1.1.3.18-r1.ebuild:
diff --git a/sys-apps/powerpc-utils/Manifest b/sys-apps/powerpc-utils/Manifest
index 4636ba9c8ea0..b2d71e4299cf 100644
--- a/sys-apps/powerpc-utils/Manifest
+++ b/sys-apps/powerpc-utils/Manifest
@@ -1,7 +1,6 @@
 DIST powerpc-utils-cleanup.patch.bz2 7255 RMD160 361b792b9770d369e4a88941594f679967ea0fdc SHA1 b9443bc46999d2953409665dc1b24fa2978db7ee SHA256 05592c22230afdef79c92556c2161262ec32cee3feaf29e666bf29ba0ef9b39f
 DIST powerpc-utils_1.1.3-18.diff.gz 27252 RMD160 ec806ada35999fafed571606c9b676f74c9f7040 SHA1 bdff200bc9280b17aa3a8cde52d9784eb7b4fb89 SHA256 7cb699d5e647fe39a9cc1a0276a9e9dc381061a8ecba13671ce8bc1f1037edf4
 DIST powerpc-utils_1.1.3.orig.tar.gz 25104 RMD160 86eacaf0a7f022a850b6540b09220dacb49d0949 SHA1 049baa3dcb879a89afc4da0ee0b90d279bad3b24 SHA256 fde422d13e75d0154fa5d9d94ba3c74f4a91dc0f8ba0351e675ee99eeaddbe95
-EBUILD powerpc-utils-1.1.3.18-r1.ebuild 1446 RMD160 617229c945bfaedfefc2255eb623389e66258a77 SHA1 3e1e42361367ae03417accf1dbf0005c9aeb9bb5 SHA256 5ee68fbcf4f5aebe46fec8a774f66b1f644d3090d7d060da978d99c228c278ae
-EBUILD powerpc-utils-1.1.3.18.ebuild 1356 RMD160 a6a1eb11695691d6503ca7865967b4d32ea8702c SHA1 0187127d1d3894ca1e34bf889a59a2f2ad962cf7 SHA256 a7e8c59d5a355b7a80639720eb6103b7d0f43d8eb77a0a7e34907e30c25287f8
-MISC ChangeLog 3882 RMD160 f78af6ae35e3f8144befdaaf333e29de11086a29 SHA1 7f843e49a66dcd064aaa34f2c15644ddd7f7b3a5 SHA256 dfde0be01d633a9c66df449a0ea08e099e062f045a214967bb6a85c544457219
+EBUILD powerpc-utils-1.1.3.18-r2.ebuild 1740 RMD160 f19742b723990bbe661bb0fe34cf743cdbf5c2d6 SHA1 f560115699a2cd02aec593afc60e544c61a833dc SHA256 dc8d39aeff21d270f3987dbeade8f8da414a4783f067688bb8493fe50eb080b9
+MISC ChangeLog 4190 RMD160 4d613f942025676d02f5bf6a669d08795efb20de SHA1 0204bba92c077d23f68b3d660e7ed7c0dafa6027 SHA256 b60b6a6291f9320b2cb5a893c75fb6585454795f5752fbb3826f9a015ada6f14
 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r1.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild
index 158bdea675c2..f71024d75e71 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r1.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r1.ebuild,v 1.2 2009/04/17 14:47:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild,v 1.1 2009/08/07 20:58:07 volkmar Exp $
 
-inherit eutils versionator
+EAPI="2"
+
+inherit eutils versionator toolchain-funcs
 
 BASEVER=$(get_version_component_range 1-3)
 DEBREV=$(get_version_component_range 4)
@@ -16,29 +18,36 @@ HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
 KEYWORDS="-* ppc ppc64"
 IUSE=""
 DEPEND="virtual/libc"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 SLOT="0"
 LICENSE="GPL-2"
 
 S="${WORKDIR}/pmac-utils"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${PN}_${BASEVER}-${DEBREV}.diff
-	epatch ${WORKDIR}/${PN}-cleanup.patch
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${BASEVER}-${DEBREV}.diff
+	epatch "${WORKDIR}"/${PN}-cleanup.patch
+
+	# use users CFLAGS, LDFLAGS and CC, bug 280400
+	sed -i -e "/LDFLAGS =/d" -e "/CC\t=/d" -e "s/CFLAGS\t=/CFLAGS +=/" \
+		-e "s/-g -O2/-Wstrict-prototypes/" Makefile || die "sed failed"
 }
 
 src_compile() {
-	emake CFLAGS="$CFLAGS -fsigned-char -D_GNU_SOURCE" || die
+	tc-export CC
+	emake || die "emake failed"
 }
 
 src_install() {
 	into /usr
-	dosbin autoboot backlight bootsched clock fblevel fdeject fnset
-	dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad
-	doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8
-	doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8
+	dosbin autoboot backlight bootsched clock fblevel fdeject fnset \
+		|| die "dosbin failed"
+	dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad \
+		|| die "dosbin failed"
+	doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8 \
+		|| die "doman failed"
+	doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8 \
+		|| die "doman failed"
 
 	ewarn "The lsprop utility has been moved into the ibm-powerpc-utils package."
 }
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18.ebuild
deleted file mode 100644
index 2f42cc8c4c66..000000000000
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18.ebuild,v 1.2 2007/08/08 10:57:14 josejx Exp $
-
-inherit eutils versionator
-
-BASEVER=$(get_version_component_range 1-3)
-DEBREV=$(get_version_component_range 4)
-
-DESCRIPTION="PowerPC utilities including nvsetenv, and additional OldWorld apps"
-SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}.orig.tar.gz
-	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}-${DEBREV}.diff.gz
-	mirror://gentoo/${PN}-cleanup.patch.bz2"
-
-HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
-KEYWORDS="-* ppc ppc64"
-IUSE=""
-DEPEND="virtual/libc"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-
-S="${WORKDIR}/pmac-utils"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${PN}_${BASEVER}-${DEBREV}.diff
-	epatch ${WORKDIR}/${PN}-cleanup.patch
-}
-
-src_compile() {
-	emake CFLAGS="$CFLAGS -fsigned-char" || die
-}
-
-src_install() {
-	into /usr
-	dosbin autoboot backlight bootsched clock fblevel fdeject fnset lsprop
-	dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad
-	doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8
-	doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8
-}