Remove --strip-all from LDFLAGS (was causing build failure with GCC 4.6)

(bug #371001).  Clean up ebuild - EAPI 4, remove useless die calls, install
udev scripts in /lib, not $(get_libdir), add static-libs USE and port to
autotools-utils eclass.

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

4 files changed, 64 insertions, 31 deletions

diff --git a/sys-auth/thinkfinger/ChangeLog b/sys-auth/thinkfinger/ChangeLog
index a87774936cc2..dbd2d4e391c0 100644
--- a/sys-auth/thinkfinger/ChangeLog
+++ b/sys-auth/thinkfinger/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/thinkfinger
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/ChangeLog,v 1.11 2011/08/26 18:25:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/ChangeLog,v 1.12 2011/10/31 00:28:57 dirtyepic Exp $
+
+  31 Oct 2011; Ryan Hill <dirtyepic@gentoo.org> +files/0.3-strip-strip.patch,
+  thinkfinger-0.3-r3.ebuild:
+  Remove --strip-all from LDFLAGS (was causing build failure with GCC 4.6)
+  (bug #371001).  Clean up ebuild - EAPI 4, remove useless die calls, install
+  udev scripts in /lib, not $(get_libdir), add static-libs USE and port to
+  autotools-utils eclass.
 
   26 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   thinkfinger-0.3-r3.ebuild:
diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index c635913a46e9..5527be4bb888 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 0.3-carriagereturn.patch 409 RMD160 22542c76ba34dc2654077e54a68d06e1b9fa1b4d SHA1 09726c9d38e36c4e193e5a122dafe1bdfd1be9ad SHA256 75b6d7093d6182a1384ada721f92975450e1055cf0e6796f2649260042738b65
 AUX 0.3-direct_set_config_usb_hello.patch 941 RMD160 e848bc1ea9331fd7e8516dc40ef875b5921031e0 SHA1 fbaf31d72fa615c3cd159504a5eb31fdc60ffe05 SHA256 285fd6ae82334e5b9b19fc0ba1e8429b0c46cb7b880a0df251989c7862969c23
 AUX 0.3-send-sync-event.patch 1031 RMD160 ed414897a83d9ed08bd2efb0ed08e646ee09c6f4 SHA1 8b67abc16b92b5f73f079fc0e557d8de85e4e358 SHA256 ff9aab4179d44708bb77b3b8be4939c3559e724b90fef8c688c5c9d0e996f095
+AUX 0.3-strip-strip.patch 1375 RMD160 7cb1d57adb07baf72004afbfdb21e6ad5ad966f6 SHA1 9b301f935a7059f2eecc4220d7a9e76ea999ca90 SHA256 c125aa32ade799c9ef582dc67273b686f160721f84c9bdb05abfc399462aaa1c
 AUX 0.3-tftoolgroup.patch 1708 RMD160 66278d05abb136b69e1c1d8c654fb052a1f2f20d SHA1 95b6f6c3507f61ec75afb65b4d1d8cc138dbc1bd SHA256 d48da4d150986c21bb1b9c2b0f43dce9814ef0e8a1044f29805ca393721e4bd3
 AUX 60-thinkfinger.rules 251 RMD160 855fc594c5ae54e971cd781eab3f4fa2c08812cd SHA1 0dea2d595a99e470e972c179685cd370406e0cae SHA256 e7d1c3f56b052b4bc50f1bf245bff5b32067f869c9c1859828dae2ae2ae612c9
 DIST thinkfinger-0.3.tar.gz 372053 RMD160 7a83e7234bc6687f581df3b68b92cc06bf5b24cb SHA1 6d032ec7ad1166505b6773dff3c762c77bc72626 SHA256 9741ae205aadc9f576be73c382596266300e709371e72574a86e339ebf978f4b
-EBUILD thinkfinger-0.3-r3.ebuild 2170 RMD160 10da9c809e5e9278fcca8ef3ccd8d328f8b916a7 SHA1 e21d018dba7e21f3403f484d4682487df64f33f3 SHA256 9f23b58708c284f5d15756a6ecc6ab2c2b5a69564cb2062e8a1a25e1ceb64824
-MISC ChangeLog 3043 RMD160 16296f1394b45e2b625c11bd68c3bca462f242f6 SHA1 9e88ef2d55e625b331eae1c5ac9efc64adc4ae31 SHA256 96166d62950e581cbe2fd6b465f5ed51e7b6bad18fe88d89b400f557ec43454f
+EBUILD thinkfinger-0.3-r3.ebuild 2177 RMD160 a328c50de5361a80b9d4acbd478a0aa3bd88cee6 SHA1 65db47882b174f312c8b1025d3fb2707a46da5b2 SHA256 cea3c397281043372090e49adca7c80e584ede84059de8ab7bfe4f843a552414
+MISC ChangeLog 3405 RMD160 0c0d4d569bbe0dac67dd83e688a4362598b3448d SHA1 9506d429c820f2dabfa9b1406fdc326100976fde SHA256 1fb38e9d1ce15a81301fa12df424f289a996a3882b91519e245ba6677d2b8032
 MISC metadata.xml 472 RMD160 83df3a4344d427f57f7aa59dad3b6137e588a975 SHA1 1358d737c57c765fc42d8dfc2ee634ce9e8d2441 SHA256 ea86dad99377c40360563ae8a88c17acbd25af2ec7f02945c06428a05747494a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59skIACgkQfXuS5UK5QB008wP/W1OL2FemHvzxUKFmThpa6bMY
-owtsoWpVqg3KFP1RRb2YwxPUcuUappp8b8SzdumeVd6029gPAgvBxlgswykCY7Mn
-qmCicxuy033kssuSMjUxgDgbx1Hcj6V2EL9k9A0Qx8LZOSp2jwPbRswBzG57i1y6
-idFRf5xh0FhwFmF9jXw=
-=zcVX
+iEYEARECAAYFAk6t7iUACgkQiqiDRvmkBmKRtACbBKtAG6o4v8xDbHxpt4Jd+jKi
+P5wAn3PjExWUE4IkoPUtbie76MSX3bCk
+=Vn8w
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/thinkfinger/files/0.3-strip-strip.patch b/sys-auth/thinkfinger/files/0.3-strip-strip.patch
new file mode 100644
index 000000000000..1339baf63a00
--- /dev/null
+++ b/sys-auth/thinkfinger/files/0.3-strip-strip.patch
@@ -0,0 +1,24 @@
+Strip is handled by the package manager.
+
+--- a/pam/Makefile.am
++++ b/pam/Makefile.am
+@@ -8,7 +8,7 @@ pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h p
+ else
+ pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ endif
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ 
+--- a/pam/Makefile.in
++++ b/pam/Makefile.in
+@@ -201,7 +201,7 @@ pamdir = $(SECUREDIR)
+ INCLUDES = -I$(top_srcdir)/libthinkfinger
+ @HAVE_OLD_PAM_FALSE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ @HAVE_OLD_PAM_TRUE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ all: all-am
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
index ff35e306ac28..c3ceaefff52a 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild,v 1.2 2011/08/26 18:25:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild,v 1.3 2011/10/31 00:28:57 dirtyepic Exp $
 
-EAPI=2
+EAPI="4"
 
-inherit eutils linux-info multilib pam
+inherit autotools-utils eutils linux-info pam
 
 DESCRIPTION="Support for the UPEK/SGS Thomson Microelectronics fingerprint reader, often seen in Thinkpads"
 HOMEPAGE="http://thinkfinger.sourceforge.net/"
@@ -13,24 +13,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug pam"
+IUSE="debug pam static-libs"
 
-RDEPEND=">=dev-libs/libusb-0.1.12
+RDEPEND=">=dev-libs/libusb-0.1.12:0
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	>=dev-util/pkgconfig-0.9.0"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-direct_set_config_usb_hello.patch || die
-	epatch "${FILESDIR}"/${PV}-carriagereturn.patch || die
-	epatch "${FILESDIR}"/${PV}-send-sync-event.patch || die
-	epatch "${FILESDIR}"/${PV}-tftoolgroup.patch || die
-}
-
-pkg_preinst() {
-	enewgroup fingerprint
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-direct_set_config_usb_hello.patch
+	"${FILESDIR}"/${PV}-carriagereturn.patch
+	"${FILESDIR}"/${PV}-send-sync-event.patch
+	"${FILESDIR}"/${PV}-tftoolgroup.patch
+	"${FILESDIR}"/${PV}-strip-strip.patch
+)
 
 pkg_setup() {
 	if use pam ; then
@@ -41,19 +38,25 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf \
+	local myeconfargs=(
 		$(use_enable pam) \
 		$(use_enable debug usb-debug) \
-		"--with-securedir=$(getpam_mod_dir)" \
-		|| die
+		"--with-securedir=$(getpam_mod_dir)"
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	autotools-utils_src_install
+
 	keepdir /etc/pam_thinkfinger
-	dodoc AUTHORS ChangeLog NEWS README || die
-	insinto /$(get_libdir)/udev/rules.d
-	doins "${FILESDIR}"/60-thinkfinger.rules || die
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/60-thinkfinger.rules
+}
+
+pkg_preinst() {
+	enewgroup fingerprint
 }
 
 pkg_postinst() {