Remove USE="qt3" wrt #304475, thanks to Ben de Groot for reporting.

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

3 files changed, 15 insertions, 20 deletions

diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 3f97187e69d2..478e65cf21cf 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2010/01/18 19:24:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.13 2010/02/16 20:15:02 ssuominen Exp $
+
+  16 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  bioapi-1.2.3-r2.ebuild:
+  Remove USE="qt3" wrt #304475, thanks to Ben de Groot for reporting.
 
   18 Jan 2010; Markus Meier <maekke@gentoo.org> bioapi-1.2.3-r2.ebuild:
   amd64/x86 stable, bug #299192
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index a1049763d843..f9882bd55bb8 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -2,6 +2,6 @@ AUX bioapi-1.2.3-enroll-ret.patch 278 RMD160 d07ae277ec29877f43f2cec7cddc14ecc8b
 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 2240 RMD160 e2d144076874d62499d507d8b9cdf991b2017ce7 SHA1 67235ebfb870205f5d1277cf69a5e8c00a706941 SHA256 98f64d2ca50da11cb06f19ddd6007df5b81eae3b7ba85b2040e9a572bccb8d76
-MISC ChangeLog 2052 RMD160 3d8f9295f7c999d9e5e6df3912c13cd5edfd5542 SHA1 f7275bcac5d1e5c45f37d509fa56403a394c4018 SHA256 57bca35a86a04aeb0fb75753b0c9010d769c3b0b96cb3b13f27592f48c86cdb5
+EBUILD bioapi-1.2.3-r2.ebuild 1899 RMD160 187b9ccee8e4043b980c7ac53b9cf621f7c21fbb SHA1 0463a62d5a58ce6908686af54a0cc9c03197632f SHA256 4edb245c0fa932e5888c7237a4ffd73baeb7d6a4439ebdd15f4d2d36552b82f1
+MISC ChangeLog 2206 RMD160 6750377358aed7a69018cd474186f52e634138dd SHA1 2bc634787ab14f385324a044d17a22542b2f0c5b SHA256 79b3319fbfadc11f197b902ae614f0cba8d86f56528465702c9e9ce0fc7a1140
 MISC metadata.xml 252 RMD160 34a164bfc96b8845a8308e85a214d633284b763b SHA1 c3aabeacb7af064df74acfddbfda2ae0497ff8a5 SHA256 445ab0e7fb8f15ad8dea05dabee14ecc25c6b81bfb9a6213ff3d9ea81f759154
diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
index 18a7db12b090..7fe294724946 100644
--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
+++ b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
@@ -1,7 +1,8 @@
 # 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.3 2010/01/18 19:24:07 maekke Exp $
+# $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 $
 
+EAPI=2
 inherit eutils multilib
 
 DESCRIPTION="Framework for biometric-based authentication"
@@ -11,35 +12,28 @@ SRC_URI="http://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
 LICENSE="bioapi"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="qt3"
-
-DEPEND="qt3? ( =x11-libs/qt-3* )"
+IUSE=""
 
 S=${WORKDIR}/bioapi-linux
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
 	epatch "${FILESDIR}"/${P}-no-delete.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_compile() {
-	econf $(use_with qt3 Qt-dir /usr/qt/3) || die "./configure failed"
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		--without-Qt-dir
 }
 
 src_install() {
-	emake SKIPCONFIG=true DESTDIR="${D}" install || die "install failed"
+	emake SKIPCONFIG=true DESTDIR="${D}" install || die
 	dodoc README
 	dohtml *.htm
 
 	# rename generic binaries
 	mv "${D}"/usr/bin/{,BioAPI}Sample || die
-	if use qt3 ; then
-		mv "${D}"/usr/bin/{,BioAPI}QSample || die
-	fi
 }
 
 pkg_config() {
@@ -47,7 +41,6 @@ pkg_config() {
 	mod_install -fi /usr/$(get_libdir)/libbioapi100.so
 	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
 	mod_install -fi /usr/$(get_libdir)/libpwbsp.so
-	use qt3 && mod_install -fi /usr/$(get_libdir)/libqtpwbsp.so
 }
 
 pkg_preinst() {
@@ -61,7 +54,6 @@ pkg_preinst() {
 pkg_postinst() {
 	einfo "Some generic-named programs have been renamed:"
 	einfo "  Sample -> BioAPISample"
-	einfo "  QSample -> BioAPIQSample"
 
 	if [[ ${ROOT} == "/" ]] ; then
 		pkg_config
@@ -81,5 +73,4 @@ pkg_prerm() {
 	mod_install -fu libbioapi100.so
 	mod_install -fu libbioapi_dummy100.so
 	mod_install -fu libpwbsp.so
-	use qt3 && mod_install -fu libqtpwbsp.so
 }