Workaround bug in ccdep.pl with GCC 4.5.x wrt #315619.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 27 insertions, 26 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 6d269dc970f7..be4c44827dce 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/sam2p
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.39 2010/06/11 20:21:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.40 2010/08/23 21:15:03 ssuominen Exp $
+
+  23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> sam2p-0.47.ebuild:
+  Workaround bug in ccdep.pl with GCC 4.5.x wrt #315619.
 
 *sam2p-0.47 (11 Jun 2010)
 
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index fcef6ce8ef1a..00ff869c2810 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sam2p-0.45-cflags.patch 1294 RMD160 eeadcc13c88f1685cdbb15d50fe49ccc738f2a15 SHA1 0218fa834218e51937625b9e0168c709db5fb7a0 SHA256 31fec5d1396185336d33e0ed2d0b005264f4af6b8c63b6b39a2947d07e69ca9e
 AUX sam2p-0.45-distcc.patch 324 RMD160 aea15d4ffccc99041ead74b1ca9bb6419e72a8dc SHA1 c4154ffee146c66ba72114f0e5a84cc3c35a9619 SHA256 5226cc74693dac083b26fb608f29c040f43f19b3c5898b82a8a7727421264d5b
 AUX sam2p-0.45-fbsd.patch 319 RMD160 7f4afe0d92224471aa2ad96eeefe9e9fa05c2db1 SHA1 24522fb8171c52249cbb57c52d16ae9e6196cc5a SHA256 44944d770cb7dc515c54b325d46451edefb89b73ac3b407374d18b7639a26d80
@@ -11,13 +8,6 @@ DIST sam2p-0.46.tar.gz 551666 RMD160 079d553b822ccc434150e899d16bec6cf2bc53cd SH
 DIST sam2p-0.47.tar.gz 558936 RMD160 6a2b01d3a1d5a8b35eb2233491ae64ddbfb69769 SHA1 f1c08d786ec8fb09b39b635a315cbd0271d4c47f SHA256 6e0cdab2b78124084a01cfb41fc5e42c0666c9103d7bf4f7c860f4406e051d23
 EBUILD sam2p-0.45-r1.ebuild 1175 RMD160 4b562c405dd831f5f21d08f08b047e1c7b5a691c SHA1 483eb90b5cbf20b24af73faf3b536193f30667a2 SHA256 ebbc5a7aebad92d5e5cea58d92640a6b230c8dc8e9fb9877ecc2580f6d5006a8
 EBUILD sam2p-0.46.ebuild 1089 RMD160 04467874a698c1ddded98c7e26bcb110d39d7d90 SHA1 72a37e3bf2a0cc5609b91afb240e9bf876d7d76c SHA256 0fe583297d1594def3442a3ca4596e0a8bac62d243001a21721f9588d27fa90f
-EBUILD sam2p-0.47.ebuild 1096 RMD160 40014180eb71a42d908017a014d200482777b917 SHA1 c8f9e88d7dd337f4e3b06ae5c9620dce649b0780 SHA256 0874a424b10bbb9febc3cc47588c318bdec4c49999696c397bbde41887e10177
-MISC ChangeLog 5279 RMD160 cdfd08601535b907d0315fc2c5c3a94c0844e3a0 SHA1 f78d2a8ccc800840efff640a57d1f47201e1a8b2 SHA256 3e106da4b84ef66bfa14604e33982f99e7ad6c2f987ed577c71b1a22afe1148d
+EBUILD sam2p-0.47.ebuild 1074 RMD160 e297358062f781793c69447db3b5529bfe89d504 SHA1 4de56497904bf1996d81338ea25170706cbf9e26 SHA256 7f77ef15e41751709822096b130b9da852e6984411d30b1aefeec01ee44e4307
+MISC ChangeLog 5411 RMD160 bc99e1997b895ad967857c9eb4c03cce39aa5ea6 SHA1 e463075b88dcac4c3913fb7b5f7e572f1d42e0a1 SHA256 fd50f8852b557543ab5b8b07cceb504de14abe90471f282e642c2089086b4639
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwSmusACgkQvFcC4BYPU0q2GQCguj6pTg9Z8yqgulVwVLW2QDJe
-5YwAn2nHgg5GwWHHwuijJjdhXpb7Xw/E
-=qjXC
------END PGP SIGNATURE-----
diff --git a/media-gfx/sam2p/sam2p-0.47.ebuild b/media-gfx/sam2p/sam2p-0.47.ebuild
index 7bbfc8a60722..c7d15443cef1 100644
--- a/media-gfx/sam2p/sam2p-0.47.ebuild
+++ b/media-gfx/sam2p/sam2p-0.47.ebuild
@@ -1,40 +1,48 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.47.ebuild,v 1.1 2010/06/11 20:21:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.47.ebuild,v 1.2 2010/08/23 21:15:03 ssuominen Exp $
 
-inherit toolchain-funcs eutils autotools
+EAPI=2
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
 HOMEPAGE="http://code.google.com/p/sam2p/"
 SRC_URI="http://sam2p.googlecode.com/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="examples gif"
 
-DEPEND="dev-lang/perl"
 RDEPEND=""
+DEPEND="dev-lang/perl"
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.45-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-0.45-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-0.45-cflags.patch"
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.45-fbsd.patch \
+		"${FILESDIR}"/${PN}-0.45-nostrip.patch \
+		"${FILESDIR}"/${PN}-0.45-cflags.patch
+
+	touch stdafx.h bts2.tth #315619
+
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	tc-export CXX
-	econf --enable-lzw $(use_enable gif) || die "econf failed"
-	emake || die "make failed"
+	econf \
+		--enable-lzw \
+		$(use_enable gif)
+
+	rm -f stdafx.h bts2.tth
 }
 
 src_install() {
-	dobin sam2p || die "Failed to install sam2p"
+	dobin sam2p || die
 	dodoc README
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*