gentoo resync : 25.11.2020

4 files changed, 12 insertions, 71 deletions

diff --git a/net-nds/smbldap-tools/Manifest b/net-nds/smbldap-tools/Manifest
index ce63e0faa160..d3f4422b5f09 100644
--- a/net-nds/smbldap-tools/Manifest
+++ b/net-nds/smbldap-tools/Manifest
@@ -1,6 +1,4 @@
 AUX smbldap-tools-0.9.10-smbldap-config-pod.patch 974 BLAKE2B b8ab4c2a910dfa8794b2f7366da54f7398822c9e65a2e18bc2ec157140d16fabb12a757f1529ba5a2e71c4b4b41902ad3bdd5789fff18eeda1df3fac3f525c03 SHA512 c4801c4b411c95c9c6495809b045c9c1bc641f8fc4b3797f34b44d9bec67428bb0ab86a07414c935f1b882fb27091e0a6286f1559dd9554a9451ada75f804eba
 DIST smbldap-tools-0.9.10.tar.gz 336840 BLAKE2B 8df7cf34d1fedb54ece3f5c018b7bf03a1b0f0ca8813980eaa21d338113fe30535d7627c0d61b8d30c331e20ebb81449ae4a0ddcdfd4a93cb028f2c376a2ce76 SHA512 e1aef98d91ec722427b27f3aed25d8ef4cd4a6c845f98935e2f99075dea93275fc0335760d517398be8ca7898084bfee457ada0a718b66226e6ce3f38fdf2b2e
-DIST smbldap-tools-0.9.8.tar.gz 335484 BLAKE2B 8963a8b0d9130fb51d8746db850e34b6402631b1467d64e8547679dcdffb115d6e2c4576910f864f969a586bd00ee373fc834b02d592231e60c10562a75c5b2b SHA512 e78531559591022331d4d8f62017a0ce3434e0d6e5ae1e1b5ea86d486cd6aeae29a7721ae88c36b034f5907aa0eea29583f365b9f7602da73172074301628d91
-EBUILD smbldap-tools-0.9.10-r1.ebuild 1603 BLAKE2B 375b5d147fece11fdefe9637020847eca3d0a61659cec73b626647561364fa00990643e645bf4b653577619d976abc1e9cf1296ffe9c37d363a0de2ab4f0fc66 SHA512 fef03bb53139eecb86b7769c3b1a225714690c4e38e71c5a5a1d83a31ef45cd74155a2895f1edb482fbc98abb0148ebc86ae35dc3b276f9bdfaa40a2c2f5427a
-EBUILD smbldap-tools-0.9.8.ebuild 1522 BLAKE2B 6e3ba6b775d070ef5933eb9e604a11f704198055725af52d71d3eacfffec035536b761d8f5bf0a3ec1b051a81880d39b41cb2095fa4b8520db5c3ec3889104f7 SHA512 a27c2671118bcaf221779262afbb75f395bcf458e7f341ac9ad5f95c7cf65a1a62ae14ead0f53b01fdd6f959a929d389b4440e3f2f05e8084fa05a62809f3e17
-MISC metadata.xml 234 BLAKE2B 6b406d8363d7982ccf4c836f444d6beb1daade6a4395c707e627a54113eef0f70c4fdd2d96f00ed8e58f8f7936ef5247f16b2ee02a99100f404dccaab358cca0 SHA512 31c30a4b01e860c3bcf28264630d9fb75feb1caa584c6877bc3e6b3d6a52aa2d986d0ffcf4214664dd887b51c5319d7163a7ed6734cfbc8f184b53bf92fd852d
+EBUILD smbldap-tools-0.9.10-r1.ebuild 1556 BLAKE2B d4eea2d2d2b620d7e1fa37c7b7bcb094b477caa6468cf50f0aa53ac1b6f183107d20e51dc422d5cf5e12e46778bd5875e62c009009ade8fabe3257f8935b5756 SHA512 f30462ec769277a84a23733ee83be91312b5ac3be99f032d556484f743d9fc1b0ec072a61ef09b70c9fb10d089907c6ba97426ab6dab9c4b10292c9824e1a23b
+MISC metadata.xml 238 BLAKE2B d8df54241ec3e8c56cd49149dcf4a8eef0eefcd7eacce01bb0f1d5dcdc492b45d25f9388caf582e979dc9eb283ba88b8ab5ee28812072280566b797180eb649e SHA512 f8a66c9ca8ad8a98b25a6f0280652c9262ae5c23cc9cf813bd304722b80e404585689a9b618de7f3d57be64ec28e83d9aa8b84036dcdb2a91117f454b1ef7e93
diff --git a/net-nds/smbldap-tools/metadata.xml b/net-nds/smbldap-tools/metadata.xml
index 62c9222b8dd3..6a21123323aa 100644
--- a/net-nds/smbldap-tools/metadata.xml
+++ b/net-nds/smbldap-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>samba@gentoo.org</email>
-	<name>Samba</name>
-</maintainer>
+	<maintainer type="project">
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
index ef19e1e813cb..f71412f562c9 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Samba LDAP management tools"
 HOMEPAGE="https://gna.org/projects/smbldap-tools/"
 SRC_URI="http://download.gna.org/smbldap-tools/sources/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-perl/perl-ldap
@@ -20,13 +18,10 @@ RDEPEND="
 	dev-perl/Unicode-MapUTF8
 	dev-perl/IO-Socket-SSL
 	net-nds/openldap
-	net-fs/samba
-"
+	net-fs/samba"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-smbldap-config-pod.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-smbldap-config-pod.patch )
 
 src_install() {
 	default
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
deleted file mode 100644
index a3b33702178c..000000000000
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Samba LDAP management tools"
-HOMEPAGE="https://gna.org/projects/smbldap-tools/"
-SRC_URI="http://download.gna.org/smbldap-tools/sources/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/perl-ldap
-	dev-perl/Crypt-SmbHash
-	dev-perl/Digest-SHA1
-	dev-perl/Unicode-MapUTF8
-	dev-perl/IO-Socket-SSL
-	net-nds/openldap
-	net-fs/samba
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	newsbin smbldap-config.cmd smbldap-config
-	dosym smbldap-passwd /usr/sbin/smbldap-passwd.cmd
-
-	dodoc CONTRIBUTORS ChangeLog FILES INFRA INSTALL README TODO doc/*conf* doc/smbldap-tools*
-	dodoc -r doc/migration_scripts
-
-	sed -i 's/.CMD//g' smbldap-[gpu]*.8 || die
-	doman smbldap-[gpu]*.8
-
-	insinto /etc/smbldap-tools
-	doins smbldap.conf smbldap_bind.conf
-
-	elog "Remember to read INSTALL when updating."
-}
-
-pkg_postinst() {
-	elog "- A good howto is found on http://download.gna.org/smbldap-tools/docs/samba-ldap-howto/"
-	elog "  and http://download.gna.org/smbldap-tools/docs/smbldap-tools/"
-	elog "- The configure script is installed as smbldap-configure.pl. Please run it to configure the tools."
-	elog "- Examples configuration files for Samba and slapd have been copied to ${EPREFIX}/usr/share/doc/${PF},"
-	elog "  together with the migration-scripts."
-	elog "- Also remember to read INSTALL when updating."
-}