[gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/

["Justin Lecher" <jlec@gentoo.org>]

commit:     67c8fba9a98da19f01e21f6c322d95097bd5aeb7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 20:52:49 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 20:52:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c8fba9

net-fs/netatalk: Properly use REPLACING_VERSIONS

Drop old

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=589486

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 net-fs/netatalk/netatalk-3.1.10.ebuild   |  73 +++++++------
 net-fs/netatalk/netatalk-3.1.6.ebuild    |  75 ++++++-------
 net-fs/netatalk/netatalk-3.1.7-r1.ebuild |  75 ++++++-------
 net-fs/netatalk/netatalk-3.1.7.ebuild    | 179 -------------------------------
 net-fs/netatalk/netatalk-3.1.8.ebuild    |  73 +++++++------
 5 files changed, 154 insertions(+), 321 deletions(-)

diff --git a/net-fs/netatalk/netatalk-3.1.10.ebuild b/net-fs/netatalk/netatalk-3.1.10.ebuild
index 9f889a2..245c2f9 100644
--- a/net-fs/netatalk/netatalk-3.1.10.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.10.ebuild
@@ -140,40 +140,43 @@ src_install() {
 }
 
 pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 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
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
+	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
-			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 ""
-	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.6.ebuild b/net-fs/netatalk/netatalk-3.1.6.ebuild
index a7c545f..db179d8 100644
--- a/net-fs/netatalk/netatalk-3.1.6.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -140,40 +140,43 @@ src_install() {
 }
 
 pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 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
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
+	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
-			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 ""
-	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.7-r1.ebuild b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
index 0858ecf..a9a7d72 100644
--- a/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -141,40 +141,43 @@ src_install() {
 }
 
 pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 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
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
+	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
-			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 ""
-	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.7.ebuild b/net-fs/netatalk/netatalk-3.1.7.ebuild
deleted file mode 100644
index 1aa216e..00000000
--- a/net-fs/netatalk/netatalk-3.1.7.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-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
-	)
-	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
-	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} )
-	"
-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}"/${P}-gentoo.patch )
-
-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
-
-	if use acl; then
-		myeconfargs+=( --with-acls $(use_with ldap) )
-	else
-		myeconfargs+=( --without-acls --without-ldap )
-	fi
-
-	# 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+=(
-		--disable-silent-rules
-		$(use_enable avahi zeroconf)
-		$(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_with cracklib)
-		$(use_with dbus afpstats)
-		$(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 avahi; 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
-	if [[ ${REPLACING_VERSIONS} < 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
-					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 ""
-	fi
-}

diff --git a/net-fs/netatalk/netatalk-3.1.8.ebuild b/net-fs/netatalk/netatalk-3.1.8.ebuild
index fc297d9..d103dc1 100644
--- a/net-fs/netatalk/netatalk-3.1.8.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.8.ebuild
@@ -138,40 +138,43 @@ src_install() {
 }
 
 pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 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
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
+	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
-			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 ""
-	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
 }