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

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

6 files changed, 32 insertions, 97 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/Manifest b/net-misc/ipx-utils/Manifest
index 7c2965974eea..a5e6415b968c 100644
--- a/net-misc/ipx-utils/Manifest
+++ b/net-misc/ipx-utils/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ipx-utils-1.1-makefile.patch 795 SHA256 6ed677088c01aa21405e9b16571a2b0db2c62be0618d2d16370e9b75ce794321 SHA512 fb5f8d35eb00c762140309031f508ed6fb2591eaf9c3c841565464f1d472f93bcd2404fdb3e85e10e4c4e1652767f9ca9bdbc44c80731ce4ff3939c81f96fd1d WHIRLPOOL 2bf565c55d55d246a9801c97caf59674d0b6a24b73bdc815bff47092e1d58a76b4212cd3333e430c425e89ebe3fc13a5e218c48e19bd758ecfd94c845acc5103
 AUX ipx-utils-1.1-proc.patch 426 SHA256 23847e45eebff117c4320448880c90022ad5e4c9d33935aa1e2a5ebf3654821d SHA512 0af00b0ac0e40a3de1788173609a49683ecb33ec6450c296dadfd1736f95f7ae7f94d8c5ef96091c68f6eede799b83fef19a913493acc86fd92d3f9dcf2dde6c WHIRLPOOL 7b0510c291cbde6baa3e13c47dba3b12f96bb5e12e0aa0db8b5617f130d452078ea5e9412fe3f6427a2f3c33d8a6ba227185a55b87c44b77795a80e3b8a6aa48
 AUX ipx.confd 663 SHA256 0d6ca68374d2017747d78295f2e08b0558b125f0b954065df112833129b2cfab SHA512 28107b4a5aba133be5fb1b0e0a574191548f15d7c179cedc670dda9eb0f9f953478fd459dc65309bc813cc19ccc651599f5cda084f8f1c722540df76388606f7 WHIRLPOOL ee261f8db901d73f4abd5ece6c55d0ebb7e4420cffe3d4cc62a5a24626815a22d68f2a78d582339ecb8da712cb3eadfab04f952a51cb80ad075c5f6d9cd31e7d
