Update license; change "as-is" to "HPND" as recommended at http://article.gmane.org/gmane.linux.gentoo.devel/80427; drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 9 insertions, 68 deletions

diff --git a/dev-util/itstool/ChangeLog b/dev-util/itstool/ChangeLog
index 9132ef332f39..6159e9135ee2 100644
--- a/dev-util/itstool/ChangeLog
+++ b/dev-util/itstool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/itstool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/ChangeLog,v 1.15 2012/10/04 14:51:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/ChangeLog,v 1.16 2012/12/16 10:47:31 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -itstool-1.1.2.ebuild, -itstool-1.1.3.ebuild, itstool-1.2.0.ebuild:
+  Update license; change "as-is" to "HPND" as recommended at
+  http://article.gmane.org/gmane.linux.gentoo.devel/80427; drop old.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> itstool-1.2.0.ebuild:
   Stable for amd64, wrt bug #427544
diff --git a/dev-util/itstool/itstool-1.1.2.ebuild b/dev-util/itstool/itstool-1.1.2.ebuild
deleted file mode 100644
index 72d83d905bc2..000000000000
--- a/dev-util/itstool/itstool-1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/itstool-1.1.2.ebuild,v 1.3 2012/04/29 15:42:46 maekke Exp $
-
-EAPI="4"
-PYTHON_USE_WITH="xml"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
-
-# files in /usr/share/itstool/its are as-is
-LICENSE="GPL-3 as-is"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
diff --git a/dev-util/itstool/itstool-1.1.3.ebuild b/dev-util/itstool/itstool-1.1.3.ebuild
deleted file mode 100644
index 120e22b0ac07..000000000000
--- a/dev-util/itstool/itstool-1.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/itstool-1.1.3.ebuild,v 1.1 2012/06/07 08:32:48 tetromino Exp $
-
-EAPI="4"
-PYTHON_USE_WITH="xml"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
-
-# files in /usr/share/itstool/its are as-is
-LICENSE="GPL-3 as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
diff --git a/dev-util/itstool/itstool-1.2.0.ebuild b/dev-util/itstool/itstool-1.2.0.ebuild
index 725c32a05c88..a0a0e8945151 100644
--- a/dev-util/itstool/itstool-1.2.0.ebuild
+++ b/dev-util/itstool/itstool-1.2.0.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/dev-util/itstool/itstool-1.2.0.ebuild,v 1.6 2012/10/04 14:51:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/itstool-1.2.0.ebuild,v 1.7 2012/12/16 10:47:31 tetromino Exp $
 
 EAPI="4"
 PYTHON_USE_WITH="xml"
@@ -12,8 +12,8 @@ DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS
 HOMEPAGE="http://itstool.org/"
 SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 
-# files in /usr/share/itstool/its are as-is
-LICENSE="GPL-3 as-is"
+# files in /usr/share/itstool/its are HPND/as-is
+LICENSE="GPL-3+ HPND"
 SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE=""