| 1 |
ssuominen 10/02/16 20:15:02 |
| 2 |
|
| 3 |
Modified: ChangeLog bioapi-1.2.3-r2.ebuild |
| 4 |
Log: |
| 5 |
Remove USE="qt3" wrt #304475, thanks to Ben de Groot for reporting. |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 sys-auth/bioapi/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/ChangeLog?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/ChangeLog?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/ChangeLog?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- ChangeLog 18 Jan 2010 19:24:07 -0000 1.12 |
| 22 |
+++ ChangeLog 16 Feb 2010 20:15:02 -0000 1.13 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sys-auth/bioapi |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.12 2010/01/18 19:24:07 maekke Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.13 2010/02/16 20:15:02 ssuominen Exp $ |
| 28 |
+ |
| 29 |
+ 16 Feb 2010; Samuli Suominen <ssuominen@g.o> |
| 30 |
+ bioapi-1.2.3-r2.ebuild: |
| 31 |
+ Remove USE="qt3" wrt #304475, thanks to Ben de Groot for reporting. |
| 32 |
|
| 33 |
18 Jan 2010; Markus Meier <maekke@g.o> bioapi-1.2.3-r2.ebuild: |
| 34 |
amd64/x86 stable, bug #299192 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 sys-auth/bioapi/bioapi-1.2.3-r2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: bioapi-1.2.3-r2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- bioapi-1.2.3-r2.ebuild 18 Jan 2010 19:24:07 -0000 1.3 |
| 51 |
+++ bioapi-1.2.3-r2.ebuild 16 Feb 2010 20:15:02 -0000 1.4 |
| 52 |
@@ -1,7 +1,8 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
+EAPI=2 |
| 59 |
inherit eutils multilib |
| 60 |
|
| 61 |
DESCRIPTION="Framework for biometric-based authentication" |
| 62 |
@@ -11,35 +12,28 @@ |
| 63 |
LICENSE="bioapi" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="amd64 x86" |
| 66 |
-IUSE="qt3" |
| 67 |
- |
| 68 |
-DEPEND="qt3? ( =x11-libs/qt-3* )" |
| 69 |
+IUSE="" |
| 70 |
|
| 71 |
S=${WORKDIR}/bioapi-linux |
| 72 |
|
| 73 |
-src_unpack() { |
| 74 |
- unpack ${A} |
| 75 |
- cd "${S}" |
| 76 |
+src_prepare() { |
| 77 |
epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654 |
| 78 |
epatch "${FILESDIR}"/${P}-no-delete.patch |
| 79 |
epatch "${FILESDIR}"/${P}-gcc44.patch |
| 80 |
} |
| 81 |
|
| 82 |
-src_compile() { |
| 83 |
- econf $(use_with qt3 Qt-dir /usr/qt/3) || die "./configure failed" |
| 84 |
- emake || die "emake failed" |
| 85 |
+src_configure() { |
| 86 |
+ econf \ |
| 87 |
+ --without-Qt-dir |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
| 91 |
- emake SKIPCONFIG=true DESTDIR="${D}" install || die "install failed" |
| 92 |
+ emake SKIPCONFIG=true DESTDIR="${D}" install || die |
| 93 |
dodoc README |
| 94 |
dohtml *.htm |
| 95 |
|
| 96 |
# rename generic binaries |
| 97 |
mv "${D}"/usr/bin/{,BioAPI}Sample || die |
| 98 |
- if use qt3 ; then |
| 99 |
- mv "${D}"/usr/bin/{,BioAPI}QSample || die |
| 100 |
- fi |
| 101 |
} |
| 102 |
|
| 103 |
pkg_config() { |
| 104 |
@@ -47,7 +41,6 @@ |
| 105 |
mod_install -fi /usr/$(get_libdir)/libbioapi100.so |
| 106 |
mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so |
| 107 |
mod_install -fi /usr/$(get_libdir)/libpwbsp.so |
| 108 |
- use qt3 && mod_install -fi /usr/$(get_libdir)/libqtpwbsp.so |
| 109 |
} |
| 110 |
|
| 111 |
pkg_preinst() { |
| 112 |
@@ -61,7 +54,6 @@ |
| 113 |
pkg_postinst() { |
| 114 |
einfo "Some generic-named programs have been renamed:" |
| 115 |
einfo " Sample -> BioAPISample" |
| 116 |
- einfo " QSample -> BioAPIQSample" |
| 117 |
|
| 118 |
if [[ ${ROOT} == "/" ]] ; then |
| 119 |
pkg_config |
| 120 |
@@ -81,5 +73,4 @@ |
| 121 |
mod_install -fu libbioapi100.so |
| 122 |
mod_install -fu libbioapi_dummy100.so |
| 123 |
mod_install -fu libpwbsp.so |
| 124 |
- use qt3 && mod_install -fu libqtpwbsp.so |
| 125 |
} |
Archives