Respect CC, CXX and LDFLAGS wrt #317767 by Kacper Kowalik. Drop unnecessary || die from pkg_setup wrt #317769.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 49 insertions, 18 deletions

diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog
index 1b3b2b38d300..710d95265665 100644
--- a/dev-embedded/ponyprog/ChangeLog
+++ b/dev-embedded/ponyprog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/ponyprog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.23 2010/04/29 12:43:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.24 2010/06/17 18:29:43 ssuominen Exp $
+
+  17 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  ponyprog-2.07a-r1.ebuild, +files/ponyprog-2.07a-build.patch:
+  Respect CC, CXX and LDFLAGS wrt #317767 by Kacper Kowalik. Drop
+  unnecessary || die from pkg_setup wrt #317769.
 
   29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   ponyprog-2.07a-r1.ebuild:
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch
new file mode 100644
index 000000000000..00494f487fe1
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch
@@ -0,0 +1,32 @@
+Respect LDFLAGS, CC, CXX
+
+http://bugs.gentoo.org/show_bug.cgi?id=317767
+
+--- Makefile
++++ Makefile
+@@ -331,7 +331,7 @@
+ prps:	$(PRPS)
+ 
+ $(PROG):	$(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
++	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CFLAGS) -c $< -o $@
+--- v/Config.mk
++++ v/Config.mk
+@@ -35,8 +35,6 @@
+ #---------------------------------------------------------------------
+ # Tools used in the makefile execution
+ #---------------------------------------------------------------------
+-CC	=	gcc
+-CXX	=	g++
+ 
+ #---------------------------------------------------------------------
+ # VPATH for dependencies on header files
+@@ -297,5 +295,3 @@
+ #---------------------------------------------------------------------
+ # LINK/LOAD options
+ #---------------------------------------------------------------------
+-LDFLAGS	=	$(LIBDIR) $(LIBS)
+-
diff --git a/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild b/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
index 4e35a97919c1..11c4e8ab8a46 100644
--- a/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.4 2010/04/29 12:43:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.5 2010/06/17 18:29:43 ssuominen Exp $
 
 EAPI="3"
 
@@ -13,47 +13,41 @@ SRC_URI="mirror://sourceforge/${PN}/PonyProg2000-${PV}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="epiphany firefox"
+IUSE="epiphany"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXext
 	x11-libs/libX11
-	epiphany? ( www-client/epiphany )
-	firefox? ( || ( www-client/mozilla-firefox www-client/firefox-bin ) )"
+	epiphany? ( www-client/epiphany )"
 DEPEND="${RDEPEND}
 	|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )"
 
 S="${WORKDIR}/PonyProg2000-${PV}"
 
-pkg_setup() {
-	if (use epiphany && use firefox) ; then
-		die "Only one of epiphany or firefox can be in USE."
-	fi
-}
-
 src_prepare() {
 	sed -i \
 		-e "s:\$(HOME)/Progetti/PonyProg_Sourceforge/v:${S}/v:" \
 		-e 's/\-O2//' \
 		v/Config.mk || die "sed failed"
 
-	sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die "sed failed"
+	sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die
 
 	if use epiphany ; then
-		sed -i -e 's/netscape/epiphany/' e2cmdw.cpp
-	fi
-	if use firefox ; then
-		sed -i -e 's/netscape/firefox/' e2cmdw.cpp
+		sed -i -e 's/netscape/epiphany/' e2cmdw.cpp || die
+	else
+		sed -i -e 's/netscape/firefox/' e2cmdw.cpp || die
 	fi
 	convert ponyprog.ico ponyprog.png
 
-	# Fix compilation with gcc-4.3, bug #227503
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-build.patch
 }
 
 src_compile() {
+	tc-export CC CXX
+
 	# bug #282244
 	emake -j1 || die "emake failed"
 }