Fix LICENSE, see COPYING file, bug 451570. Remove old.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

5 files changed, 13 insertions, 86 deletions

diff --git a/net-misc/ipx-utils/ChangeLog b/net-misc/ipx-utils/ChangeLog
index 806e9f987117..3d6ab20be021 100644
--- a/net-misc/ipx-utils/ChangeLog
+++ b/net-misc/ipx-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ipx-utils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.21 2012/07/29 17:19:50 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.22 2013/02/05 18:17:09 ulm Exp $
+
+  05 Feb 2013; Ulrich Müller <ulm@gentoo.org> -ipx-utils-1.1-r2.ebuild,
+  ipx-utils-1.1-r3.ebuild, -files/ipx.init-r1, files/ipx.init:
+  Fix LICENSE, see COPYING file, bug 451570. Remove old.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> ipx-utils-1.1-r2.ebuild,
   ipx-utils-1.1-r3.ebuild:
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
index 09114c1cda1f..47dcb46940cc 100644
--- a/net-misc/ipx-utils/files/ipx.init
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.4 2004/07/15 00:00:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.5 2013/02/05 18:17:09 ulm Exp $
 
 #NB: Config is in /etc/conf.d/ipx
 
@@ -34,6 +34,7 @@ stop() {
 	local retval=0
 	
 	ebegin "Bringing IPX down"
+	/bin/umount -v -a -tncpfs
 	/sbin/ipx_configure --auto_primary=off --auto_interface=off
 	retval=$?
 	/sbin/ipx_interface delall
diff --git a/net-misc/ipx-utils/files/ipx.init-r1 b/net-misc/ipx-utils/files/ipx.init-r1
deleted file mode 100644
index 7285b4bfd04c..000000000000
--- a/net-misc/ipx-utils/files/ipx.init-r1
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init-r1,v 1.1 2012/02/11 14:32:31 pacho Exp $
-
-#NB: Config is in /etc/conf.d/ipx
-
-depend() {
-	use net
-}
-
-start() {
-	local retval=0
-	
-	ebegin "Bringing IPX up"
-	if [ ${IPX_INTERNAL_NET} = "yes" ]
-	then
-		/sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
-		retval=$?
-	else
-		/sbin/ipx_interface add -p ${IPX_DEVICE} \
-			${IPX_FRAME} ${IPX_NETNUM}
-		retval=$?
-	fi
-	
-	ipx_configure \
-		--auto_primary=${IPX_AUTO_PRIMARY} \
-		--auto_interface=${IPX_AUTO_INTERFACE}
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to bring IPX up"
-}
-
-stop() {
-	local retval=0
-	
-	ebegin "Bringing IPX down"
-	/bin/umount -v -a -tncpfs
-	/sbin/ipx_configure --auto_primary=off --auto_interface=off
-	retval=$?
-	/sbin/ipx_interface delall
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to down IPX"
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
deleted file mode 100644
index 85958121d6a7..000000000000
--- a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.6 2012/07/29 17:19:50 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="The IPX Utilities"
-HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
-
-LICENSE="Caldera GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${P/-utils}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-proc.patch #67642
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	dodoc "${S}"/README
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild
index 3237902b878a..4d14af4a019f 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild,v 1.6 2012/07/29 17:19:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r3.ebuild,v 1.7 2013/02/05 18:17:09 ulm Exp $
 
 EAPI="4"
 inherit eutils
@@ -9,7 +9,7 @@ DESCRIPTION="The IPX Utilities"
 HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
 
-LICENSE="Caldera GPL-2"
+LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE=""
@@ -30,5 +30,5 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init-r1 ipx
+	newinitd "${FILESDIR}"/ipx.init ipx
 }