Version bump (bug 365075 by Rambaldi), add DEPEND gtk-doc-am (bug 413563 by Albert W. Hopkins), remove old version

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 28 insertions, 21 deletions

diff --git a/sys-auth/fprintd/ChangeLog b/sys-auth/fprintd/ChangeLog
index 6d541b33af7f..4fd1938706e3 100644
--- a/sys-auth/fprintd/ChangeLog
+++ b/sys-auth/fprintd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/fprintd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/ChangeLog,v 1.6 2012/04/26 00:13:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/ChangeLog,v 1.7 2012/05/15 07:15:40 xmw Exp $
+
+*fprintd-0.4.1 (15 May 2012)
+
+  15 May 2012; Michael Weber <xmw@gentoo.org> -fprintd-0.2.0.ebuild,
+  fprintd-0.2.0-r1.ebuild, +fprintd-0.4.1.ebuild:
+  Version bump (bug 365075 by Rambaldi), add DEPEND gtk-doc-am (bug 413563 by
+  Albert W. Hopkins), remove old version
 
   26 Apr 2012; Jeroen Roovers <jer@gentoo.org> fprintd-0.2.0-r1.ebuild,
   fprintd-0.2.0.ebuild:
diff --git a/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild b/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild
index 7f777e577526..f2ffa626159a 100644
--- a/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild
+++ b/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild,v 1.3 2012/04/26 00:12:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/fprintd-0.2.0-r1.ebuild,v 1.4 2012/05/15 07:15:40 xmw Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RDEPEND="dev-libs/dbus-glib
 	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc
+	dev-util/gtk-doc-am
 	dev-util/intltool
 	doc? ( dev-libs/libxml2 dev-libs/libxslt )"
 
diff --git a/sys-auth/fprintd/fprintd-0.2.0.ebuild b/sys-auth/fprintd/fprintd-0.4.1.ebuild
index f6288a8ef8c0..65521d83479f 100644
--- a/sys-auth/fprintd/fprintd-0.2.0.ebuild
+++ b/sys-auth/fprintd/fprintd-0.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/fprintd-0.2.0.ebuild,v 1.4 2012/04/26 00:12:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fprintd/fprintd-0.4.1.ebuild,v 1.1 2012/05/15 07:15:40 xmw Exp $
 
-EAPI=3
+EAPI=4
 
 inherit autotools toolchain-funcs versionator
 
@@ -13,21 +13,19 @@ SRC_URI="http://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc pam static-libs"
 
-RDEPEND="
-	dev-libs/dbus-glib
+RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-auth/libfprint
 	sys-auth/polkit
-	pam? ( sys-libs/pam )
-	"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc
+	dev-util/gtk-doc-am
 	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )
-	"
+	doc? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 S=${WORKDIR}/${MY_PV}
 
@@ -46,24 +44,25 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		pammoddir=/$(get_libdir)/security || die
+		pammoddir=/$(get_libdir)/security
 
-	keepdir /var/lib/fprint || die
+	keepdir /var/lib/fprint
 
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
+	find "${D}" -name "*.la" -delete || die
+
+	dodoc AUTHORS ChangeLog NEWS README{,.transifex} TODO
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/html
-		doins doc/{fprintd-docs,version}.xml || die
+		doins doc/{fprintd-docs,version}.xml
 		insinto /usr/share/doc/${PF}/html/dbus
-		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml || die
+		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
 	fi
 }
 
 pkg_postinst() {
-	elog "You can add the following line to your /etc/pam.d/system-auth"
-	elog
+	elog "Please take a look at the upstream documentation for integration"
+	elog "Example: add following line to your /etc/pam.d/system-local-login"
+	einfo
 	elog "    auth    sufficient      pam_fprintd.so"
-	elog
-	elog "to enable the PAM module for authentication."
-	elog "But don't lock yourself out, keep one terminal open!"
+	einfo
 }