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

Fix bug 280400.
Thanks to Jeroen Roovers (jer).
(Portage version: 13870-svn/cvs/Linux ppc, RepoMan options: --force)

3 files changed, 32 insertions, 57 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/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
-}