Empty the py-compile script instead of symlinking it for compability with automake-1.11.2.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 24 insertions, 20 deletions

diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog
index 87c6b62e9548..2abefe115737 100644
--- a/sys-libs/libsmbios/ChangeLog
+++ b/sys-libs/libsmbios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libsmbios
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.35 2011/09/17 17:58:27 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.36 2012/01/14 18:36:50 ssuominen Exp $
+
+  14 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> libsmbios-2.2.28.ebuild:
+  Empty the py-compile script instead of symlinking it for compability with
+  automake-1.11.2.
 
   17 Sep 2011; Raúl Porcel <armin76@gentoo.org> libsmbios-2.2.26.ebuild:
   ia64 stable wrt #380009
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index fefd1f7816df..66ddc2ff20c9 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libsmbios-2.2.26-gcc46.patch 1375 RMD160 dc44975b8a48f183e633aec8c9008328cff1b9bf SHA1 f73196bb2c7db499db9bc87b1152eac90970ecf5 SHA256 fa09c9782d8132302abc6ad941c1fec5c89a4257bf33b15a586ac8c9605a9f59
 AUX libsmbios-2.2.28-gcc46.patch 492 RMD160 aabcf91f3ad2d7d35af340636b72cb8d4cdf26d7 SHA1 c62282fb109e1bbc1768b6a233da2bdc2845f67d SHA256 366512344135b64a49f7d85115f109741f952468fbaba04418b6edface260313
@@ -9,15 +9,17 @@ DIST libsmbios-2.2.26.tar.bz2 905847 RMD160 99503b289e81b4c28be3c11b419340070fe0
 DIST libsmbios-2.2.28.tar.bz2 943292 RMD160 10ec844ed93f41645d19799c700b2caa523241f9 SHA1 54c267411d2225cd54a3c8a696ca5c2a74e9d66e SHA256 dd247fd43296df3352435b090dd789a22a89c4b316e98b46b915323290a3e350
 EBUILD libsmbios-2.2.19.ebuild 1612 RMD160 4bf37a8bb6d1bf9edf67f95bd2b07d6b0c6d3fd8 SHA1 e12ef195aaddce75b16396c3ffde189a9a94164d SHA256 451a8fac25a61febadc333936900643b20ed01ec4b88c4fc07b8430a4e06d5d5
 EBUILD libsmbios-2.2.26.ebuild 1827 RMD160 4499b174fdc2e1910e7c835cdf2dd9c60a7976be SHA1 b9770d32aaebe7fdf060cc3144eaf05060df3bf8 SHA256 f9e5c1bd38d993092df41330523444e5a72be570d389d34bfe679c8701fc2564
-EBUILD libsmbios-2.2.28.ebuild 1835 RMD160 65795db74d02bb80b66683a46cb108042467d01e SHA1 a205ef780de65ee1e017898eb67a46d849af40f5 SHA256 620ed1bad66c2a0c6e655bfbe01398e03ec65d116eddce3131d300cdf25e42a7
-MISC ChangeLog 5083 RMD160 1df43750b569cd7a9911adf1f904bb22b36c46db SHA1 c67b82b9a77f40d21c56cc6a09caf3b46372d097 SHA256 65da2cc171ce58733e492f8b487a9e5ef2c6da5775d49a247fdd8e4aa37d2609
+EBUILD libsmbios-2.2.28.ebuild 1744 RMD160 36cba627364ea4c75a1104c62d80a9dcec89c84e SHA1 8e11c266e05ca7640af0b00e325f1db1b5dbe138 SHA256 bb02c21e52cdafc4bd503c82099142f69181f0e216b926b820210fa0d935bd5e
+MISC ChangeLog 5260 RMD160 a06f88534bbf6e62b370adc069bb3e61a2efba9d SHA1 916ffc3dafc24703b4866e5d155f6b78de8bcc63 SHA256 c30605da4e5dd860f415eea168bfc03980ddba13a5d49b4044967b3d042e46d1
 MISC metadata.xml 457 RMD160 6310c02bbbf7a6a0475fc45e42f156cb4864e1f3 SHA1 d8aa29291fe4363c981ed2f10e434bb770318146 SHA256 d5f2e64950718c0ddeaa45b818f92329424556be4a0fa793f57b9fedecf5d9e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tR0ACgkQfXuS5UK5QB0CnAP9Ey0WChrjrrzBM7XCwyNu9v20
-Ob80ZD4nFGkzN4kwF+/KbcilORu8YtuxYLzcZ7EykoZ9auMatUyy9lwcg3pWuEMJ
-pbvJrX2PJeaok90DXGIqLGqVyVUc3eCvOpyjRsm6p7ZIwiH06BZahaexY08bxCUU
-CdSNbD2jIK9OdDAho68=
-=pghP
+iQEcBAEBAgAGBQJPEcrjAAoJEEdUh39IaPFNRxIH/ArUACa6ZCzM0KzZPsQxvuSV
+glHDJUsCH1mrZnAabD5spDp5WHJrueXdusmLC5bRCgKnMHapScqoEe+tDWvcQJTG
+QUcbiGL/aUNVbQAHTBY5CgECSNLLVZmSA6glh6QTzepD5hJhWegD/6qryCD5yV+t
+Fn92nbTQqu+w3Be4bbU7q5VdfbNyhEsF2OIKhaADmLjGt9hxZYH4VhxSw5+afvRy
+A5dg+I+eKix2WNv/KRSz/LQxgDf2/Nfwhxft4nY3vNQROCzw1M4DdxO+gu20KGkC
+k5Xk/jG8vdVtB4hm0c44K8MUQu1miUc4JO2v8tC+B/Vu249gjstphXrW7cidIIQ=
+=DTjQ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
index 8ac44a100db6..0a9f7edc259c 100644
--- a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.2 2011/08/21 06:21:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.3 2012/01/14 18:36:50 ssuominen Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? *:2.4"
@@ -27,10 +27,10 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cppunit-1.9.6 )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.28-gcc46.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.28-gcc46.patch \
 		"${FILESDIR}"/${PN}-fix-pie.patch
-	rm pkg/py-compile
-	ln -s "$(type -P true)" pkg/py-compile || die
+	>pkg/py-compile
 	eautoreconf
 }
 
@@ -42,11 +42,11 @@ src_configure() {
 		$(use_enable graphviz) \
 		$(use_enable nls) \
 		$(use_enable python) \
-		$(use_enable static-libs static) || die
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake install DESTDIR="${D}" || die
 
 	rm -rf "${D}etc/yum"
 	rm -rf "${D}usr/lib/yum-plugins"
@@ -60,9 +60,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
+	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {