gentoo resync : 31.03.2018

8 files changed, 2 insertions, 155 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 67d9fd364f1e..212fb1bd335c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index 109f1671f67a..0927f6b9fcdb 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -1,10 +1,5 @@
-AUX bioapi-1.2.3-build.patch 1310 BLAKE2B eefcf965fafb7bc6f292ab9c4d57d05c16b90d9b1894261c9121c9a6f46bd39a4ffb7800572ec19b8e9d21dbead9ac70c927b165043bbb9af498a89da5258e2c SHA512 5cb3b656ff472ff648473dc04e89a7df0ac034642653d87e416f631260a4afbb8888b0de5b9c25cc1b0e4807e194ef462ba8ecb5ea1b5b3f9a4505a3778ab6d4
-AUX bioapi-1.2.3-enroll-ret.patch 278 BLAKE2B 8c3b17ab47ec318d1f3a8841ec49fad20a913db81549478b0db2675349552b897dfc40079fc1dcf81546a6ce01c4a86b5a677d044686542bded1e70e5d04e62f SHA512 adb60b540800d750ddfbee7932dd8ca5646b37853e692ed851abd010bf0c195b4cbf07e7c710073c30fc7a581c9f733914cd633d1628d8c7ddccdaeec6065710
-AUX bioapi-1.2.3-gcc44.patch 545 BLAKE2B 0c2784650c6d9653d925bd81a62f18d0f413407b9ae332c85a28011f40e5136fb7f0a21d9be2fc4335ce8b0abf395bf3d7d190bd4e5416e6892a42e339ff0ee8 SHA512 88a0b0849c5ec3d028eb96f23f64218b9b794edfc929e2e163fb675709e29f0a46e2fdfec9e4e97a83033422468ec27c1fd937a5d3d690e75dd2684eb2a35dff
 AUX bioapi-1.2.3-no-delete.patch 504 BLAKE2B c24f21ce40f3b8ec1500c1de2d186f88a98517138c92a871404b9f27d94ad0af2599340b98624aa6b0b3c850b5b1e01e7576a8b504a8c1ac704a36dc2b18962b SHA512 790b9c674b3d42f4a03d3e0a4545932d29f45be29f1a66a83226639067a26efdce4b40279ee6178da850f01cf1747b89e37798bb45555e6644508bb0b86817d4
 AUX bioapi-1.2.4-build.patch 1258 BLAKE2B 1da2a01d1ccf5cf8f7c24855bf59e5dcf0a4b469e4a555ddcdd0710a983d13b6c7ae8ac6193c64ba3be68e40f9badee823dc0a48008c8af68e7c0c51df4a3a53 SHA512 1211812ab6d78a863d9bb4497f29a83fbdb7bd74428c34a4499d0e453dbb3a27ff15f3e436b0dd4b12e0d39bfffbefd40e2a55d27c0123975f450c112a163043
-DIST bioapi_1.2.3.tar.gz 1634237 BLAKE2B 002ac9c1543645759cc03fd7d33513b893fd3c5dcdd45cd3f92a992a0793c043ff5d41cff560c34d88c5c033fde4d54b35a66c09903ac5c5927123fa4e6e1ecd SHA512 683da884a5cf6d72b577f7c1f642930c152c43c7acad3c678a3571acf3f66e0a7e112fccde06d9a7535a186bcb56a96acfb5e1c405b1d931be9f252be1b01649
 DIST bioapi_1.2.4.tar.gz 953136 BLAKE2B 2ce44892f740696ea264776a1e03c170415b26326ddd4b48c73732b9556349860139a62ed0bdfad5eb6b085ed45286cfe838287aac57bca4a9767aa2a06c707d SHA512 99c67fea34b73291dcaeb1590fac88b3196d3ca65f788b92d0afd6ba85036b2d85397e3faa66b872a68bffaeb7c2bf5c731306bf02a25a435ef06cea18da746f
-EBUILD bioapi-1.2.3-r2.ebuild 1893 BLAKE2B 104f4e01394d56d84695b69376636c91aaaee1711cf38408320eb04820dcfefd5fc41e368399f7647e0c513d5d7218f76111795e9f430ea2bab8b80644985887 SHA512 b5115f2b946535216c107348c66145b25c358df87630a9477c5a483cec1b783ee6617a6afdd1ddf9bba919a6aa88814324aa926b858a2535c096430ee85f5d04
 EBUILD bioapi-1.2.4.ebuild 1825 BLAKE2B 6e87c54518fc1f40ab3f02f837eacec2caa2a18cb671e0620a87228943a36ed76bfa8065025bbd44e82c4984fadcb238beee93bb9fb5a419d4454ea23d49bd02 SHA512 20d305d39b54917187e35543915b55bb5105395c448e6f519197d2c51c8480ef5ac09bfbb897ba10acfbd7f28c343e49055c28a349a9465af089dd9a309e8585
 MISC metadata.xml 306 BLAKE2B 250c6baaa21d72fa5b14371e5c3dbe2dfe25a8d6a0b29d27435989c7a92a6d0451f019a15f81546d87244e58242cc8c97f0d9ff208bdf26193b8859326bef149 SHA512 2d830d584ab9efa4a19f02519fa96d8267ab8d723960822e17db244515bcdedff6d17c944af4a843fc430d9fce9d4cec43e719206af0b24e3ebea42769d2b25c
