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.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 57 insertions, 23 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/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() {