gentoo resync : 25.08.2020

3 files changed, 9 insertions, 22 deletions

diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 08bc20a534be..bc58d99a7fc2 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -3,5 +3,5 @@ AUX netatalk-3.1.12-my_bool.patch 664 BLAKE2B f3eb18c0f73eea3b2caba305e052ce1705
 AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
-EBUILD netatalk-3.1.12.ebuild 4995 BLAKE2B 81942411af4a7bc541ff5f9dcf42a7975c25d24b4a64da60c7f097d8d74992d13ea8f08b1f17acbafc84688ccd56dd66ba0b95e97da7cedfee3a55f2c183913f SHA512 e0f571f9d69ffe096bf087b25d1b8dd656141bb99eda782c0c2e5fb3b69ac7351fd9adf77c61920286969a65b87d549e5c9f8d078a20c2074e6b23f733cb1169
-MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
+EBUILD netatalk-3.1.12.ebuild 4706 BLAKE2B f7e36411c1cab4b932917bd06929812b2a0498a7df04d2c06d77aee337c5d7c984966f098d215833a152ff63a63602d78f77806953726b06935d586db55d1049 SHA512 34533bb8e53c528185d2ecdda48cfb70558181df58087e483f7e35de3fef1d7f67e0a4a546e4c263233bafc43f46d151204483f2d37f654d3f780d70c78a0214
+MISC metadata.xml 719 BLAKE2B ac30d6e93c6b92d7039f204b6d5f1b00542fc9aacabf4f2c39a12689cd4bb1e3f63192ad26b7d057e9019deeeaa2c6f7590a99f0c28eced4f80af8a9695eb767 SHA512 96d2e28f3ede3e470c9b9d5a40c9721c36892837533aa572251685ed9a7c0fb3d25a7205628d05791c77adcbab56ae095e8e6476f2a225bf796b44034176041e
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index 75b09776908d..2dcee0648635 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -7,7 +7,6 @@
 		<flag name="quota">Add support for user quota on various filesystems</flag>
 		<flag name="shadow">Add shadow support</flag>
 		<flag name="tracker">Add support for spotlight like tracker</flag>
-		<flag name="utils">Install afpstats script</flag>
 		<flag name="ssl">
 			Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
 			Modules. These are not used with most recent versions of OS X
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index c56257545e19..010c1ff320ba 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools flag-o-matic multilib pam python-r1 systemd
+inherit autotools flag-o-matic multilib pam systemd
 
 DESCRIPTION="Open Source AFP server"
 HOMEPAGE="http://netatalk.sourceforge.net/"
@@ -16,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0/18.0"
 KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd +utils zeroconf"
+IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf"
 
 CDEPEND="
 	!app-editors/yudit
@@ -37,14 +35,9 @@ CDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
 	zeroconf? ( net-dns/avahi[dbus] )
 "
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
+RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 	virtual/yacc
 	sys-devel/flex"
@@ -53,8 +46,7 @@ RESTRICT="test"
 
 REQUIRED_USE="
 	ldap? ( acl )
-	tracker? ( dbus )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
+	tracker? ( dbus )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
@@ -67,11 +59,9 @@ src_prepare() {
 	default
 	append-flags -fno-strict-aliasing
 
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
+	sed \
+		-e "s:shell_utils::g" \
+		-i contrib/Makefile.am || die
 	eautoreconf
 }
 
@@ -138,8 +128,6 @@ src_install() {
 		> "${T}"/service.systemd || die
 	systemd_newunit "${T}"/service.systemd ${PN}.service
 
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }