gentoo resync : 04.01.2018

9 files changed, 46 insertions, 52 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 9b6b63267efc..cdd77e0e67f6 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprint_demo/Manifest b/sys-auth/fprint_demo/Manifest
index 8fb6c8f83e8c..a6128937f7d1 100644
--- a/sys-auth/fprint_demo/Manifest
+++ b/sys-auth/fprint_demo/Manifest
@@ -1,3 +1,3 @@
 DIST fprint_demo-0.4.tar.bz2 75986 BLAKE2B d4bbb82e01d1f1e0c990f421f431d1da0495d792c69d88b8c1595d4e59a2882fa07557c6932e2b6f408351eceb911688b23a9c18a6d597421eea977697fcd319 SHA512 6f995c09520ec8cf35ff407db56ea65091dc3d78ab47dba3d0ad500de3c644b64cf378a69f2b2701bb32ce75e3eef98d8fa56a8f0ce188d842e3a8dd52f01a66
-EBUILD fprint_demo-0.4.ebuild 537 BLAKE2B f527a209523f75484ca5cea7b1e60e11663de3713fa28c07b7574f7ff48e5a53e9106aba0c5d3533b5c67329d2ff7561841105c4d95df87ea98473836d3c74ec SHA512 b8796182424815ffb8efe4496dc7ad59af33356cda60cf5a6370d359b3dfdf4b846667e5e64d3df38a7a1b96339d26caecbba398bb30af20ce1e776482981b91
+EBUILD fprint_demo-0.4.ebuild 439 BLAKE2B 7b2d9761e53a6e64f69119f6e474eab7bf3c4d18c04883498b7765cd76e365b4c8272ad53c40c86982cd122512e7beb0944eb9900ee3c7f3052c78755319295d SHA512 82d051aedd7f79200cdce3d75bcb27263d0025b079d99b6c3194a567fb65facfaefd3b7fe58f3463c3de0bc19b143f9ac9c71c6c80bfde9ed470f9357c4cbbe7
 MISC metadata.xml 325 BLAKE2B c5f028c28c76ab6109734c996bf1227508651fcb4990cf6d21a25d60826d01cc5a6b88062a2b1258291653c20a0c6ce7473b7af8cb7d2643e6fdd002d8f97b96 SHA512 37fbe28a1504d7678de67cee0b2709aee48c0bb2d19c36f6e7020346335cb0e1c669ab504b2bab537a18d98c84cb293cda8f60fa78de462975938b71326d6198
diff --git a/sys-auth/fprint_demo/fprint_demo-0.4.ebuild b/sys-auth/fprint_demo/fprint_demo-0.4.ebuild
index 88da0e2f3cbb..9674281223aa 100644
--- a/sys-auth/fprint_demo/fprint_demo-0.4.ebuild
+++ b/sys-auth/fprint_demo/fprint_demo-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
 DESCRIPTION="a simple GTK+ application to demonstrate and test libfprint's capabilities"
 HOMEPAGE="http://www.reactivated.net/fprint/wiki/Fprint_demo"
@@ -12,11 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="sys-auth/libfprint
+RDEPEND="
+	sys-auth/libfprint
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/sys-auth/libnss-cache/Manifest b/sys-auth/libnss-cache/Manifest
index 31a9aa7d65cc..edab7b031355 100644
--- a/sys-auth/libnss-cache/Manifest
+++ b/sys-auth/libnss-cache/Manifest
@@ -1,5 +1,5 @@
 AUX libnss-cache-0.10-fix-shadow-test.patch 410 BLAKE2B 4186e2d43429799969246079ca16165f0aada4a686f2da0d59919c3232ee7cac3195ed2eea023604f42ed821c2463f88dcd9e6ea6769b8d6ac2dbb97808dd384 SHA512 c7ba933a1383d2d7d42967217f8bbaf6fe99c3b9694e725a141d0cd07e94368243806224b3f8137d78ef73b054fcef2bec4695d13b3e88a83afcb34c05940137
 AUX libnss-cache-0.10.1-make.patch 1640 BLAKE2B 21c16aa744ca9f5ed6da1ec08b5c66a5fab42c9ea1bdf1521981a29d7b1b88ee48ef1cc059451777d1212283e7c4c5e717ba0de1be7e01d296c03d580550c061 SHA512 baa2000a08e03807b6afd9145c1bbe98e448de909c9aa6d62c88052f33a7a50b6c19691aca64b5c04737fb7281880578c55d10f94bc0856c6ce4af0f24bccb48
 DIST libnss-cache-0.10.2.tar.gz 11967 BLAKE2B c0954d4382dba25d50fa5749acc11d4bf46175f686b2137539aa6fdb0ba4fabf5fe017e13abc518aaed8f315fac28ad4a85e9019b445595b137428bfee3f4623 SHA512 453624e85ff2692f0724f578ad72df76c96ecb2657eb3a701349025811af4e0c3ecf8e42c35a9a4eddabf4e731c361f4235d7cef34a61aec2e80e1b8728ea98f