diff --git a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
deleted file mode 100644
index 2d83ab6ad7c0..000000000000
--- a/sys-auth/bioapi/bioapi-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib user
-
-DESCRIPTION="Framework for biometric-based authentication"
-HOMEPAGE="https://github.com/mr-c/bioapi-linux"
-SRC_URI="https://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-LICENSE="bioapi"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/bioapi-linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
-	epatch "${FILESDIR}"/${P}-no-delete.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-build.patch #336107
-	rm -f config.{guess,sub} #337805
-	touch config.{guess,sub}
-}
-
-src_configure() {
-	econf --without-Qt-dir
-}
-
-src_install() {
-	emake SKIPCONFIG=true DESTDIR="${D}" install || die
-	dodoc README
-	dohtml *.htm
-
-	# rename generic binaries
-	mv "${D}"/usr/bin/{,BioAPI}Sample || die
-}
-
-pkg_config() {
-	mds_install -s /usr/$(get_libdir)
-	mod_install -fi /usr/$(get_libdir)/libbioapi100.so
-	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
-	mod_install -fi /usr/$(get_libdir)/libpwbsp.so
-}
-
-pkg_preinst() {
-	if [[ -e ${ROOT}/var/bioapi ]] && [[ ! -e ${ROOT}/var/lib/bioapi ]] ; then
-		einfo "Moving /var/bioapi to /var/lib/bioapi"
-		dodir /var/lib
-		mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi
-	fi
-}
-
-pkg_postinst() {
-	einfo "Some generic-named programs have been renamed:"
-	einfo "  Sample -> BioAPISample"
-
-	if [[ ${ROOT} == "/" ]] ; then
-		pkg_config
-	else
-		ewarn "You will need to run 'emerge --config bioapi' before"
-		ewarn " you can use bioapi properly."
-	fi
-
-	# XXX: this can't be correct ...
-	enewgroup bioapi
-	chgrp bioapi "${ROOT}"/var/lib/bioapi -R
-	chmod g+w,o= "${ROOT}"/var/lib/bioapi -R
-	einfo "Note: users using bioapi must be in group bioapi."
-}
-
-pkg_prerm() {
-	mod_install -fu libbioapi100.so
-	mod_install -fu libbioapi_dummy100.so
-	mod_install -fu libpwbsp.so
-}
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch b/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
deleted file mode 100644
index 9d679fe8c892..000000000000
--- a/sys-auth/bioapi/files/bioapi-1.2.3-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://code.google.com/p/bioapi-linux/issues/detail?id=4
-
---- a/addins/pwbsp/Makefile.in
-+++ b/addins/pwbsp/Makefile.in
-@@ -87,7 +87,7 @@ CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
--CPPFLAGS = -I${top_srcdir}/include/ \
-+AM_CPPFLAGS = -I${top_srcdir}/include/ \
- 		-I${top_srcdir}/imports/cdsa/v2_0/inc/
- 
- CXX = @CXX@
-@@ -111,7 +111,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libpwbsp.ver
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
---- a/addins/qtpwbsp/Makefile.in
-+++ b/addins/qtpwbsp/Makefile.in
-@@ -96,7 +96,7 @@ CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
--CPPFLAGS = -I${top_srcdir}/include \
-+AM_CPPFLAGS = -I${top_srcdir}/include \
- 		-I${top_srcdir}/imports/cdsa/v2_0/inc \
- 		${QT_CXXFLAGS}
- 
-@@ -121,7 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
-+AM_LDFLAGS = -Wl,--version-script=${srcdir}/libqtpwbsp.ver \
- 		${QT_LIBS}
- 
- LEX = @LEX@
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch b/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
deleted file mode 100644
index e077c135d63f..000000000000
--- a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/236654
-
-make sure we return 0 when things work
-
-patch by kouyu
-
---- bioapi-linux/apps/NonGUI_Sample/main.c
-+++ bioapi-linux/apps/NonGUI_Sample/main.c
-@@ -234,6 +234,7 @@
-     }
-     
-     OutputToFile(userName, EnrolledTemplate);
-+    return 0;
-   }
- }
- 
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch b/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
deleted file mode 100644
index 1f81298066dc..000000000000
--- a/sys-auth/bioapi/files/bioapi-1.2.3-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bioapi-linux.orig/framework/mds_util_api/mds_app_util.c bioapi-linux/framework/mds_util_api/mds_app_util.c
---- bioapi-linux.orig/framework/mds_util_api/mds_app_util.c	2007-07-14 08:06:14.000000000 +0300
-+++ bioapi-linux/framework/mds_util_api/mds_app_util.c	2009-07-25 23:26:55.000000000 +0300
-@@ -28,7 +28,7 @@
-  	/* Linux-Port: added "const" keyword for Linux version */

