gentoo Easter resync : 12.04.2020

5 files changed, 16 insertions, 61 deletions

diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index 6f00d2e1f7af..dafc3bcbfc50 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,8 +1,5 @@
-DIST uid_wrapper-1.2.1-alpha_fix.patch 932 BLAKE2B 14cb3215472037b528a20da8d72cba68e2913c113fa827b0e66631838daf68524588430499e01214f72847c8ab0350833cf02a33bd03ae42f5f95d398b793780 SHA512 0daaadf84a48f5e450fac833e5b0e76860b82706a343224d10a8ff24d0607d9d81f628f09619aaae8ea918ac48a8c621e457863f9d52b46a1950493869468854
-DIST uid_wrapper-1.2.1.tar.gz 311002 BLAKE2B 30430c21df36095d8c71a7fcdef3cd71585d7c152acbab2c58c6876de5d4b6c0a7053c4d404c4d949c565b18218097023d87631573355e2e6b555dbc0322acd3 SHA512 563577bf3f4ca2989040635301faccc198da34a30b6998370d376f8df8c689953d2f10474efc926cb06d23e565cee32b4f59fce87546c3620d55cd9f7e0cf543
-DIST uid_wrapper-1.2.4.tar.gz 311811 BLAKE2B d7c309e020cfb2a1024fa74fc71cb598827ed55547613d7e0a7e60b13ca1c1cf9c2b44e6fc5f6f5c62d0df2f8b0090c62a94f5724cc997d324abd8d32c74fdaf SHA512 212b35f7d0655611c5bb7927e4e29049ce79a4e677805fa7154142dff559ddc6dd7117a4c94314b69e27c954ff03ef49470ed69e2405cf46b5958643c6021d3b
 DIST uid_wrapper-1.2.7.tar.gz 47580 BLAKE2B f33a2a29a3e61315ae48317b759898cabcfcc50f72a7fac9388b2b5791a76f66e88a6339ca45c319df102354d592d6a26c8046193b7c4d07c4e4ce3f4031672e SHA512 ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
-EBUILD uid_wrapper-1.2.1.ebuild 1132 BLAKE2B 9b46ebfa67335ac97cb631fab3c8adba64af1f1c7ae082c6bbee19f086a56dae807311b69b3f5a151e9a05a76e98c68b37ba68ece9b6d0a8a609c402034139a9 SHA512 73fa532162e4a9bedd64aaaf1ba12772d915d35d066a8170759504087e536f3c4e97bcc18cde49f6fdb4ea45f96aed2a515494c61334db0d14937ae486307238
-EBUILD uid_wrapper-1.2.4.ebuild 507 BLAKE2B 5177ac0edd8a4095f36a68045fc4ed54e84a508051efc18bfe9b0ba03702e2a3d0e70b5b005cd3a406cbfdaeda91146e7c5ea26e883dee9c0412eae3a33dc2c7 SHA512 818cc73b380bb0bcec3ab982e67fbfa669c36e16724e0a37c885dcc6df32fb35179bfc249dcda729d5d5d6736825a6481057460e348bd091097ac7df4851a277
-EBUILD uid_wrapper-1.2.7.ebuild 507 BLAKE2B c7985fa908ddb0b0aae3740b8a6ae26070814e29913a21620c7c82ed29eea6368c490796a5610b0d8b4aee598f1bc8754b9a208ba998ef0428ae02f75834c3b5 SHA512 71286c0dda30951876b0fb3fbb0400c0d6006a3c7535b8a3b1e9e413ff1854971182bb8345b7e5ac29978efd85a8eb18a0309e74ebcf50708277d4a7fedfd9b6
-MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
+DIST uid_wrapper-1.2.8.tar.gz 47864 BLAKE2B d165954b4418ee23c7564d809a3c2189fc43c91822c8e4a73bdf6ea8e1621156bf0a29097b07a4d8b31ea1d10af35c3be367c4ca8f1e13db1b430f297b47b6ea SHA512 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
+EBUILD uid_wrapper-1.2.7.ebuild 449 BLAKE2B 41406db439ab20647babc70fe1b6ab505e6515c3a216526fc60f089f2553cae41f2c72fe9d5ab121cbb07a06c3f9ff1398d47e9eeed9eadb50e3abef6223c62f SHA512 e6c4251c25382b837d7c5cd2c6a0e4bbbbbe436cfa1dde593507b4f64644aec581a517a6c7e5dc82e3db3c4d517c25a2f6c4472933883bbca650537b2b1b4429
+EBUILD uid_wrapper-1.2.8.ebuild 455 BLAKE2B 63f95c7fab8ef50d23a9de01778bf03f1b1f3b4692e7656333cebf65f8d81ffc18e4e6450ff96e5a10a6da9ded1dfa88647e65bde54a333ca420b92b90c51d91 SHA512 362aa0ee1442b09bdc4c81403acb19d50c4f8053d63bed1d7a00e7ff4396c950330271f1d11c9807cb6a4b4448930d89e1ddc97ce9bc038d37fb3fa0c96bb595
+MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/uid_wrapper/metadata.xml b/sys-libs/uid_wrapper/metadata.xml
index f05d1f266834..48f6ca46f45a 100644
--- a/sys-libs/uid_wrapper/metadata.xml
+++ b/sys-libs/uid_wrapper/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>samba@gentoo.org</email>
-    <name>Samba</name>
+    <name>Samba Team</name>
   </maintainer>
 </pkgmetadata>
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
deleted file mode 100644
index fa04f8ba2f29..000000000000
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A wrapper to fake privilege separation"
-HOMEPAGE="https://cwrap.org/uid_wrapper.html"
-SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# https://bugs.gentoo.org/578668
-SRC_URI+=" https://git.samba.org/?p=uid_wrapper.git;a=blobdiff_plain;f=src/uid_wrapper.c;h=ded857a1b18f4744bac324b0ccaee3b2d2d146fa;hp=34889e0c3f955ad04bda3859b734a86763dee529;hb=cf2b35344d4de927f158a1e6d5b6bbc1be2ffd96;hpb=a00a6b8b300b7baa867191e2bc016b835cf8d1b3 -> ${PN}-1.2.1-alpha_fix.patch"
-PATCHES=(
-	"${DISTDIR}/${P}-alpha_fix.patch"
-)
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
-}
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
index cfc62eddb7f6..885c1589ba76 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper to fake privilege separation"
+DESCRIPTION="Wrapper to fake privilege separation"
 HOMEPAGE="https://cwrap.org/uid_wrapper.html"
 SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
index 1fe72649c615..ad2fbf4c53aa 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.4.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper to fake privilege separation"
+DESCRIPTION="Wrapper to fake privilege separation"
 HOMEPAGE="https://cwrap.org/uid_wrapper.html"
 SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"