-EBUILD libnss-cache-0.10.2.ebuild 878 BLAKE2B 3ccf22b10c09da869439961fc47f86ab7d178fd6f2ec4b3d89d274157f5326ce26266f3a327c545ed483243346dce8e1af139df52787891e887f3f33fe10d7d7 SHA512 8653304481ca9cb3822fff542a06e89e2985f72441eba57180c40bb98abe504f467c84976a3356502d25b17c0c1d9b20a0d57489edcdec0857062957b1bbb50a
+EBUILD libnss-cache-0.10.2.ebuild 692 BLAKE2B 109414baeb51703ff105a229346a4789c75ca1a89221e55c12f1b609a9cb7a92befc8ef70de3bc4a8444ab3ddebbffdcfa98affbd99021f97046beabe63b6803 SHA512 dd0d5084b51119907ff397f732d16a5fcd7f5265e5537a6560a0cdb819688f47b0b1391fbf96fbf8cf16aa48a00bad6aeaf5be875a7e4bb05d4a2772456b7945
 MISC metadata.xml 376 BLAKE2B 4df38df10886d16c70c3b9d48d2469d639002118490e0e1cf68d0d59daaef473835db2a85cb3a291813ad014910ba35f032b65cdff98bb604eb0683286a74f58 SHA512 f5d1c811ef8d4dacf1e440d7a06b90cd36d6f60f8b790021ddd1744f64b08a5632a466179abf5ba2db61701f14384d95b95062a8932ea21b9d0b621c189220da
diff --git a/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild b/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild
index 0c1a0b837148..0ad34429a489 100644
--- a/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild
+++ b/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils multilib toolchain-funcs
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="libnss-cache is a library that serves nss lookups"
 HOMEPAGE="https://github.com/google/nsscache"
@@ -12,23 +12,22 @@ SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="multilib"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.1-make.patch
+	"${FILESDIR}"/${PN}-0.10-fix-shadow-test.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.1-make.patch
-	epatch "${FILESDIR}"/${PN}-0.10-fix-shadow-test.patch
+	default
+	multilib_copy_sources
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" nss_cache || die
-	if use multilib && has_multilib_profile; then
-		emake CC="$(tc-getCC)" nss_cache32 || die
-	fi
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" nss_cache
 }
 
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die
-	if use multilib && has_multilib_profile; then
-		emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install32 || die
-	fi
+multilib_src_install() {
+	emake DESTDIR="${ED}" LIBDIR="${ED%/}/usr/$(get_libdir)" install
 }
diff --git a/sys-auth/pam_fprint/Manifest b/sys-auth/pam_fprint/Manifest
index 11ec76c4e0e1..3a8a951be0f4 100644
--- a/sys-auth/pam_fprint/Manifest
+++ b/sys-auth/pam_fprint/Manifest
@@ -1,4 +1,4 @@
 AUX pam_fprint-0.2-headers.patch 281 BLAKE2B b05e33732c83483a790198dd884c7051f071a450935e8236a6d345446d4bc9c415815c251c9fd537f78abb7822a12e8b94916c429bf0635bfc4edc441ca897ff SHA512 f7bbc72805ccbea7ba66b88fdf1f9793b3e8c076e7e64cab0be2c04881fb786b7ba9559067efad2956a3fd26aa647794b19b0cd0c52472fbd3ecd7205d71d006
 DIST pam_fprint-0.2.tar.bz2 72781 BLAKE2B 196bfd6a714da2d0fa8fe616a63e31008024a02b785aa393a62acd2267c1cc87382aef1d7af8d9f626c406534dd1e952dec520e6fc5dc0bc52d157246762c15c SHA512 c860488efabfd6301b4e19596e15545bbcb1a15f79bfd7c61a357ef47cf0a621ec0d15328d5be30f7ef045813e18333bd0aea7fb8fcb06681007dcacca6396fd
