gentoo resync : 12.01.2019

3 files changed, 17 insertions, 197 deletions

diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index d2c81174d459..79d7a3ff43ca 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,9 +1,7 @@
 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.11.tar.bz2 1812227 BLAKE2B a416d8fe96df6869ac63b0d41ede37e21f7a49528f12719a74497813749b5cf523c2f3cba5a5034cb2a978c2c83ea1d516a24b71f28fa584bc5c9261f129274c SHA512 330e584f34b5f5e8714b3eca8e11adb93134cc0afa73e9bc25ddadcf3e9a96779a2979dfc08a64d343b148bc2d4e0e0f25b08d9c46d6b68057611d04ecfd06ea
-DIST netatalk-3.1.8.tar.bz2 1802404 BLAKE2B 101285dc9c031b95a6e353a215ba119e6e25a7c3741e4ce40d86c21479fe33c2b268923d5ff060b97f3c35cb10c99d94c4da2fa4a089c8dfcef08a28044ed186 SHA512 734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d
+DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
 EBUILD netatalk-3.1.10.ebuild 4963 BLAKE2B 3e7636fad9f27c80543c9faf8ff1837160fbdc8b3a27cca6c1caf2f97ef99034dc3fc952b9227b41b951bff1794aef0d6fa87c1fc4024cc9796d35437ee83c2f SHA512 9984c07268251cfb30d6e43138f7cd5b6b1e8cb2e265e519e3af9392b55dd33acf5731e2114f96d6f214da7c3be01d986096cfa28c95b226076f1475e0163098
-EBUILD netatalk-3.1.11.ebuild 4966 BLAKE2B 97915653146ce829cf72ff86cc73734f3d4a87393868696105c017e4892e932ca93f550dce875dd3925be346ffc2e537da72f726b0a7aa2025b1a1c491099ec1 SHA512 fc71d343e461e36242c80456aad94fe205465bf8b332620ff83f337fc49d233949648fe5f1d574cd3c3d85eb17b4c7bca8f5e799d71b1aa13fdcddbcadf8099f
-EBUILD netatalk-3.1.8.ebuild 4867 BLAKE2B 64cd1d25d51d2caa987275f24bc99a1d3cdde24a8bbfdee61527350b92d749f8203eb5b3e67f268c4f7ce7c9b5a64d71d884a760afb8373e548ca549b356d6c1 SHA512 086e53f7ddfc438e0b173e7f6e208a2245d224e44a70fde07fca5294f299c18fc04a75986fa02b9e5759c5319886514d319fb91ee5ec94209a29663dc02e7a63
+EBUILD netatalk-3.1.12.ebuild 4872 BLAKE2B dabced8b6522a54a02580a0a1cf8569c0a1817222831f197e096198ea8fc516fdcd6bc610bd4d43584d9643aaa1b636a0ada430394b4f01d142fd363127c3a7c SHA512 71d236944f5a772cc98e54252602b4d4a70502bf79b0e0ecd44bffd3783d4a606920b16fb0675a6f914b2b291c1b6d5099478b37e0ea4df3340360074c282c08
 MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/netatalk-3.1.11.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index 761f1c4f0041..026d6442f0e8 100644
--- a/net-fs/netatalk/netatalk-3.1.11.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
 AUTOTOOLS_AUTORECONF=yes
 
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
+inherit autotools flag-o-matic multilib pam python-r1 systemd
 
 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"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 
 LICENSE="GPL-2 BSD"
-SLOT="0/17.0"
+SLOT="0/18.0"
 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"
 
@@ -34,7 +34,7 @@ CDEPEND="
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tracker? ( app-misc/tracker )
 	utils? ( ${PYTHON_DEPS} )
@@ -62,19 +62,20 @@ PATCHES=(
 )
 
 src_prepare() {
+	default
+	append-flags -fno-strict-aliasing
+
 	if ! use utils; then
 		sed \
 			-e "s:shell_utils::g" \
 			-i contrib/Makefile.am || die
 	fi
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 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:
@@ -98,7 +99,7 @@ src_configure() {
 		$(use_with ssl ssl-dir)
 		$(use_with tracker)
 		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
+		$(use_with tracker tracker-pkgconfig-version $(ver_cut 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
 		--enable-overwrite
 		--disable-krb4-uam
 		--disable-afs
@@ -111,12 +112,12 @@ src_configure() {
 		--without-libevent
 		--without-tdb
 		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
+	)
+	econf ${myeconfargs[@]}
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	if use zeroconf; then
 		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
@@ -141,7 +142,7 @@ src_install() {
 pkg_postinst() {
 	local fle v
 	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3 ${v}; then
+		if [[ $(ver_test ${v} -lt 3) ]]; 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
diff --git a/net-fs/netatalk/netatalk-3.1.8.ebuild b/net-fs/netatalk/netatalk-3.1.8.ebuild
deleted file mode 100644
index 30f0a1ece1d3..000000000000
--- a/net-fs/netatalk/netatalk-3.1.8.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils 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
-	>=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 )
-	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 tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--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
-		--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
-}