Respect LDFLAGS (bug #335715), CC, CFLAGS.

Package-Manager: portage-2.2_rc86/cvs/Linux i686

4 files changed, 31 insertions, 54 deletions

diff --git a/app-text/pspresent/ChangeLog b/app-text/pspresent/ChangeLog
index 4d6dbb2292cc..ce7f95c03c4e 100644
--- a/app-text/pspresent/ChangeLog
+++ b/app-text/pspresent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pspresent
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.27 2009/12/26 17:32:04 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.28 2010/09/28 17:58:47 jer Exp $
+
+*pspresent-1.3-r1 (28 Sep 2010)
+
+  28 Sep 2010; Jeroen Roovers <jer@gentoo.org> -pspresent-1.2.ebuild,
+  -pspresent-1.2-r1.ebuild, +pspresent-1.3-r1.ebuild:
+  Respect LDFLAGS (bug #335715), CC, CFLAGS.
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> pspresent-1.2.ebuild,
   pspresent-1.2-r1.ebuild, pspresent-1.3.ebuild:
diff --git a/app-text/pspresent/Manifest b/app-text/pspresent/Manifest
index fce1e28c00c4..00f562341ddf 100644
--- a/app-text/pspresent/Manifest
+++ b/app-text/pspresent/Manifest
@@ -1,7 +1,5 @@
-DIST pspresent-1.2.tar.gz 14346 RMD160 6ebbb08db91a5b4f71ed9d9632d6c8034cd4690c SHA1 96e45d16a4f4c42a5a4989b81bb08e81b52afed3 SHA256 080e49341ad653c7dd98b4c56fba82fbdc52ae604a3ea371a5e74a64e470bb13
 DIST pspresent-1.3.tar.gz 14357 RMD160 9a2a0a277ff8d7d08f275b5299ce69c706abf67e SHA1 64f5de016543fbe549310d5ddb40aac9ed33b5a1 SHA256 94f2b6fa437929c9add2b8f4554a204d49132170c1d167c4389c7de26f5a6f80
-EBUILD pspresent-1.2-r1.ebuild 850 RMD160 a9038d892be3a09b169b092db30a47c225e92277 SHA1 ad6c1585593ce184b1dd01a52fa78cccb8763834 SHA256 5fb66a7998727d8ba433a935dc688f3b06bad82c3d2490f1b31259e04dffee45
-EBUILD pspresent-1.2.ebuild 854 RMD160 929aa3666ac57185901aa68fe05ad11e4e618006 SHA1 43ae720b9fe673e3b15ce5fcbf4762d40897cb14 SHA256 ec3cd2ddfba6f992009bf2caaa75c3ec339746c1c66f6030b8446798ed9164a5
+EBUILD pspresent-1.3-r1.ebuild 1033 RMD160 21c494c2726a2957dc4679ed824132bde3b12c48 SHA1 c5ffced8a2b725911d5d5df17f20a2a1f8645351 SHA256 5f9b5e9f918ce93553c53c9b3bfd66e194826ad3b9b3eb7539ff8bacae98b18d
 EBUILD pspresent-1.3.ebuild 844 RMD160 76fc9c57dfcf72c4ac649e5cc212f49fdb160676 SHA1 0cffe987b4c4ac99ac4382df064c52d373d774b3 SHA256 0a3c0b3be1db7460ba322bac73d804778944571e811d78bf1ef52c143e097336
-MISC ChangeLog 3209 RMD160 19ed2c04ca4a5da058415b0baa86736b8e3b695c SHA1 a304937940f5b53322728a8695b3276c01785223 SHA256 52245477179a30e21cfba975ef2c1edae82fc579dde9e6ad5662ad05e5d799da
+MISC ChangeLog 3412 RMD160 6c30e25fff28ee3e98f8dc6190750fefdfaa1911 SHA1 266e8095ee2243a4dc9d903dd2605d835cc10c60 SHA256 836b5b9bdf16eb574df8c9e322309c69c67c063a1e21535e0149f597367e5c34
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/app-text/pspresent/pspresent-1.2.ebuild b/app-text/pspresent/pspresent-1.2.ebuild
deleted file mode 100644
index e3d4e10b465c..000000000000
--- a/app-text/pspresent/pspresent-1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2.ebuild,v 1.12 2009/12/26 17:32:04 pva Exp $
-
-IUSE="xinerama"
-
-DESCRIPTION="A tool to display full-screen PostScript presentations."
-SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
-HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
-
-RDEPEND="x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	app-text/ghostscript-gpl"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-
-src_compile()
-{
-	if ! use xinerama ; then
-		sed -i -e "/^XINERAMA/s/^/#/g" Makefile
-	fi
-	make pspresent || die "make failed"
-}
-
-src_install()
-{
-	dobin pspresent
-	doman pspresent.1
-}
diff --git a/app-text/pspresent/pspresent-1.2-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
index 9082b270fd92..4e211b0c5cee 100644
--- a/app-text/pspresent/pspresent-1.2-r1.ebuild
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -1,12 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2-r1.ebuild,v 1.5 2009/12/26 17:32:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.3-r1.ebuild,v 1.1 2010/09/28 17:58:47 jer Exp $
 
-IUSE="xinerama"
+EAPI="2"
+
+inherit toolchain-funcs
 
 DESCRIPTION="A tool to display full-screen PostScript presentations."
 SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
 HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="xinerama"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="x11-libs/libX11
 	xinerama? ( x11-libs/libXinerama )
@@ -16,20 +23,21 @@ DEPEND="${RDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 	>=sys-apps/sed-4"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-src_compile()
-{
+src_prepare() {
 	if ! use xinerama ; then
-		sed -i -e "/^XINERAMA/s/^/#/g" Makefile
+		sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile"
 	fi
-	emake || die "emake failed"
+	sed -i Makefile \
+		-e 's|= -Wall -O2|+= -Wall|g' \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die
 }
 
-src_install()
-{
+src_install() {
 	dobin pspresent
 	doman pspresent.1
 }