stable x86, bug 154787; make it properly die with FEATURES=distcc and revamp the ebuild a bit: adding output to die calls; don't use a local myconf construct, just call econf with options directly; use emake instead of just make

Package-Manager: portage-2.1.2.12

3 files changed, 33 insertions, 16 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 13d2aa93bd51..ea4ce3dbe3f9 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sam2p
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.15 2007/09/01 11:31:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.16 2007/09/01 11:45:59 opfer Exp $
+
+  01 Sep 2007; Christian Faulhammer <opfer@gentoo.org> sam2p-0.45.ebuild:
+  stable x86, bug 154787; make it properly die with FEATURES=distcc and revamp
+  the ebuild a bit: adding output to die calls; don't use a local myconf
+  construct, just call econf with options directly; use emake instead of just
+  make
 
   01 Sep 2007; nixnut <nixnut@gentoo.org> sam2p-0.45.ebuild:
   Stable on ppc wrt bug 154787
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 14c0fd653633..e56ce3eab36a 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST sam2p-0.44.tar.bz2 463314 RMD160 8d8b69ec079d4e9d5e340e5ab21d696e4a2848da SHA1 515f99dcbd4969c084051fc7f4edfb1accc8929a SHA256 0ca55917d9d80684c8d557b0e066707192bbf1dd9c68716652a5720cc032684a
 DIST sam2p-0.45.tar.bz2 434746 RMD160 122e81208f241a7e9d33bddd7df17780b306b305 SHA1 7bba06220ff755c9c68632644afa8ef2f26cab6f SHA256 ed109acb74445e926f39757d7f133b72903d92017da46f8ccb4f26624eb797ff
 EBUILD sam2p-0.44.ebuild 811 RMD160 8357c53b4647fa16f2f376ce6449ab6fa577aea0 SHA1 acaeb1327e1393303792c0027afaeb1555b09068 SHA256 51e4d620fad7540aa4f1f18f5826b8e083965415f6f047655edf5d0449b708e9
 MD5 9249d0e7c7e8922fa0352d9e148b6267 sam2p-0.44.ebuild 811
 RMD160 8357c53b4647fa16f2f376ce6449ab6fa577aea0 sam2p-0.44.ebuild 811
 SHA256 51e4d620fad7540aa4f1f18f5826b8e083965415f6f047655edf5d0449b708e9 sam2p-0.44.ebuild 811
-EBUILD sam2p-0.45.ebuild 818 RMD160 b48e86b4ad6bbcaefc6234ab4baee521012b35e4 SHA1 76c3244879644caa3ea17ec9f7b178ad3734665c SHA256 1fe19b968eecd18c79c9bfe9c4853d197ccef3ce398b0d6f7a318d0ed6ec20ff
-MD5 3c66331e6eb0fe6e5d9ade1bdc09c9b9 sam2p-0.45.ebuild 818
-RMD160 b48e86b4ad6bbcaefc6234ab4baee521012b35e4 sam2p-0.45.ebuild 818
-SHA256 1fe19b968eecd18c79c9bfe9c4853d197ccef3ce398b0d6f7a318d0ed6ec20ff sam2p-0.45.ebuild 818
-MISC ChangeLog 1751 RMD160 4ee5dc6ce1ddfb093f4d5091d7248821ab8e3d13 SHA1 ca0ac5269e67f5789c3b9c2516beb7711c442779 SHA256 c31c25a5e53e7f60435bc58c6194c80b70ab669d700d9699c34dff17a4239aa7
-MD5 a8a244ec0c5a0dce0a86a9bca9561d8c ChangeLog 1751
-RMD160 4ee5dc6ce1ddfb093f4d5091d7248821ab8e3d13 ChangeLog 1751
-SHA256 c31c25a5e53e7f60435bc58c6194c80b70ab669d700d9699c34dff17a4239aa7 ChangeLog 1751
+EBUILD sam2p-0.45.ebuild 811 RMD160 55a4a3fb0a96846eaef18e813dc3ca00bce493bb SHA1 e3b6c7a55c676c0c6fbc649ebbb5ea9f79e69ec0 SHA256 47b8f115a34228a4ddcdfb86d60136b27492efb546c96194678a43b92b87d23d
+MD5 9266ff9dde1db25aa14e14579f4640e8 sam2p-0.45.ebuild 811
+RMD160 55a4a3fb0a96846eaef18e813dc3ca00bce493bb sam2p-0.45.ebuild 811
+SHA256 47b8f115a34228a4ddcdfb86d60136b27492efb546c96194678a43b92b87d23d sam2p-0.45.ebuild 811
+MISC ChangeLog 2062 RMD160 1e88ec0160c694914d1edec870b93aad1fd074be SHA1 37e3fab798bde3daeb2af1df384a436094329b0f SHA256 3463dce07b34bd26e57c400c9fa91a01f36d0bfd89faa62e3b907c583001e784
+MD5 c90b7c9a7e356c68c08f9ce7cfa92d00 ChangeLog 2062
+RMD160 1e88ec0160c694914d1edec870b93aad1fd074be ChangeLog 2062
+SHA256 3463dce07b34bd26e57c400c9fa91a01f36d0bfd89faa62e3b907c583001e784 ChangeLog 2062
 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
@@ -22,3 +25,10 @@ SHA256 ea9abbf6740ed16437a73487a83f94b46dd4adfdca0d4648873fd86781f2408e files/di
 MD5 706883497aa064cab22ffa3f0956d64f files/digest-sam2p-0.45 235
 RMD160 a7d36b87b9c4838fad2948fca692ce6aa78b15e2 files/digest-sam2p-0.45 235
 SHA256 2c1bd7ab178813330129fcd38fcc42284d4d0d8a1aa1df55395c164cff274800 files/digest-sam2p-0.45 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG2VD9NQqtfCuFneMRAvS9AKCOixeWOpooJ6xOSCEoIrtGJRgNvQCbBzBT
+O05j2LA6NC8ilMHRjKtHj0g=
+=oFVi
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/sam2p/sam2p-0.45.ebuild b/media-gfx/sam2p/sam2p-0.45.ebuild
index 333486b51c39..3aaf0edc0332 100644
--- a/media-gfx/sam2p/sam2p-0.45.ebuild
+++ b/media-gfx/sam2p/sam2p-0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45.ebuild,v 1.4 2007/09/01 11:31:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45.ebuild,v 1.5 2007/09/01 11:45:59 opfer Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.inf.bme.hu/~pts/sam2p/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="gif"
 DEPEND="dev-lang/perl"
 RDEPEND="virtual/libc"
@@ -18,11 +18,12 @@ RDEPEND="virtual/libc"
 RESTRICT="test"
 
 src_compile() {
-	local myconf="--enable-lzw `use_enable gif`"
-	# Makedep borks if distcc is used, so disable it for econf by
-	# overriding the path to g++
-	CXX="$(tc-getCXX)" econf ${myconf} || die
-	make || die
+	# Makedep fails with distcc
+	if has distcc ${FEATURES}; then
+		die "disable FEATURES=distcc"
+	fi
+	econf --enable-lzw $(use_enable gif) || die "econf failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {