Remove old 1.6.4 and 2.0.3 versions, fix setXid handling, it's bindnow-flags not bindnow_flags.

(Portage version: 2.1_pre3)

7 files changed, 9 insertions, 155 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 31ff41710ceb..40b5465c3938 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.41 2005/12/31 19:43:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.42 2005/12/31 21:49:19 flameeyes Exp $
+
+  31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/netatalk-1.6.4-tempfile.patch, -netatalk-1.6.4-r1.ebuild,
+  -netatalk-2.0.3.ebuild, netatalk-2.0.3-r2.ebuild:
+  Remove old 1.6.4 and 2.0.3 versions, fix setXid handling, it's bindnow-flags
+  not bindnow_flags.
 
   31 Dec 2005; Simon Stelling <blubb@gentoo.org> netatalk-2.0.3-r2.ebuild:
   stable on amd64
diff --git a/net-fs/netatalk/files/digest-netatalk-1.6.4-r1 b/net-fs/netatalk/files/digest-netatalk-1.6.4-r1
deleted file mode 100644
index 91e4be88fadd..000000000000
--- a/net-fs/netatalk/files/digest-netatalk-1.6.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08a00467e9348457e5df18c0a16ecb02 netatalk-1.6.4.tar.gz 1026256
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3 b/net-fs/netatalk/files/digest-netatalk-2.0.3
deleted file mode 100644
index 1f207b35e1d9..000000000000
--- a/net-fs/netatalk/files/digest-netatalk-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/files/netatalk-1.6.4-tempfile.patch b/net-fs/netatalk/files/netatalk-1.6.4-tempfile.patch
deleted file mode 100644
index c92fc15e53cd..000000000000
--- a/net-fs/netatalk/files/netatalk-1.6.4-tempfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur netatalk-1.6.4.orig/etc/psf/etc2ps.sh netatalk-1.6.4/etc/psf/etc2ps.sh
---- netatalk-1.6.4.orig/etc/psf/etc2ps.sh	2000-07-25 23:09:01.000000000 +0200
-+++ netatalk-1.6.4/etc/psf/etc2ps.sh	2004-09-13 13:21:06.000000000 +0200
-@@ -26,9 +26,10 @@
- #
- df*)
-     if [ -x "$DVIPS" ]; then
--	cat > /tmp/psfilter.$$
--	$DVIPS $DVIPSARGS < /tmp/psfilter.$$
--	rm -f /tmp/psfilter.$$
-+	TEMPFILE=`mktemp -t psfilter.XXXXXX` || exit 1
-+	cat > $TEMPFILE
-+	$DVIPS $DVIPSARGS < $TEMPFILE
-+	rm -f $TEMPFILE
-     else
- 	echo "$0: filter dvips uninstalled" 1>&2
- 	exit 2
diff --git a/net-fs/netatalk/netatalk-1.6.4-r1.ebuild b/net-fs/netatalk/netatalk-1.6.4-r1.ebuild
deleted file mode 100644
index a97ba16c2a3b..000000000000
--- a/net-fs/netatalk/netatalk-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.4-r1.ebuild,v 1.7 2005/10/04 11:35:19 matsuu Exp $
-
-inherit eutils
-IUSE="ssl pam tcpd"
-
-DESCRIPTION="kernel level implementation of the AppleTalk Protocol Suite"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://netatalk.sourceforge.net"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="ppc ppc64 sh sparc x86"
-
-DEPEND="sys-apps/shadow
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.6.4-tempfile.patch
-}
-
-src_compile() {
-	use pam  && myconf="${myconf} --with-pam"
-	use tcpd && myconf="${myconf} --with-tcp-wrappers"
-	use ssl  && myconf="${myconf} --disable-ssl"
-
-	econf \
-		--enable-fhs \
-		--with-shadow \
-		--with-bdb=/usr \
-		${myconf} || die "netatalk configure failed"
-
-	emake || die "netatalk emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "netatalk make install failed"
-
-	# install docs
-	dodoc CHANGES CONTRIBUTORS COPYING COPYRIGHT ChangeLog
-	dodoc NEWS README TODO VERSION
-	dodoc doc/*
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/atalknew-rc6 atalk
-}
diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
index 1f403e0f6dcd..1dc63a1f3849 100644
--- a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
+++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.7 2005/12/31 19:43:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.8 2005/12/31 21:49:19 flameeyes Exp $
 
 inherit eutils pam flag-o-matic autotools
 IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
@@ -64,7 +64,7 @@ src_compile() {
 		--with-bdb=/usr \
 		${myconf} || die "netatalk configure failed"
 
-	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow_flags):" bin/afppasswd/Makefile
+	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow-flags):" bin/afppasswd/Makefile
 
 	emake || die "netatalk emake failed"
 
diff --git a/net-fs/netatalk/netatalk-2.0.3.ebuild b/net-fs/netatalk/netatalk-2.0.3.ebuild
deleted file mode 100644
index 3e7caa44e00c..000000000000
--- a/net-fs/netatalk/netatalk-2.0.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3.ebuild,v 1.10 2005/11/21 13:56:49 matsuu Exp $
-
-inherit eutils pam flag-o-matic
-IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://netatalk.sourceforge.net"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 sh ~sparc ~x86"
-
-DEPEND=">=sys-libs/db-4.2.52
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	cups? ( net-print/cups )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# until someone that understands their config script build
-	# system gets a patch pushed upstream to make
-	# --enable-srvloc passed to configure also add slpd to the
-	# use line on the initscript, we'll need to do it this way
-	if use slp; then
-		myconf="${myconf} --enable-srvloc"
-		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
-			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
-	fi
-
-	# This is a fix to add -z,now to the linkflags for libraries
-	sed -i -e 's/^\([[:space:]]\+\)\(-D_PATH_AFP.*\)/\1-Wl,-z,now \2/' ${S}/bin/afppasswd/Makefile.in
-}
-
-src_compile() {
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having to
-	# sed the Makefiles to not do rc-update.
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		$(use_enable krb4 krb4-uam) \
-		$(use_enable slp srvloc) \
-		$(use_with cracklib) \
-		$(use_with elibc_glibc shadow) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr \
-		${myconf} || die "netatalk configure failed"
-
-	emake || die "netatalk emake failed"
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	cd ${S}/distrib/initscripts
-	emake rc.atalk.gentoo
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "netatalk make install failed"
-
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd ${S}/distrib/initscripts/rc.atalk.gentoo atalk
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf ${D}/etc/pam.d
-	pamd_mimic_system netatalk auth account password session
-}