fix .la file removal (thanks Alexander Adam, bug 374575), remove old version

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

4 files changed, 18 insertions, 74 deletions

diff --git a/sys-auth/libfprint/ChangeLog b/sys-auth/libfprint/ChangeLog
index 7c422b22a9d5..a5e2674f94a4 100644
--- a/sys-auth/libfprint/ChangeLog
+++ b/sys-auth/libfprint/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2011/06/16 23:28:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/ChangeLog,v 1.6 2011/11/13 23:53:00 xmw Exp $
+
+  13 Nov 2011; Michael Weber <xmw@gentoo.org> -libfprint-0.3.0-r1.ebuild,
+  libfprint-0.4.0.ebuild:
+  fix .la file removal (thanks Alexander Adam, bug 374575), remove old version
 
 *libfprint-0.4.0 (16 Jun 2011)
 *libfprint-0.3.0-r1 (16 Jun 2011)
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 87a5a8037ffc..1c69f46c8cba 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libfprint-0.3.0.tar.bz2 222949 RMD160 d2c0e0c68ca73cb738d653914dd1d3fb6fe3f61c SHA1 5fff8d916e91d55719c9cc2e6447d412f37d7c80 SHA256 e2ea8f8bd4833305578de030f3fdbc8310726948abfe24786f7da888bd2ade6e
 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
+EBUILD libfprint-0.4.0.ebuild 1162 RMD160 9955bdafceafee4680e286c3a647c376a865cc7d SHA1 74a07a9bbb5d44cd7b9804a76815ac7b1de79a0d SHA256 c4a6f946e1e0a80ca563194cd0e476c9acd21b1574451667361b83649fc938ed
+MISC ChangeLog 1364 RMD160 c7a36f91d44e737382a36d05fa25e93e27468acf SHA1 69223fa3ddd32b172b82f21456da76f05d657812 SHA256 d1f24c168abb32c8dcaeff5c798f29ffb3850a40b81e2189bf47fc3e2f5beeba
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59skMACgkQfXuS5UK5QB34VAP/Z00daFx1ap2zbwvemHPFzM1n
-ZSoDvzoFZKmv+3LteM8Uhp8Bhpqcsmu0ONY7+DI8Zwv/3ZxPCwF8Ohc9shvsXJH6
-3hOU7rnne4iWdSGQBjSaPms1HuovGZMbIfD78hahgu/roTmpxHRLJwlJHge/vEmR
-X7v6qvG6fO7GXGzGUzo=
-=rSf6
+iF4EAREIAAYFAk7AWGEACgkQknrdDGLu8JC2NwD/em57CU9JRmxCu9Jd3YqkHG3Y
+c146yct8cNnZQXIXmnsA/RHJYqCYjhyQ1ifj3u5LTXkUARdnitLEwcdiMIvW6Eeq
+=OzLC
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild b/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild
deleted file mode 100644
index 95d810a753eb..000000000000
--- a/sys-auth/libfprint/libfprint-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-r1.ebuild,v 1.1 2011/06/16 23:28:59 xmw Exp $
-
-EAPI=3
-
-inherit autotools versionator
-
-MY_PV="v_$(replace_all_version_separators _)"
-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
-}
diff --git a/sys-auth/libfprint/libfprint-0.4.0.ebuild b/sys-auth/libfprint/libfprint-0.4.0.ebuild
index e465c1648638..09a567205dd2 100644
--- a/sys-auth/libfprint/libfprint-0.4.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.4.0.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/libfprint-0.4.0.ebuild,v 1.2 2011/11/13 23:53:00 xmw Exp $
 
-EAPI=3
+EAPI=4
 
 inherit autotools
 
@@ -21,7 +21,6 @@ RDEPEND="dev-libs/glib:2
 	dev-libs/nss
 	x11-libs/gtk+:2
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
@@ -39,15 +38,13 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf ${my_conf} \
+	econf \
 		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) || die
+		$(use_enable static-libs static)
 }
 
 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
+	emake DESTDIR="${D}" install
+	use static-libs || find "${D}" -name "*.la" -delete
+	dodoc AUTHORS HACKING NEWS README THANKS TODO
 }