Fixed test runs (bug #381975)

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

4 files changed, 37 insertions, 18 deletions

diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog
index 01c11b707df5..3d218ba30bca 100644
--- a/sys-libs/libsmbios/ChangeLog
+++ b/sys-libs/libsmbios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsmbios
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.39 2012/06/21 11:03:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.40 2012/06/21 19:25:26 polynomial-c Exp $
+
+  21 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.28.ebuild,
+  +files/libsmbios-2.2.28-cppunit-tests.patch:
+  Fixed test runs. Thanks to Markus Meier for reporting this in bug #381975 and
+  big kudos to Ian Stakenvicius for looking into this problem and providing a
+  working patch.
 
   21 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.28.ebuild:
   Fixed building with automake-1.12. Thanks to flameeyes who reported this in
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 776869267a2b..fce36f07f924 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX libsmbios-2.2.26-gcc46.patch 1375 RMD160 dc44975b8a48f183e633aec8c9008328cff1b9bf SHA1 f73196bb2c7db499db9bc87b1152eac90970ecf5 SHA256 fa09c9782d8132302abc6ad941c1fec5c89a4257bf33b15a586ac8c9605a9f59
+AUX libsmbios-2.2.28-cppunit-tests.patch 539 RMD160 e424a239bf42b404d1e370a5b051c96df4d11559 SHA1 2cbdc8775839710fc02cd73e2db3b941ff14e040 SHA256 ee6220a695430a207e55d1fe3efe7126cc1bf98bf0e2b8b50c01620dbb65da2e
 AUX libsmbios-2.2.28-gcc46.patch 492 RMD160 aabcf91f3ad2d7d35af340636b72cb8d4cdf26d7 SHA1 c62282fb109e1bbc1768b6a233da2bdc2845f67d SHA256 366512344135b64a49f7d85115f109741f952468fbaba04418b6edface260313
 AUX libsmbios-fix-pie.patch 1005 RMD160 6b239d60b352af3768758a6a1b5e81d323e1d9c4 SHA1 9591eca8da3d52d5aa54e85f2415bbb9a25988bf SHA256 fdf57f4efbd0cb5b0887f19481e72e6c35a3980a9ebb521271449c9bcf7dccae
 DIST libsmbios-2.2.19.tar.bz2 860647 RMD160 f169a17291524cf7d1f18edc9cecfecbe94e2c15 SHA1 0566d247171266fbab17e623f08f9756622bc223 SHA256 2ff784ab9195db17bc578cdc9f6eb7419fae108e62d09b0af37da8e1bc86bad0
@@ -9,23 +10,23 @@ 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 1605 RMD160 906fbe4520b0eba5794a9cab4858f435ae2d26bd SHA1 7b0bf7364803c98b495c380ff5b2919ebc5cd751 SHA256 743703fbc8f7d028dcd6c9bb5ecb6bb931b85829ae76aeaed2da0870191bac70
 EBUILD libsmbios-2.2.26.ebuild 1817 RMD160 a0242809e5abc54c7cdfb8885343c098fc0b31b5 SHA1 1d1921ddd2e5efcf89adfd1e7c25ba60e0aec1b7 SHA256 4b1ede1987687562672846a0e4b657ed957a9f84e2408664fb8ea8bef0ff1e2a
-EBUILD libsmbios-2.2.28.ebuild 1854 RMD160 94c3df26ffcf45b9318fa1891d161d5f72c2e732 SHA1 287de3ac9b0aff01379de990184ce44825a455b9 SHA256 87735074c5965b8a8c463014bba55f651dac530065041034fb5170230eda69b1
-MISC ChangeLog 5762 RMD160 2cd26cc860255cad304fbbb9dd599d4e1c04756e SHA1 54381bc8a271d9a15d6bc7863a45d4ce26f7b115 SHA256 d69b74d0f3fd25303f6a6c7706610f114206423156b2f5776f5fae58d222f489
+EBUILD libsmbios-2.2.28.ebuild 1905 RMD160 7919e2f586ef826104671a3a29b0d5b1bf11ec0f SHA1 98263934f330a95dc09fba68eeccfc7036c151fb SHA256 1232178f26cd9369e1a7bb5da16d8b0927e821d080e7ead0b8a316e4c526d302
+MISC ChangeLog 6064 RMD160 ff2234277d323ab650de0a3485a694d1d04c5697 SHA1 1389fbd9f235a07650083ab0dc3bfc51d8720f82 SHA256 5e71649b496407a6c364cb82d4e20abaf906d717faefc5f7dd303476055d29ad
 MISC metadata.xml 457 RMD160 6310c02bbbf7a6a0475fc45e42f156cb4864e1f3 SHA1 d8aa29291fe4363c981ed2f10e434bb770318146 SHA256 d5f2e64950718c0ddeaa45b818f92329424556be4a0fa793f57b9fedecf5d9e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP4v97AAoJEPiazRVxLXTFOHIP/i7jjl0huitbRvIP9Rue3yvy
-A1+CSROjsUptM9eeus6hPPVezrFLvcw9HF8Lt7QSxEoDrLdVULHdmiKX2GHPoF+0
-fHvpBi2Sb6WsBwYw5DV4IWe0W4VqvV1OVFlfyNOPdVibIq0w7piD/xbwLy1uYxPq
-2fkowlVyrNQm/5KXjamJoj3DffH9VJLZ087oqruafnDzX1weTxqJEBBzmGad6h1i
-xmEJNK1uRf1pEgcpsHHgNuLDPG0xxL4QOCvl/HSj9Jg3ZHSBFtthBYZV74zEFl2R
-YoOE7VusGDcq/UVYjWErOwgg1x4gPuVXy7O+42GgxCqLEQV3rrNV5vbiBxQeFMiK
-2z4trw7XGVSzPnLe3/jEk6EkrYah8onMtPmywBpwTurx9gu2TC82l1mqpzFhJQxi
-jdHQXSibu5ob7iF2gqViKoVFNGstozHM2OJR01NebQ+mHKqgt44rNUW3AT0oJ3g7
-Nd2NRgveucyoczmHgD8wQp6PvK5TUkvXJWc3Uj0tgkaixKNKw6h32k459L+5KG2q
-Bt5aAKD792YF+S3x0xAOAKHKJQqHTjRSiwlocUmzXte3VUhU37oZZdTHlFZ1mb3H
-8UPryaoPcEq6vaSbdWM9oeZFtDIH/BgE7Pb5xK4/DWrecP8X1ALaOFeWXIEpkm0v
-+6OjjgJ+wMp1cO/RFTAj
-=spMr
+iQIcBAEBCgAGBQJP43UrAAoJEPiazRVxLXTFiPYP/RhPvA8JGAJaWnUW36kHn6b9
+bS49JjKxezYJjNZekhm84dAs5/+pdcFkRynbM94aQdzmxT7PBJxsjjIdWrmJJ5TB
+A59LI9SI4vLKqXDxM3nPaPTkQyJlRcUED+u9mB6ETUPCcK2rgrmP52vaTtNzEgvy
+YDHE1Of9aX7Aov+MMJnjKqrooMnxENi7SCW5OCPg80HJFAlfTbxzTPs4hokDjf0t
+F5+vqSrOOaSLM+nHY8z5gLUR6dXKl34yRwl58nhmXKMqIo5m+fTzgPEynXKzch4k
+zSY+5uh/M4QGyAVIzWCdn01CQtQ1gRhUplvz9+rcnSuBc0iT7fxZA9wCDf5U9RvA
+NGl3zwnoWWm03fY7yUreZmHvJdChE6W0+brVQrUeRvUpAdDybxYIdGVWItaR5V8K
+QunpOBMoqdsEFeFCyY6WEmrW1ZpeHlQrlrxZGxBwkjUtfINaP8GiyQoTdj9ZOa5H
+cTQPqstm9HlYqOQ6VDACddxEuvd4u1dM6M0DGW8apaoK7Uu9JdVawqjpaWCFe+r2
+7Pag2/wt9OcngWZ1KFPVFgX3Xm4TYF9GonaHjbygk/nBIeHmjmCn/V1mQDezOJgX
+6Ta78WqAEP7RyK76wESSzgXDky6h0lSzbOOsSUzX+7Dmot8ZVO/VyeQA86/hzq+c
+ypbgAASXv+FVRtAEMOxe
+=oMTz
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch b/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch
new file mode 100644
index 000000000000..61f392787213
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch
@@ -0,0 +1,11 @@
+diff -Naur libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c libsmbios-2.2.28.new/src/libsmbios_c/smi/smi_linux.c
+--- libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c	2010-06-11 11:31:01.000000000 -0400
++++ libsmbios-2.2.28.new/src/libsmbios_c/smi/smi_linux.c	2012-06-21 14:57:15.000000000 -0400
+@@ -48,6 +48,7 @@
+ #define bufsize 256
+ 
+ // not in header file. for private use by unit tests.
++LIBSMBIOS_C_DLL_SPEC void set_basedir(const char *); // needed to link tests
+ void set_basedir(const char *newdir)
+ {
+     sysfs_basedir = newdir;
diff --git a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
index f6aaed38f418..db8b15f15082 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-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.6 2012/06/21 11:03:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.7 2012/06/21 19:25:26 polynomial-c Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? *:2.5"
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.2.28-gcc46.patch \
-		"${FILESDIR}"/${PN}-fix-pie.patch
+		"${FILESDIR}"/${PN}-fix-pie.patch \
+		"${FILESDIR}"/${PN}-2.2.28-cppunit-tests.patch
 	>pkg/py-compile
 	# dist-lzma was removed from automake-1.12 (bug #422779)
 	sed 's@dist-lzma@dist-xz@' -i "${S}"/configure.ac || die