Fix building with GCC 4.4 wrt #273159.

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

4 files changed, 22 insertions, 14 deletions

diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 86dd30922810..fde7da78a601 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/bioapi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.10 2009/03/08 19:49:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.11 2009/07/25 20:28:44 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  bioapi-1.2.3-r2.ebuild, +files/bioapi-1.2.3-gcc44.patch:
+  Fix building with GCC 4.4 wrt #273159.
 
 *bioapi-1.2.3-r2 (08 Mar 2009)
 
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index 07cb07d81efb..af936229c249 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bioapi-1.2.3-enroll-ret.patch 278 RMD160 d07ae277ec29877f43f2cec7cddc14ecc8b1e159 SHA1 a8c408afc7ea6d8b3cd9faa1710a49ced84b9f19 SHA256 b98227cef30d4573728985758b9cd548b5fb1ac66cdb07b5c415ec7aadee7460
+AUX bioapi-1.2.3-gcc44.patch 545 RMD160 e2bf6427e6f2b15ceaab8444e02e00f8a38b71c5 SHA1 b5ef0bc4ded9379869542801bca1fa124ebc1fa2 SHA256 b5bb84aa1c4e62df9a81a044fa12841941ae7a7697f38e77cfa73be559db7814
 AUX bioapi-1.2.3-no-delete.patch 504 RMD160 c3f082d78ca36d073f2a88c775bcef210b6a4718 SHA1 55da967033cb1d95a19ee73fb2b1ec6c1b292b61 SHA256 344304ebf2cd13e2cfff8d9ed526419e1adb6edb7da80007f9c05b5fea128a3d
 DIST bioapi_1.2.3.tar.gz 1634237 RMD160 5a5e93e7ffd7136527e713185d10857f8eda5e5c SHA1 6873e090c2ace1e3835837895b9cf172b9ef50ff SHA256 c780c0d2e0c676be50de8ff537653580dd5b27fe1478846d22a017e52c6b6c2e
 EBUILD bioapi-1.2.3-r1.ebuild 2158 RMD160 3be884518f6ca5fe632e973dd522b710ec5b85f5 SHA1 41a610fac2ca79c4b80bf31a4e4ad5b670085c9d SHA256 ccb8d5a950e196075ca5c328a92056eca916a047075c927db04de648f270bd89
-EBUILD bioapi-1.2.3-r2.ebuild 2203 RMD160 d50f56c50d85d08a112c2452ae6d669eb08f4f8f SHA1 b1e5175f22b31ddd9d446f9a07ab2b9fc3fb85f9 SHA256 07bd6f444d4376cbfd5d8840497229ec181c8626f50f441cd7d206f35b3f7d18
-MISC ChangeLog 1792 RMD160 5ce95c6bf2cacbe258fb9f4714b42d96c1c6c43c SHA1 ac391191aa5a7bdeb294e091e9d2ff4bf18e2e99 SHA256 fba02eb070d87c8ef81735a29fd8404636ea77b4ea685b79ecd70d4cdfd5ca73
+EBUILD bioapi-1.2.3-r2.ebuild 2245 RMD160 550aa4de58e666e993f0f67986e25fcb3b6d49c7 SHA1 b3f2f3cb53e69658e1f9de8ae33fb4bd034ebfcf SHA256 ce9233a0b7b35e35975e2bce545ca4709b5eb77770e115aa8b51734e91ac6586
+MISC ChangeLog 1950 RMD160 d611540cbf2808376951a5b908815509f7579e61 SHA1 ce54e8350c567808315543785074bc40c3153bd7 SHA256 4037db32f6129b7a886cabfa6e6555c90c6dcbf3378d07a7844471e81761f4be
 MISC metadata.xml 252 RMD160 34a164bfc96b8845a8308e85a214d633284b763b SHA1 c3aabeacb7af064df74acfddbfda2ae0497ff8a5 SHA256 445ab0e7fb8f15ad8dea05dabee14ecc25c6b81bfb9a6213ff3d9ea81f759154
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm0ITwACgkQn/5bYzqsSmGAUwCgtrus4hsotCpOxQVILSZgdyNI
-msQAoI0P3nP0jS8LZFWEN6fviTjE8fY2
-=yx54
------END PGP SIGNATURE-----
diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
index 919439f07c29..c469062ad17e 100644
--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
+++ b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild,v 1.1 2009/03/08 19:49:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild,v 1.2 2009/07/25 20:28:44 ssuominen Exp $
 
 inherit eutils multilib
 
@@ -22,6 +22,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
 	epatch "${FILESDIR}"/${P}-no-delete.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch b/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
new file mode 100644
index 000000000000..1f81298066dc
--- /dev/null
+++ b/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur bioapi-linux.orig/framework/mds_util_api/mds_app_util.c bioapi-linux/framework/mds_util_api/mds_app_util.c
+--- bioapi-linux.orig/framework/mds_util_api/mds_app_util.c	2007-07-14 08:06:14.000000000 +0300
++++ bioapi-linux/framework/mds_util_api/mds_app_util.c	2009-07-25 23:26:55.000000000 +0300
+@@ -28,7 +28,7 @@
+  	/* Linux-Port: added "const" keyword for Linux version */

+ #if defined (UNIX)

+  	const BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

+-#elif

++#else

+ 	BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

+ #endif

+