Fix reinstalls (sandbox violation), inherit readme.gentoo, replace non-exist plugdev with fingerprint, created in postinst.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 98 insertions, 85 deletions

diff --git a/sys-auth/fingerprint-gui/ChangeLog b/sys-auth/fingerprint-gui/ChangeLog
index 5fca2c0b7bec..bbc4e1d6f355 100644
--- a/sys-auth/fingerprint-gui/ChangeLog
+++ b/sys-auth/fingerprint-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/fingerprint-gui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.7 2013/07/07 09:36:09 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.8 2013/07/28 17:57:14 xmw Exp $
+
+*fingerprint-gui-1.05-r1 (28 Jul 2013)
+
+  28 Jul 2013; Michael Weber <xmw@gentoo.org> +fingerprint-gui-1.05-r1.ebuild,
+  -fingerprint-gui-1.04.ebuild:
+  Fix reinstalls (sandbox violation), inherit readme.gentoo, replace non-exist
+  plugdev with fingerprint, created in postinst.
 
 *fingerprint-gui-1.05 (07 Jul 2013)
 
diff --git a/sys-auth/fingerprint-gui/Manifest b/sys-auth/fingerprint-gui/Manifest
index 6c8e7a4cd5d0..ff47c2a5eacf 100644
--- a/sys-auth/fingerprint-gui/Manifest
+++ b/sys-auth/fingerprint-gui/Manifest
@@ -2,20 +2,15 @@
 Hash: SHA256
 
 AUX fingerprint-gui-1.04-unistd.patch 1667 SHA256 02620c0d8bc949342d4be91ef2fdc648d6b7c42ade1ad83805e01e344542e6cf SHA512 ea6f99ffc2e10d941af44b970b67c6758d31f36d67177f69b67f59bc02967a09ada9d4658ce2a7f3b3b1bf224910d787d16d8489469105957220ce60c5a363c9 WHIRLPOOL d29380dc90d6ac556e0a06961d9dffb5521587117ea573fd9cb83bfc5d567d4356c8167489c60e3c9e253f2ab86c294651f1248051d60ac3736ee65f9384fb56
-DIST fingerprint-gui-1.04.tar.gz 3801451 SHA256 f83541429e563d35f5e4caea979d22b1f4662f41b76e45776d9d7e6eb0eda35d SHA512 a97a34b99b69714d1ce36da0001def31ff3b9dfb191d59bbe48f1a118b6cdfb72e751c7ee8b3b280be82c3a690d94facc5c21828e44b892dc401855c43da4e87 WHIRLPOOL 3178c5027d442545dff2dfc2957853c61429530cb8bb3df4926b27e6821cc64b591f115d4cd17c50f1f0af92bbfe2a80d6ea3b1737a13aef407b0101911dbc79
 DIST fingerprint-gui-1.05.tar.gz 7001230 SHA256 4058ffa55de8ea346ae8747ec88828d2312656b3d8a54c57198b04e4032097db SHA512 6bf90dacb1e2b5f84fcded14a7b345cc613d09a886f1f103344caa00704e06f740af1ec3b9ae76f60a52e8330a68af63a035dbd53ab9a5bdce6521bcb5b3b6e8 WHIRLPOOL c0c8f5e3a87b0821aab23591ef25340cf1a1d3cde9d5e9ee2d716f600286c9eab909056021dda6e1ea7fe80731d9bf7bde437ddb406692ad1517050f1d647132
-EBUILD fingerprint-gui-1.04.ebuild 2052 SHA256 7031616f9b615800449816cec65833c74a98cf82180510881a506ae75b534ef0 SHA512 b233185929d22e3e78a4619409fedf951567901709192be668ae34ee4397f85d83c74594ad6d7724e5786d51df5c28f633c28b5e46201a2e32ed6253764d6dad WHIRLPOOL 2e7cd2874e9a388827b247831b10304b9ee823bdf277022720e8f53ac63da09c7a4152a7ec7c829c7720cd7fdc78ee1b5a5a24aa8dd5d167711a482a9e6f3aec
+EBUILD fingerprint-gui-1.05-r1.ebuild 2444 SHA256 50905bd5df4dca42dd7d12fcb1e63adb34c35eb8e306072a5c7fa14c5afc32b5 SHA512 b2b05c76586727da54ab5fbb12419c3542efc3440d8927f02797935d8be5452c2559bfb07be9e6f65f5cd6324ed022994778484f1f278126cbd30a7b369676dd WHIRLPOOL c331c13e4691382022734642e403cb6c96585089b1956444f668288064426243a7ab0ded6113c5bed537118c953b7fe0c4b6aac6af039a80aa5f1e3bb3d1c8d5
 EBUILD fingerprint-gui-1.05.ebuild 2153 SHA256 ea0240ef69c722f58ffe7621dd90e5513d4e0b05a0098d49d2e3f49a2b004850 SHA512 4a174690fb4a0db4efac8c671a1874f7ab15aa032c0870864d95d99ecdf5f24a986e80a06945b6b0be76ea34f146fb105644c606802c624c93272ed4d33d1dcb WHIRLPOOL 23108d8ff943d5aae9ac0dc7ff455952f87c134e21077474417f73f192098ee7b25597376fd04efa648c641092028a14f61624f77603743b8742abfa6ff12bcc