- #if defined (UNIX)

-  	const BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

--#elif

-+#else

- 	BioAPI_UUID MDSUTIL_Uuid = ref_h_layer_uuid_init;

- #endif

- 

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 29229cbff5a4..0d178b65aead 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,7 +1,7 @@
 DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c
 DIST keystone-13.0.0.tar.gz 1462543 BLAKE2B f34da8cd1af58e8de589c0eb5f3f1f6519f4fcadc6152289c9d1196e6fc9fc3ac607af9686884d3a8072514ed8e6c275a2147c5a4d38c3a93660c1b499544539 SHA512 97e6eba83e47480e3f756f8a726012835c5fcb33534d8cc7eb31343a29e4c23ddf20be10adafb257850c8d846fbf2f674dc5f44a09fd901f95ef5b342c066097
 EBUILD keystone-12.0.0-r1.ebuild 6280 BLAKE2B ffb752f981b0e72674cd6dac474a9f475123994cc2eba0ea24eed4d01acccdba9f9ec009c38a42e8e4084e0e6a95e03d794ef4b6be0328e3c87e8e0a17f4f5fa SHA512 32b5582c8e4bb24c3799b3716ac9cc62a254ed694e10e2c72ff275b69535639c442f66baa5eecd81fdca0d8007e1c4e2154eeaa00f07c3f169a7b698aec49230
-EBUILD keystone-13.0.0-r1.ebuild 6185 BLAKE2B 129b3c7c066f6d5232b487191f56bdcfac9133723bfbac50a1e9ee29c235876901216610759ba72e8a978bc8b1464dacd31c126b2f52c5da2a4eea3fc7e62b59 SHA512 dd98d065f981ad6359c8933d5c57e7730742ebce52114e5f9ae5ab7a8477a069cc5e45b52df2930a090fa5ae9d59fb913c96730a054217e8053b3fda49fcbb6b
+EBUILD keystone-13.0.0-r1.ebuild 6183 BLAKE2B 86e415e11da1e1cf0ffaf048a6cd64292080660db66fb4341127f160da000bf00babf7963bd5a1d0865a9e36b06a188325c84fcd3dedaf50a877b481be450065 SHA512 28cb4801e475754b610c5b8c41ad3e84c4f96d351a15deddc79a0b42be88374c7bc2c98e8bee39ee1d33b8d144333c0ad1133168fc29f7a33ee5fd7ad4edd0f1
 EBUILD keystone-2017.2.9999.ebuild 6296 BLAKE2B 6f5da1373e1880a9b36f6b0c57130e7643ebff3b8478bc719be3e70070e0c837475f9957486a482f5c3cf49fc9e6490e999937c65a4cb42a533b531d37ac9aa2 SHA512 d5ad51ab2244e2a83f1ef32bad8491e74705f3f73f7371b781e410cd5c463013e3563e45c00aa50a926dd1d4b6f37b161bf6c81baed02c14bab86761d6a50de2
 EBUILD keystone-2018.1.9999.ebuild 6185 BLAKE2B 129b3c7c066f6d5232b487191f56bdcfac9133723bfbac50a1e9ee29c235876901216610759ba72e8a978bc8b1464dacd31c126b2f52c5da2a4eea3fc7e62b59 SHA512 dd98d065f981ad6359c8933d5c57e7730742ebce52114e5f9ae5ab7a8477a069cc5e45b52df2930a090fa5ae9d59fb913c96730a054217e8053b3fda49fcbb6b
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-13.0.0-r1.ebuild b/sys-auth/keystone/keystone-13.0.0-r1.ebuild
index a2157ff67e8c..54cb0b720d2f 100644
--- a/sys-auth/keystone/keystone-13.0.0-r1.ebuild
+++ b/sys-auth/keystone/keystone-13.0.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/queens"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"