-EBUILD pam_fprint-0.2-r1.ebuild 719 BLAKE2B f554e702021546f9be91d7852b839cfc585b3a4a7d9ce956c78c8322886b988f94d2c93230a43af36577438861aa748ced6110987f3a996137e4cb16d2dd0564 SHA512 85b24d57d696b50300fd03cef7273d8c679e5d7b626e55dc0af7019d24a1e690988c993d290418e17f62e4fddbe8cff95ed722c8e90d79a34929f64902db2580
+EBUILD pam_fprint-0.2-r1.ebuild 649 BLAKE2B a7827e06deb62dab1b4b148ac0cbf3257127571a369e925e7c9a8cf69ef63682c9f0fae9f43ea20735352bab589a996e14d9d35b02be4d8d08f6ee1336f86dda SHA512 6dc1f32ccb842bc95b3ae9160597aa747a172a085ecb9c5185c48f17576307cf87166d0b4df17412c02e3cbc295c81ba3eae814f11f5eb222f0f2ceff02db453
 MISC metadata.xml 319 BLAKE2B 3ee75b5e5de295499e17d85b1262366f72db22e9d9ea18f8082b4f54f3c144f379bdb972069991b881629f111a9a81650b8fe505b475e072191e74010becf46e SHA512 79948714fc1b4c53d05d68d73755a6c81dcd44916b0cb81c8283fbf52e1c0c20f0f12bf31ca5ab3c42533dcfed6f6451692e35157cbaa419128bd0734c0e17ec
diff --git a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
index 656e7e1b3841..8179d8611ad5 100644
--- a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
+++ b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils pam
+inherit pam
 
 DESCRIPTION="a simple PAM module which uses libfprint's functionality for authentication"
 HOMEPAGE="http://www.reactivated.net/fprint/wiki/Pam_fprint"
@@ -14,17 +14,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="sys-auth/libfprint
+RDEPEND="
+	sys-auth/libfprint
 	sys-libs/pam"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-headers.patch )
 
 src_install() {
-	dopammod src/${PN}.so || die
-	newbin src/pamtest pamtest.fprint || die
-	dobin src/pam_fprint_enroll || die
-	dodoc AUTHORS ChangeLog NEWS README || die
+	dopammod src/${PN}.so
+	newbin src/pamtest pamtest.fprint
+	dobin src/pam_fprint_enroll
+	einstalldocs
 }
diff --git a/sys-auth/realtime-base/Manifest b/sys-auth/realtime-base/Manifest
index 609ef9d53804..8f1a231709f2 100644
--- a/sys-auth/realtime-base/Manifest
+++ b/sys-auth/realtime-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-base-0.1.ebuild 1067 BLAKE2B e642c4fb1fd1d6a0e447b7223f8465a6d602e8f2d8bd339ecd3d728ab46cae58a8a83211268e54be39f7e13afe0bfc6efcd8d006bd4fc392f8fc1117d64d8876 SHA512 70c1e982c6c39ebe0dbea4eacc9ac194f43796414d0c6220222188e74212f493254ae337f6b477b0c6e75967e1410c12fbfaa011a81066dc8026a8e457e8fdb4
+EBUILD realtime-base-0.1.ebuild 979 BLAKE2B 9db8560ab45af1795acf2f177bfde9486bdb66d8aa11a95d62e0e806995f692499455e5eff5ba4a385f737ebd0be28f14b2bdbe95ac51ee6794f250907fab202 SHA512 68b4c327e8a1f3a1108355b44546bda71c425b1bb6feb4d10def2301ea5455158c3be63de2fc52543dcd84029c95a89105056b13211f2af97a2f01502607ea6e
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index 7af8533be7c8..1fc02cd38e08 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
 inherit user
 
@@ -17,30 +17,30 @@ IUSE=""
 DEPEND=""
 RDEPEND="virtual/pam"
 
+S=${WORKDIR}
+
 limitsdfile=40-${PN}.conf
 rtgroup=realtime
 
-S=${WORKDIR}
-
 pkg_setup() {
 	enewgroup ${rtgroup}
 }
 
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${rtgroup}\t-\trtprio\t99\n"
-	printf "@${rtgroup}\t-\tmemlock\tunlimited\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
 src_compile() {
 	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@${rtgroup}	-	rtprio	99
+		@${rtgroup}	-	memlock	unlimited
+
+		# End of ${limitsdfile} from ${P}
+	EOF
 }
 
 src_install() {
 	insinto /etc/security/limits.d/
-	doins "${S}/${limitsdfile}" || die
+	doins ${limitsdfile}
 }
 
 pkg_postinst() {