-MISC ChangeLog 1582 SHA256 3579754d1506e70e5f770b81d2b6ee9d5efaf8cb1172c0f4c6145d46a84ead19 SHA512 2a73ac99befcaaf7f684a8d4fed8f728ea2f9f40b858dda6895c54e1533aa6280db6584faea36aed0aa2f7befd08074354ecfaf5957a80db2a67d86fc30ba0be WHIRLPOOL 1eeac8662f32ce224570845a6451d76d2c32ad4342f584a803e929eda96c189dfd7c33bcf0e5043cfb1fbffd41709334c9d495d50fde532cff2c0c1a7cc10727
+MISC ChangeLog 1856 SHA256 ffc6c99918cec977decd8f512018e5869141005ee5eec492f2675dba1a32e3c1 SHA512 4b5a953da499d58fcf87f4a75cbd4261a97bd65e4cd8c49459bae39e59820115790ee3019ee7c3c3f6ecae5ec199e21a6523f18c42cffc88457dcf081a0873e3 WHIRLPOOL 4c30171ed044a0b4ebf2d5c985faf507b15e589edc5faa40788fc48bdc302a6ca8689bc9492869b4614c5e10151708c852d7d31953bc5586a27be8a1c7d732c7
 MISC metadata.xml 330 SHA256 31500978cd7c73c82bf5442ee004433de86a8ba8f27353afe52c54707428fe62 SHA512 611f15046fc9268e3a05e960d557ab10f42c6b429e6bd19d8638dda5540af70ac2f853c8ad85cabee1d4cc4dc525fea6b4d8dd4ce1b7d91927e43765105dc144 WHIRLPOOL 7374cdf4adadff8480aacf7bbdee8c0117e9a20ed5ea8e68d5fe552183a45ad3dfd8226454dc915b8510f4e1babd81c549e30c3da65d73ae49681ff4d933c902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR2TahAAoJEAmJmMX429rex+MH/itaioE0QomtW4JcM3wKv8mG
