Specify LICENSE more precisely. Remove old.

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

5 files changed, 11 insertions, 45 deletions

diff --git a/app-editors/zile/ChangeLog b/app-editors/zile/ChangeLog
index 2e79e82595f1..e493700e2310 100644
--- a/app-editors/zile/ChangeLog
+++ b/app-editors/zile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/zile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/ChangeLog,v 1.182 2012/10/13 22:57:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/ChangeLog,v 1.183 2012/11/02 07:48:34 ulm Exp $
+
+  27 Oct 2012; Ulrich Müller <ulm@gentoo.org> zile-2.3.24-r1.ebuild,
+  -zile-2.4.6.ebuild, zile-2.4.7.ebuild, zile-2.4.8.ebuild:
+  Specify LICENSE more precisely. Remove old.
 
   13 Oct 2012;  <naota@gentoo.org> zile-2.4.8.ebuild:
   Add ~x86-fbsd. #384445
diff --git a/app-editors/zile/zile-2.3.24-r1.ebuild b/app-editors/zile/zile-2.3.24-r1.ebuild
index a1dbb66d4020..fa65504a13f7 100644
--- a/app-editors/zile/zile-2.3.24-r1.ebuild
+++ b/app-editors/zile/zile-2.3.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.24-r1.ebuild,v 1.7 2012/07/13 12:13:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.24-r1.ebuild,v 1.8 2012/11/02 07:48:34 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="http://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"
diff --git a/app-editors/zile/zile-2.4.6.ebuild b/app-editors/zile/zile-2.4.6.ebuild
deleted file mode 100644
index 9a53a08c3710..000000000000
--- a/app-editors/zile/zile-2.4.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.6.ebuild,v 1.7 2012/04/03 08:59:16 naota Exp $
-
-EAPI=4
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="http://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="acl test"
-
-RDEPEND="dev-libs/boehm-gc
-	sys-libs/ncurses
-	acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-silent-rules \
-		$(use_enable acl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# AUTHORS, FAQ, and NEWS are installed by the build system
-	dodoc README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
diff --git a/app-editors/zile/zile-2.4.7.ebuild b/app-editors/zile/zile-2.4.7.ebuild
index 762a0288f651..cd974fb33ce2 100644
--- a/app-editors/zile/zile-2.4.7.ebuild
+++ b/app-editors/zile/zile-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.7.ebuild,v 1.8 2012/07/29 16:53:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.7.ebuild,v 1.9 2012/11/02 07:48:34 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="http://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
diff --git a/app-editors/zile/zile-2.4.8.ebuild b/app-editors/zile/zile-2.4.8.ebuild
index 7303d79ce6b1..9fe6283d3597 100644
--- a/app-editors/zile/zile-2.4.8.ebuild
+++ b/app-editors/zile/zile-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.8.ebuild,v 1.2 2012/10/13 22:57:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.8.ebuild,v 1.3 2012/11/02 07:48:34 ulm Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="http://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"