Revision bump and version bump, remove USE=example

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 73 insertions, 23 deletions

diff --git a/sys-auth/libfprint/ChangeLog b/sys-auth/libfprint/ChangeLog
index cbedd0eb2596..7c422b22a9d5 100644
--- a/sys-auth/libfprint/ChangeLog
+++ b/sys-auth/libfprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/libfprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/ChangeLog,v 1.4 2011/06/16 22:51:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/ChangeLog,v 1.5 2011/06/16 23:28:59 xmw Exp $
+
+*libfprint-0.4.0 (16 Jun 2011)
+*libfprint-0.3.0-r1 (16 Jun 2011)
+
+  16 Jun 2011; Michael Weber <xmw@gentoo.org> -libfprint-0.3.0.ebuild,
+  +libfprint-0.3.0-r1.ebuild, +libfprint-0.4.0.ebuild:
+  Revision bump and version bump (bug 365075), remove USE=example (bug 369219)
 
   16 Jun 2011; Michael Weber <xmw@gentoo.org> -libfprint-0.0.6.ebuild,
   -libfprint-0.1.0_pre2.ebuild, libfprint-0.3.0.ebuild:
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 6468d4ecc8b5..2ba32872f51a 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST libfprint-0.3.0.tar.bz2 222949 RMD160 d2c0e0c68ca73cb738d653914dd1d3fb6fe3f61c SHA1 5fff8d916e91d55719c9cc2e6447d412f37d7c80 SHA256 e2ea8f8bd4833305578de030f3fdbc8310726948abfe24786f7da888bd2ade6e
-EBUILD libfprint-0.3.0.ebuild 1611 RMD160 7d1ded887a6972a2f20e469d5a9a295c43526417 SHA1 23bf79053460695ecfa1cf0a777c92ad471c6da9 SHA256 5b1e537254d3787ce810c4ed5af672b8fc6c6877e633155a09f4cfbb97058892
-MISC ChangeLog 912 RMD160 8e012c6b0ff49fe0f7a4ad43ffc0e779398558d3 SHA1 8d714e5a47e83837c2bcd93053a30ecf084dc568 SHA256 e5d51ef4a10904233b410cda96fe088c96b108bd1c71247d2abf9682ee3f5fbb
+DIST libfprint-0.4.0.tar.bz2 228518 RMD160 a2ac7ba7c9f6ff54f2c3fd18f71127797fe105bd SHA1 a230b6d5fdfbf4c2e78dc2882e76828fd5f862bc SHA256 58f4056f498b8ba564a8ba2ee4a59cf2c3edb53c03e5df390fcf77be75ea7117
+EBUILD libfprint-0.3.0-r1.ebuild 1260 RMD160 eb945c8997e63acc32ea1878dc2eae1da4514605 SHA1 a08206e6515c0724993a599d8275757f989ed415 SHA256 12e5e118c84a7d0b38b28716efe30e1393f6053d6007602eef64f0336710afe0
+EBUILD libfprint-0.4.0.ebuild 1220 RMD160 2930a32c312fb84191fcf1a4f804cddc6a7c31b4 SHA1 838215a544223a638434eb1fe5859fb9d714f98f SHA256 a9c19f3aef2a7cfed92e3d13429dca42827b11e177106185dad341c0c38f4ccb
+MISC ChangeLog 1184 RMD160 7b9585a245ca166fc4efafdb9112780228d0a908 SHA1 ff610324a49b78c1bbe60379f0ad924368683481 SHA256 eae18c254dc7c8e4d46da2106212f9b58ebaa068e7f5784e88b94ee5ba488523
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk36iP4ACgkQknrdDGLu8JB2KAD/du4E7U9d89QfI+tI4WUV4SCu
-I3SW8WiI3Aqqpt4jrVMBAJUYA3E55LW/sssksjaJ9Hss1hLB1407ucpJNKIrYdrk
-=XkTc
+iF4EAREIAAYFAk36kcEACgkQknrdDGLu8JCbqgD/fuMbBF19six3wKl6Yq1DEQvD
+N+azt17BDZi/oYi1quYA/2Gk7vCcQ9CXUUGMkhZP3eBXgSDdHYOyYSrMbTPx7eQp
+=w9X2
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/libfprint/libfprint-0.3.0.ebuild b/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild
index 5fe819dd8d53..95d810a753eb 100644
--- a/sys-auth/libfprint/libfprint-0.3.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/libfprint-0.3.0.ebuild,v 1.2 2011/03/29 12:54:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild,v 1.1 2011/06/16 23:28:59 xmw Exp $
 
 EAPI=3
 
@@ -14,16 +14,13 @@ SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="X debug +examples static-libs"
+IUSE="debug static-libs"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libusb:1
 	dev-libs/nss
 	x11-libs/gtk+:2
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	X? ( examples? (
-		x11-libs/libXext
-		x11-libs/libXv ) )"
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
@@ -42,12 +39,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	local my_conf="$(use_enable examples examples-build)"
-	if use X ; then
-		my_conf="${my_conf} $(use_enable examples x11-examples-build)"
-	else
-		my_conf="${my_conf} --disable-x11-examples-build"
-	fi
 	econf ${my_conf} \
 		$(use_enable debug debug-log) \
 		$(use_enable static-libs static) || die
@@ -55,11 +46,8 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	if use examples ; then
-		dobin examples/{enroll,img_capture,verify{,_live}} || die
-		if use X ; then
-			dobin examples/img_capture_continuous || die
-		fi
+	if ! use static-libs ; then
+		rm -v "${D}"/usr/lib64/libfprint.la || die
 	fi
 	dodoc AUTHORS HACKING NEWS README THANKS TODO || die
 }
diff --git a/sys-auth/libfprint/libfprint-0.4.0.ebuild b/sys-auth/libfprint/libfprint-0.4.0.ebuild
new file mode 100644
index 000000000000..e465c1648638
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-0.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/libfprint-0.4.0.ebuild,v 1.1 2011/06/16 23:28:59 xmw Exp $
+
+EAPI=3
+
+inherit autotools
+
+MY_PV="v_${PV//./_}"
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="http://cgit.freedesktop.org/libfprint/libfprint/"
+SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libusb:1
+	dev-libs/nss
+	x11-libs/gtk+:2
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_PV}
+
+src_prepare() {
+	mkdir m4 || die
+	eautoreconf
+}
+
+pkg_setup() {
+	einfo
+	elog "This version does not support fdu2000 and upektc (yet)."
+	einfo
+}
+
+src_configure() {
+	econf ${my_conf} \
+		$(use_enable debug debug-log) \
+		$(use_enable static-libs static) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	if ! use static-libs ; then
+		rm -v "${D}"/usr/lib64/libfprint.la || die
+	fi
+	dodoc AUTHORS HACKING NEWS README THANKS TODO || die
+}