fix license

6 files changed, 55 insertions, 72 deletions

diff --git a/app-misc/colordiff/colordiff-1.0.1.ebuild b/app-misc/colordiff/colordiff-1.0.1.ebuild
index 33b52fb44c3d..42dd8c155021 100644
--- a/app-misc/colordiff/colordiff-1.0.1.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.1.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.1.ebuild,v 1.1 2003/03/08 00:20:55 sethbc Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.1.ebuild,v 1.2 2003/08/05 18:25:18 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Colorizes output of diff"
-SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 HOMEPAGE="http://colordiff.sourceforge.net/"
-IUSE=""
-
-DEPEND="sys-apps/diffutils"
+SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
 
-src_install () {
+DEPEND="sys-apps/diffutils"
 
-	exeinto /usr/bin
-	newexe ${S}/colordiff.pl colordiff
+src_install() {
+	newbin colordiff.pl colordiff
 	insinto /etc
-	doins ${S}/colordiffrc
+	doins colordiffrc
 	chown root.root ${S}/etc/colordiffrc
 	chmod 644 ${S}/etc/colordiffrc
 	dodoc BUGS CHANGES COPYING README TODO
diff --git a/app-misc/colordiff/colordiff-1.0.3.ebuild b/app-misc/colordiff/colordiff-1.0.3.ebuild
index 3be9c572be87..ef7e8397e451 100644
--- a/app-misc/colordiff/colordiff-1.0.3.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.3.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.3.ebuild,v 1.1 2003/07/17 17:04:19 spyderous Exp $
+# Distributed under the terms of the GNU General Public Licensev2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.3.ebuild,v 1.2 2003/08/05 18:25:18 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Colorizes output of diff"
-SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 HOMEPAGE="http://colordiff.sourceforge.net/"
-IUSE=""
-
-DEPEND="sys-apps/diffutils"
+SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
 
-src_install () {
+DEPEND="sys-apps/diffutils"
 
-	exeinto /usr/bin
-	newexe ${S}/colordiff.pl colordiff
+src_install() {
+	newbin colordiff.pl colordiff
 	insinto /etc
-	doins ${S}/colordiffrc
+	doins colordiffrc
 	chown root.root ${D}/etc/colordiffrc
 	chmod 644 ${D}/etc/colordiffrc
 	dodoc BUGS CHANGES COPYING README TODO
diff --git a/app-misc/colordiff/colordiff-1.0.ebuild b/app-misc/colordiff/colordiff-1.0.ebuild
index 49d643ddc7dd..990f968a14c3 100644
--- a/app-misc/colordiff/colordiff-1.0.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.ebuild,v 1.5 2003/02/13 08:54:34 vapier Exp $
+# Distributed under the terms of the GNU General Public Licensev2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.ebuild,v 1.6 2003/08/05 18:25:18 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Colorizes output of diff"
-SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 HOMEPAGE="http://colordiff.sourceforge.net/"
-IUSE=""
-
-DEPEND="sys-apps/diffutils"
+SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
 
-src_install () {
+DEPEND="sys-apps/diffutils"
 
-	exeinto /usr/bin
-	newexe ${S}/colordiff.pl colordiff
+src_install() {
+	newbin colordiff.pl colordiff
 	insinto /etc
-	doins ${S}/colordiffrc
+	doins colordiffrc
 	chown root.root ${S}/etc/colordiffrc
 	chmod 644 ${S}/etc/colordiffrc
 	dodoc BUGS CHANGES COPYING README TODO
diff --git a/app-misc/xhkeys/xhkeys-1.0.0.ebuild b/app-misc/xhkeys/xhkeys-1.0.0.ebuild
index a35c8a401758..cca2892f7b1d 100644
--- a/app-misc/xhkeys/xhkeys-1.0.0.ebuild
+++ b/app-misc/xhkeys/xhkeys-1.0.0.ebuild
@@ -1,35 +1,28 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xhkeys/xhkeys-1.0.0.ebuild,v 1.2 2003/07/01 22:31:32 aliz Exp $
+# Distributed under the terms of the GNU General Public Licensev2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xhkeys/xhkeys-1.0.0.ebuild,v 1.3 2003/08/05 18:27:54 vapier Exp $
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="The application allows to assign a particular action to any key or key combination."
+DESCRIPTION="assign particular actions to any key or key combination"
+HOMEPAGE="http://www.geocities.com/wmalms/"
 SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
-HOMEPAGE="http://www.geocities.com/wmalms"
+
 LICENSE="GPL-2"
-DEPEND="x11-base/xfree"
-RDEPEND="${DEPEND}"
 SLOT="0"
 KEYWORDS="x86"
 
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}"
-}
+DEPEND="x11-base/xfree"
 
 src_compile() {
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man \
+		|| die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin xhkeys xhkconf
-#	exeinto /etc/init.d/
-#	doexe ${FILESDIR}/xhkeys
-
 	dodoc README VERSION
 }
diff --git a/app-misc/xnc/xnc-5.0.0.ebuild b/app-misc/xnc/xnc-5.0.0.ebuild
index 28ddd50f275e..bb6e3215c991 100644
--- a/app-misc/xnc/xnc-5.0.0.ebuild
+++ b/app-misc/xnc/xnc-5.0.0.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xnc/xnc-5.0.0.ebuild,v 1.1 2003/01/08 21:33:21 bass Exp $
+# Distributed under the terms of the GNU General Public Licensev2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xnc/xnc-5.0.0.ebuild,v 1.2 2003/08/05 18:26:44 vapier Exp $
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="A ile manager for X Window system very similar to Norton Commander, with a lot of features."
-SRC_URI="http://xnc.dubna.su/src-5/${P}.src.tar.gz"
+DESCRIPTION="file manager for X Window system very similar to Norton Commander"
 HOMEPAGE="http://xnc.dubna.su/"
-LICENSE="GPL-2"
-DEPEND="x11-base/xfree"
+SRC_URI="http://xnc.dubna.su/src-5/${P}.src.tar.gz"
 
-KEYWORDS="x86"
+LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="x11-base/xfree"
 
 src_compile() {
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man \
+		|| die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog INSTALL LICENSE README TODO
 }
diff --git a/app-misc/xnc/xnc-5.0.2.ebuild b/app-misc/xnc/xnc-5.0.2.ebuild
index 45ccb37e65e7..aa4040b82dce 100644
--- a/app-misc/xnc/xnc-5.0.2.ebuild
+++ b/app-misc/xnc/xnc-5.0.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xnc/xnc-5.0.2.ebuild,v 1.1 2003/03/26 05:18:42 seemant Exp $
+# Distributed under the terms of the GNU General Public Licensev2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xnc/xnc-5.0.2.ebuild,v 1.2 2003/08/05 18:26:44 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A ile manager for X Window system very similar to Norton Commander, with a lot of features."
+DESCRIPTION="file manager for X Window system very similar to Norton Commander"
 HOMEPAGE="http://xnc.dubna.su/"
 SRC_URI="http://xnc.dubna.su/src-5/${P}.src.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE="nls"
 
 DEPEND="x11-base/xfree"
 
@@ -19,11 +19,12 @@ src_compile() {
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		`use_enable nls` || die "./configure failed"
+		`use_enable nls` \
+		|| die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog INSTALL LICENSE README TODO
 }