-ytygjnKx97wkOuK6kgaqB9F++DGqtsyqqi/y8a0NuJerfpyAteAv/jStefroolW9
-/CQBARjmYlLleDAcdYN8JfDOb1t5MBL16vweuihx5hfb2QTaTLpCVIioJMxdRlil
-omewn4MFMyuM7QSExjrFNkAeEgJEe5Zmz/iMN6S4DQzF+/RWSpFULu5e4Thls2aA
-WyaGRGD3YBQUS3jEl972ceVa2BpFu6A/ZhA+wQdvsAUaLH59tXTXOt0aj81PVIXg
-ZQWMLyozg5ArHARmWR0IcwmeVmBMv1N4YWNJ6/DwQ3YtQGgaQHKIrHnVZAnKMYA=
-=LyT0
+iF4EAREIAAYFAlH1W30ACgkQknrdDGLu8JC58QD6A3a3jwJeeKpsdHJv84b3Kx9p
+cRR03jrKPNUDtOLUOPwA/1IZmx2TBpyUF3yVx+WG9vGaXyL2XFPTwajReqzdk8Le
+=irEl
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.04.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.04.ebuild
deleted file mode 100644
index 0d1261b974fe..000000000000
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.04.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.04.ebuild,v 1.7 2013/03/02 23:33:19 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils multilib qt4-r2 udev
-
-DESCRIPTION="Use Fingerprint Devices with Linux"
-HOMEPAGE="http://www.n-view.net/Appliance/fingerprint/"
-SRC_URI="http://www.n-view.net/Appliance/fingerprint/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+upekbsapi"
-
-RDEPEND="app-crypt/qca
-	app-crypt/qca-ossl
-	sys-auth/libfprint
-	sys-auth/polkit-qt
-	sys-libs/pam
-	x11-libs/libfakekey
-	dev-qt/qtcore:4
-	!sys-auth/thinkfinger"
-DEPEND="${RDEPEND}"
-
-QA_SONAME="/usr/lib/libbsapi.so /usr/lib64/libbsapi.so"
-QA_PRESTRIPPED="/usr/lib/libbsapi.so /usr/lib64/libbsapi.so"
-QA_FLAGS_IGNORED="/usr/lib/libbsapi.so /usr/lib64/libbsapi.so"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-unistd.patch
-	sed -e '/Icon=/s:=.*:Fingerprint:' \
-		-i bin/${PN}/${PN}.desktop || die
-}
-
-src_configure() {
-	eqmake4 \
-		PREFIX="${EROOT}"usr \
-		LIB="$(get_libdir)" \
-		LIBEXEC=libexec \
-		LIBPOLKIT_QT=LIBPOLKIT_QT_1_1
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	if use upekbsapi ; then
-		use amd64 && dolib.so upek/lib64/libbsapi.so
-		use x86 && dolib.so upek/lib/libbsapi.so
-		udev_dorules upek/91-fingerprint-gui-upek.rules
-		insinto /etc
-		doins upek/upek.cfg
-		#dodir /var/upek_data
-		#fowners root:plugdev /var/upek_data
-		#fperms 0775 /var/upek_data
-	fi
-	doicon src/res/Fingerprint.png
-
-	dodoc CHANGELOG README
-	dohtml doc/*
-}
-
-pkg_postinst() {
-	elog "Please take a thorough look a the Install-step-by-step.html"
-	elog "in /usr/share/doc/${PF} for integration with pam/polkit/..."
-	elog "Hint: You may want"
-	elog "   auth        sufficient  pam_fingerprint-gui.so"
-	elog "in /etc/pam.d/system-auth"
-	einfo
-	elog "There are udev rules to enforce group plugdev on the reader device"
-	elog "Please put yourself in that group and re-trigger the udev rules."
-}
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
new file mode 100644
index 000000000000..7a2619566fbb
--- /dev/null
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.1 2013/07/28 17:57:14 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib qt4-r2 readme.gentoo udev user
+
+DESCRIPTION="Use Fingerprint Devices with Linux"
+HOMEPAGE="http://www.n-view.net/Appliance/fingerprint/"
+SRC_URI="http://ullrich-online.cc/nview/Appliance/${PN%-gui}/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+upekbsapi"
+
+RDEPEND="app-crypt/qca
+	app-crypt/qca-ossl
+	sys-auth/libfprint
+	sys-auth/polkit-qt
+	sys-libs/pam
+	x11-libs/libfakekey
+	dev-qt/qtcore:4
+	!sys-auth/thinkfinger"
+DEPEND="${RDEPEND}"
+
+QA_SONAME="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
+QA_PRESTRIPPED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
+QA_FLAGS_IGNORED="/usr/lib/libbsapi.so.* /usr/lib64/libbsapi.so.*"
+
+src_prepare() {
+	sed -e '/Icon=/s:=.*:=Fingerprint:' \
+		-i bin/${PN}/${PN}.desktop || die
+	sed -e "s:/etc/udev/rules.d:\"$(get_udevdir)\"/rules.d:g" \
+		-i bin/${PN%-gui}-helper/${PN%-gui}-helper.pro || die
+	sed -e 's:GROUP="plugdev":GROUP="fingerprint":' \
+		-i bin/fingerprint-helper/92-fingerprint-gui-uinput.rules \
+		-i upek/91-fingerprint-gui-upek.rules || die
+}
+
+src_configure() {
+	eqmake4 \
+		PREFIX="${EROOT}"usr \
+		LIB="$(get_libdir)" \
+		LIBEXEC=libexec \
+		LIBPOLKIT_QT=LIBPOLKIT_QT_1_1
+}
+
+src_install() {
+	export INSTALL_ROOT="${D}" #submakes need it as well, re-install fails otherwise.
+	emake install
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+	if use upekbsapi ; then
+		use amd64 && dolib.so upek/lib64/libbsapi.so*
+		use x86 && dolib.so upek/lib/libbsapi.so*
+		udev_dorules upek/91-fingerprint-gui-upek.rules
+		insinto /etc
+		doins upek/upek.cfg
+		#dodir /var/upek_data
+		#fowners root:plugdev /var/upek_data
+		#fperms 0775 /var/upek_data
+	fi
+	doicon src/res/Fingerprint.png
+
+	dodoc CHANGELOG README
+	dohtml doc/*
+
+	readme.gentoo_src_install
+}
+
+pkg_preinst() {
+	enewgroup fingerprint
+}
+
+FORCE_PRINT_ELOG=1
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please take a thorough look a the Install-step-by-step.html
+in /usr/share/doc/${PF} for integration with pam/polkit/...
+Hint: You may want
+   auth        sufficient  pam_fingerprint-gui.so
+in /etc/pam.d/system-auth
+
+There are udev rules to enforce group fingerprint on the reader device
+Please put yourself in that group and re-trigger the udev rules."