Respect build settings #336107 by Diego Elio Pettenò and make config.guess/config.sub into plain files #337805 by Ben Kero.

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

4 files changed, 68 insertions, 7 deletions

diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 478e65cf21cf..a90b53e62699 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/bioapi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.13 2010/02/16 20:15:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.14 2010/11/26 05:19:37 vapier Exp $
+
+  26 Nov 2010; Mike Frysinger <vapier@gentoo.org> bioapi-1.2.3-r2.ebuild,
+  +files/bioapi-1.2.3-build.patch:
+  Respect build settings #336107 by Diego Elio Pettenò and make
+  config.guess/config.sub into plain files #337805 by Ben Kero.
 
   16 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   bioapi-1.2.3-r2.ebuild:
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index f9882bd55bb8..9590f2feded7 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bioapi-1.2.3-build.patch 1310 RMD160 10daa54d1e4e13020eb61c133ebfa89e39fb837f SHA1 0f821c8a081cf23f9783e8e013cf3f56d34a6930 SHA256 e1718e55a99ee8ba27b8807ead8ffe5cf7ddda9766a62f83542bf7f9f8b43509
 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-r2.ebuild 1899 RMD160 187b9ccee8e4043b980c7ac53b9cf621f7c21fbb SHA1 0463a62d5a58ce6908686af54a0cc9c03197632f SHA256 4edb245c0fa932e5888c7237a4ffd73baeb7d6a4439ebdd15f4d2d36552b82f1
-MISC ChangeLog 2206 RMD160 6750377358aed7a69018cd474186f52e634138dd SHA1 2bc634787ab14f385324a044d17a22542b2f0c5b SHA256 79b3319fbfadc11f197b902ae614f0cba8d86f56528465702c9e9ce0fc7a1140
+EBUILD bioapi-1.2.3-r2.ebuild 2002 RMD160 a5b5e2db65b12666366fb5f00d5ea57c64cfb54b SHA1 8b6e6a5e6b2a376f73c78bf0122e5d4bba9f143a SHA256 23897dfa698cb5c375ba5edde158f157afe3b46ff8d22e22b7f1559b9ef7b5b8
+MISC ChangeLog 2442 RMD160 f9cd40219eeea14a2dd226bc753ee3002e8e62bd SHA1 af0c67f57dcbbad7f327b1e862b7446ec29cabb9 SHA256 d08765182540e8ff4aa28b3f75309e8024f23757a2be87a9259dd49b0943f60d
 MISC metadata.xml 252 RMD160 34a164bfc96b8845a8308e85a214d633284b763b SHA1 c3aabeacb7af064df74acfddbfda2ae0497ff8a5 SHA256 445ab0e7fb8f15ad8dea05dabee14ecc25c6b81bfb9a6213ff3d9ea81f759154
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkzvQrUACgkQTwhj9JtAlp4NCgD+LJMHoHozmU24WIxfb13UhXj8
+bZFMGV4q6+8cTQnzjm0BAMIR5VD88liS2ARzV/KBqqfXp1zTMu7BnFG1yjhXBDsg
+=Gm1A
+-----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 7fe294724946..c113a348e810 100644
--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
+++ b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 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.4 2010/02/16 20:15:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild,v 1.5 2010/11/26 05:19:37 vapier Exp $
+
+EAPI="2"
 
-EAPI=2
 inherit eutils multilib
 
 DESCRIPTION="Framework for biometric-based authentication"
@@ -20,11 +21,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
 	epatch "${FILESDIR}"/${P}-no-delete.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-build.patch #336107
+	rm -f config.{guess,sub} #337805
+	touch config.{guess,sub}
 }
 
 src_configure() {
-	econf \
-		--without-Qt-dir
+	econf --without-Qt-dir
 }
 
 src_install() {
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch b/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
new file mode 100644
index 000000000000..9d679fe8c892
--- /dev/null
+++ b/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
@@ -0,0 +1,42 @@
+http://code.google.com/p/bioapi-linux/issues/detail?id=4
+
+--- a/addins/pwbsp/Makefile.in
++++ b/addins/pwbsp/Makefile.in
+@@ -87,7 +87,7 @@ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include/ \
++AM_CPPFLAGS = -I${top_srcdir}/include/ \
+ 		-I${top_srcdir}/imports/cdsa/v2_0/inc/
+ 
+ CXX = @CXX@
+@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
++AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+--- a/addins/qtpwbsp/Makefile.in
++++ b/addins/qtpwbsp/Makefile.in
+@@ -96,7 +96,7 @@ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-CPPFLAGS = -I${top_srcdir}/include \
++AM_CPPFLAGS = -I${top_srcdir}/include \
+ 		-I${top_srcdir}/imports/cdsa/v2_0/inc \
+ 		${QT_CXXFLAGS}
+ 
+@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
++AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
+ 		${QT_LIBS}
+ 
+ LEX = @LEX@