-AUX ipx.init 950 SHA256 c0d4c499a47d1e15ba62289b3a8626f44dc8070c8e80182381c7d9a0887234af SHA512 b607acdc3825164123281e2872473ce29c41698a547b055d08866cc503e411a185874b70ec51b690057dcee94b7e75c14b60ab08d893187e7370e2153b23da86 WHIRLPOOL e30cb25337cf75a2b3942a5c40d074f99f6b603b77e311c2be8de1d81ef043b9a3763bf99814ee3e94b56cc487f8205ee7e39df75b3d177de2b1ea5c0af61852
-AUX ipx.init-r1 977 SHA256 288c59dd400bb04e92ac008d5168e456beab3404bad840074957881c77c51c24 SHA512 d5e9d61503d7fbd75fd8431827891b0a5696b60b2cee79a76710723d4f8366ea07dd40a0cc8e02a64b39bec62bbf850de8c93d07aa85494c211445485f18f6b0 WHIRLPOOL a3248122341a9e5203957fa11e737125ddfa4746da33881526e5481cf14df996e00e20ab1dd086613ae6a475cadf84580adc8e2bc96b3477dbc4bae11cc155fc
-DIST ipx-1.1.tar.gz 8177 SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8
-EBUILD ipx-utils-1.1-r2.ebuild 912 SHA256 d6a02e0875856c36ef29ba87d3c307e4ea76f2c6d8f438267004f1f38b0527bd SHA512 ee0d17fb54d2547d793db33fcbabbb09980ba372ec8115e243f845454d71c26fbad7868ed105382a3a6c5c5eca1eee9fa8cd7183e606e21191a5b070e38b18d2 WHIRLPOOL d7e442bca983d44a6a43ccd41a4734d052b166d527da61345f90e58020fb5b7e7daa75f789edff6ee90bc84d63517b9d8667d39866c07e2a410fba8791ad4b8c
-EBUILD ipx-utils-1.1-r3.ebuild 881 SHA256 a963788cac2106c9b7ef252d3ab8510ada6113f6618d90b07bcbec42871e4120 SHA512 63dcf153ba8b0639f9156149a63ff1c314f50cd48764afe93ce78203a68bb2908fa743eb11ec09f6761c154f7d659b31abb398ed172657d348f3964b16d127d1 WHIRLPOOL c24a1394c007fd3b917545ea546c450f513a8d8a86fdce6a70c947b549f22d513122cb433032fec95a72cd04d15b91ef971c88b6d27e8c20dfaff3df395e4390
-MISC ChangeLog 2501 SHA256 b40654e4e25ca89e3ee8c3185453f6bbac81fd81f84436b0483644a8fcb023be SHA512 58d536413af97d888503809c8eb9fdcb5d54b1984756555651d877337dfec90d5a6595c3323795f748a281ee9a8b1f1f547f25538d8a46f9ffa2892e972f3ac0 WHIRLPOOL 513ee24eac4bb0fadd13b507c4ce1c2ace682cbe4838c9702eb50c3841167cdbae90bc44e3f9555e3da5cbe2f2f5107d4c54e2ee8975c9c202446a0c6d289e28
+AUX ipx.init 972 SHA256 831572da757862b724111c73ea38c1d96aabdb61ce2b819d8b46ff6666397e70 SHA512 22fe033b962e4ab76dd6d3b70b425fc4640471c36769c03d1caf7b87530642528753ce298fa11106f14e38d188ab085c5e3fd4ab090a764917fd22a2228fa9a0 WHIRLPOOL dcabdb554702a2f2cfa26acad32492757797bc94f0c567be1e0303c06a5b9b73bc5f88fcb2ba0466070f63a1575659dd4e76ba1b25edbd9144bc41fccf180abb
+DIST ipx-1.1.tar.gz 8177 SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8 SHA512 cb1bcf0c28939ab5ff1e1cf36f1cb8cbfcb7c019d65df5fc56a1b43673406cdf4abffa3d6164615e42ce955f078c05f721da90ca54353870e552c01bb3c2973d WHIRLPOOL 829715dd9e0b3d1cf7ee5443fe3081bf2534b4f5e85ea096f0cf722d94e068c53141a3504ac9dc51457747d4038e249bd187dced1d07cb867fd106575ae07d65
+EBUILD ipx-utils-1.1-r3.ebuild 905 SHA256 d045ce6762c2684bf6bb1a49526156ed7d671e9b64e2f8c63c7accda86eb4036 SHA512 3f037c8525e471b7f34651fee694fb777a27ca98e00caeaf00ea2b5df2cdc9485a0193ba9727d7d33fbfb6aff6f4b806db92fa19a3e9d5c251dfd042909da291 WHIRLPOOL 1d4c8a78f319e86a0549b3a84bfc95f5b84d537b5a704846f9660b4f73de349e0ed686d4ef681fe105692330a47418881230643fddb12d6e10bc46cb37f67c53
+MISC ChangeLog 2691 SHA256 15b380da92e1efef1725686080836916622e000800c2a5911fa8e44e9508c87f SHA512 cfc5db65f31df7b262094500ee30db950b63cb49db58e41a87df355aa4d976a793c22b65a5633cd7d3c4f80b467e518a102d971f034fc4cfc74699b438826a0f WHIRLPOOL c95e6af0cf8df10014daeb09c7051aff6781b07bb6a3b5a4e537c2c74edb758e6256765fba2c91ecf43ff18942766bce775a2cee48911f7ef3112414dea72d52
 MISC metadata.xml 211 SHA256 a1bb8d76bdbe2da71b9cc04ecaa254f575552aaf5b7e94e9e04b131a32392c3f SHA512 0f6138e9843c5ebe51905db7d461da54073a88a74d938fb1d59d7f077f90002d0d785a883d70b640fa81c1c5b20dc5b9ffd969966f1cd13db71d697372e6f573 WHIRLPOOL 596d2e7e8e9245273188e0b865b481131f71853cf3313d58258266e461fde4ea22af8e992ee301e8f179a612e2a839f09f8ed504c7d086fde70f906d63c726f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVcLwACgkQuQc30/atMkCQcACaA9knqt0D8GgxnBq3+uOt2PVJ
-WYUAmwcdqFBwwC0rNfhMwa5JCc8RYFkq
-=rdRy
+iQIcBAEBCAAGBQJREU2NAAoJEDxpGckxwJCBpwMQAILoQn89x62gtwZRU2UFTsva
+7HDa82sbPhXmeNpmA75zOGCpNilpwmLEMBlPg6zjt9T6lJRmxf1M/ulGgyPfdiEr
+gR0WnvGFMsFHO3Lu2K9ghn6wYrbSH8dEgB9jrQ8uEHhOE9I2Ek/hL+3Dt3h63b6H
+K+CJzZDkQD1tkY78P8T41ivz0AZx4odc8OXn/QIF8eztSyD6LRZvDePbYx2tYpuX
+EvaGoQOg2C2OP4+fUmUEos0eJFRA5Qrs4u/rRlele5YTvO6IJKpny+YzvUde7iOq
+od4V0HVA+1foatpVKgurf/N4OcBfO9avh8RUfJ2yCwdBGCW0a2gSZSU78S7/xO04
+eNXzfuvIEu84r++lFmcjkbsOmaZWNP1Mx3HxbIXMOSLDlubl06XDLuSr7dUHkkO1
+joiQCLHQM1hoGDl1nvCkNm3+EtYFnkopWB2qivBHwytL62y+caTOeslng1SGk8iw
+3bLdjER1yHN86wbUNxgelyfoRO0KVbVw47P81Ql1gzEJTnYAbfCSdfFCWUJWKFOD
+VhGmGsEArp6YXtkyUo2weYEksCu0oKuvozelwBm8o9lkGyKYfVBpucwGBKXCujy5
+BFJ4gOS5gMJuavZeemXJSztaaOa7TQO0hOJXScP1cspJTYaRYnri0CpsHJ7cieMj
+QAPk9xOOjPohflQedg1G
+=kKof
 -----END PGP SIGNATURE-----
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
 }