gentoo resync : 02.08.2019

3 files changed, 2 insertions, 185 deletions

diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 48e2dcec244a..e07d9151d7e7 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,7 +1,5 @@
 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.10.tar.bz2 1811929 BLAKE2B 9249b6e32ae8a5c3cefd461e182fa4972c3b65c19cc8f25f3eeaa00b8f2694ee2e03d1adf702e59a7a8da5d3f53d047c18f99a13bbfbc6d4b29b888ee20f1906 SHA512 dd1f49307b5298a784e2b487c0da94459632bab8353cf505cd4b104f4c0b55bbb77caf73e8b4c60af64018b345df78337accac3b5ed6cb5620309b163a86d32b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
-EBUILD netatalk-3.1.10.ebuild 4950 BLAKE2B 387dd5808d580383d81517a8c545fbf55530c0bd32af877c28676a4e4706c68d2609065e60d26d8caeb884dd1c33ed8e8f8b310f504b058cb04a340f93fceadd SHA512 4f77adf21784cee9ff166f54ac5408abd89ab11f832c170d9341693c7efbab575c62af71be3a023b024c4330a4a74326364e65cb8bd38d039d88bde5d3f53ad4
-EBUILD netatalk-3.1.12.ebuild 4870 BLAKE2B 8991b5b0f0962b3a5e1dbd3bad12dfca7b7e9fa0a6e811233dde49f0e7c9a6347e47759b4dadb5855fd5be96122bdb1722ae4e7ec28633cd1d8ff687db43c9e7 SHA512 4e6f43789e0fafdd38645adfbdcf417a9c7b67c12410a2e59e0938644c3ee4abee1d1897922c3301f3e05f2801a411df83fae29bb10ba2a1a647dc8bd1829bc6
+EBUILD netatalk-3.1.12.ebuild 4869 BLAKE2B 6f787cae746839a67b7200993572fa4ca6d2ebbbebecd18a35b6d6e429c1e64490cc82d3d27d7d61ff3992ccb1319a1fe013b2a34220bec37b1674f61a71b207 SHA512 85b7c00db2370a7610bdfe102962fbba3d39f3873192313a03fc17b2339616f24053a5b88fc85819983392e26a988dde36746b62f84fc28d96d2abd3a26701ac
 MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/netatalk-3.1.10.ebuild b/net-fs/netatalk/netatalk-3.1.10.ebuild
deleted file mode 100644
index 60690c4d7c87..000000000000
--- a/net-fs/netatalk/netatalk-3.1.10.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eapi7-ver flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/17.0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="acl cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent:0=
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52:=
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	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}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	tracker? ( dbus )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
-	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
-)
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_enable zeroconf)
-		$(use_with acl acls)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
-		$(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0)
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo-openrc
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use zeroconf; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3 ${v}; then
-			for fle in afp_signature.conf afp_voluuid.conf; do
-				if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-					if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-						mv \
-							"${ROOT}"etc/netatalk/${fle} \
-							"${ROOT}"var/lib/netatalk/
-					fi
-				fi
-			done
-
-			echo ""
-			elog "Starting from version 3.0 only uses a single init script again"
-			elog "Please update your runlevels accordingly"
-			echo ""
-			elog "Dependencies should be resolved automatically depending on settings"
-			elog "but please report issues with this on https://bugs.gentoo.org/ if"
-			elog "you find any."
-			echo ""
-			elog "Following config files are obsolete now:"
-			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-			elog "in favour of"
-			elog "/etc/afp.conf"
-			echo ""
-			elog "Please convert your existing configs before you restart your daemon"
-			echo ""
-			elog "The new AppleDouble default backend is appledouble = ea"
-			elog "Existing entries will be updated on access, but can do an offline"
-			elog "conversion with"
-			elog "dbd -ruve /path/to/Volume"
-			echo ""
-			elog "For general notes on the upgrade, please visit"
-			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-			echo ""
-			break
-		fi
-	done
-}
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index 472a18240ee4..f5cb53b7a12d 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -15,7 +15,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 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
 
 CDEPEND="