Fixed USE="-python" issue, bug #311215. Removed old revisions.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 36 insertions, 171 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index 7666098b25e7..93f5e03b69a7 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/nkf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.48 2011/05/30 23:39:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.49 2011/06/06 23:30:49 matsuu Exp $
+
+  06 Jun 2011; MATSUU Takuto <matsuu@gentoo.org> -nkf-2.0.7-r1.ebuild,
+  -nkf-2.1.0.ebuild, nkf-2.1.0-r1.ebuild:
+  Fixed USE="-python" issue, bug #311215. Removed old revisions.
 
 *nkf-2.1.0-r1 (31 May 2011)
 
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index c66a9b696e29..4157037bb710 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -5,26 +5,24 @@ DIST NKF_python.tgz 2242 RMD160 759979ff4ade90b409439e7038f21a88bb14e46b SHA1 4e
 DIST NKF_python20090602.tgz 2318 RMD160 a2697bcee3ae903456428def80dbacbdd9345a37 SHA1 659c4321e680398915ff7e9632c3b4ca61353ee1 SHA256 c86336e52398d836d6db4f9f169d11b4003ac02681b5e3395cd64c7823beb504
 DIST nkf-2.1.0.tar.gz 156716 RMD160 77cf750e00fbc6b7b2178a25c152a4ed7b623a35 SHA1 6c88c12d973abbdb4c61ade47a470e01f7bbcc95 SHA256 a6e59bf0ebb9a1dbb3e9fc62302d0b19aefc6f5ccee0321b33fb47483ce636e8
 DIST nkf207.tar.gz 150501 RMD160 da6eebf7dd59d934eca40f2f6588e97078c8d68a SHA1 97ee0920a5cd935acd08ca789c7b8c810a594311 SHA256 71d2ba992df209a00bb1dca45e3336729dc16e51b71526bd20f897cc6127a275
-EBUILD nkf-2.0.7-r1.ebuild 1611 RMD160 2a4400d992babd15bc1f61b6b97c7024b75d5ea6 SHA1 cfd5069df9deeb5572646bc0225d58fcddf0aae0 SHA256 77a31b3f31b8504ea3a76fbb5ced5cda4e97ecbd409f53926c1c69a34a5603cf
 EBUILD nkf-2.0.7.ebuild 1454 RMD160 64fc9b49769462e487be3f827250940cd6ce723d SHA1 d3f77626a41f13e4a4444b3c0b681b77f524aa83 SHA256 1658f9fedb2331032c532ce1eb86d1bc5bc69171a37b6b6361c920760cb8ad17
-EBUILD nkf-2.1.0-r1.ebuild 1627 RMD160 cf9d654a999ff6a1177babc8e84f8f140604a25a SHA1 84fbdbe026e12776c203c7dcaa54e0486549fbf0 SHA256 6281f93a86fea2393689a94657a6139d7452674faea81b90b28c4d7387e557a9
-EBUILD nkf-2.1.0.ebuild 1666 RMD160 2fbbcd2c88e72b5c1b318c09c2aa713d6554058a SHA1 081a63b8009cf045346c1bc73d9c46996f7b9036 SHA256 976f56c80e6b7bd0cb2d3932fba534d6f8b7e08d46206836875380297c31e74b
-MISC ChangeLog 5559 RMD160 40c71a55cb08bb3d3e8371d9144f78cbc97d5259 SHA1 ea596a8fa49f88c04d4a22a6176a8de2e7042ccf SHA256 a36c055a26443874c440c36bbb2f5f4b6d11a350dc31d8bba23ad1606569b66f
+EBUILD nkf-2.1.0-r1.ebuild 1792 RMD160 e9cf41e2f5e0cab4fe1901fe34bc847422df87d8 SHA1 b59485e39e7afae74343332f09d0c8ea1c8792b4 SHA256 3e09f674f0ee7e554f06c5789b8c818e7a0db5600e1f64b2fb0b5c89efbe8587
+MISC ChangeLog 5738 RMD160 09a29219b8adfc3f0c457303c3a989ee837b9010 SHA1 645bb50ecb4ff3fe51e246df272ac102b1bc47b7 SHA256 6cfc06771e7a97c4090d745cee349e74c47feb0ff5b1c97a79eee2dcaa83d28c
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN5CqyAAoJECaGw+YFKA1pCpYQAJ7xSNnb2zly5zgYVaXywoY2
-Gk7BuFhmhklQVC4ZZzys4f58ysy4glZDxJ0qV+V+Ud7jkcjuex2zwnvkpMz5FZ7T
-Oub6Au7H54ITErIKh2Ayr15lGp0HzKSvKmZfQACnAW8K7eWcEPg5Ojzxrpua7ZcI
-mqgGVFFQq+IWXE9WyGQQPWbVbQb6CavbW0s3acPK5G/Op7BlmH57qm1l0DvWuTaW
-Vr/jAz3lS2ZQUXMRGPbN+lLfgKZg9yFb+UWM6kXQtnoMvpcsuQL6YP5arQqgS8ry
-Tof2YvQ95smwXo5JL/C/YKW5cXP4qwHv3BPIoKkypCWwak+ZTg3KPEOS9td43Bkp
-AziqS6k2k2JPV4c+pk9KeXpqBEgiFkDXSHN/MU5Eg4LvvPap14MFaJTBvTJalewB
-+SYl2tlgggx7J3v6Vz7q2h6sPZrCEnVVK9KYJn+2NTW1uy/sjwl+HXz/bUzENOrO
-57YbW9WI7bkQ/F2WJCqbSfWeUjVhQoZ1irs6R5xwxtCoWuwqjFmv3Oq1/X2hNpy9
-iQQcA7Mq/Iu5haZ8iuRJkGQCo+EnL5ZAcZ9KFZ7Sadcs/Mi8QCvMttO4suOZHB67
-60bjT7Y3p5i+MYs3YW5zcSiTKdcdHOFWM6u/QxAQ3+MZ7I3TjM0BQ/6SIFwrt6y/
-G6u8aiJ/PZLtA3uYxjpB
-=Szlk
+iQIcBAEBAgAGBQJN7WMyAAoJECaGw+YFKA1pJxkQAJS3vWx2snNQzzz3SI7AxXJ3
+CXWENkMywhMI2/EF+bX0ORNjf4JwDg+CrEO5w9+NOEhTjsICO4Af1twPWCmiPOM9
+EroNmAVLTC5FD6UPv14cz+1in9oFkGpY75wkeB555EgB5irUO+32qlAL03H2cZor
+aC8keRvXN+3gL4gLWdwFVLWIsSO/nnYT7MkNyCo0sHn05WUbPPQPMDsACbgfq8at
+H42OAKfha6vixRg4blhum8rT0iUQ0kzGrn0ZE3bIeZlfItlu/zt8Ix+cq6/LxlbK
+p+aoc2HviFHM0rcPdxKHKR5EblddOuwDMJOSdlrCzmegkyZT/Y+z3F5tfsdXBAfd
+V3IMXYZ0NDVygSTcWvZpq0GcalSaqtuMc50LYTOkJvc+y3vs+mmZzyGFek1h270Z
+g+YC44kgd1Gqf1QNkgh8yhzZx6tuTKQBwijWfIMa6vuYYrh5i8Dm/xiFi63k0DNA
+MTy/R2kU8rr+2DWN9pBl8BxA1rWHaYXJkNwqK9HYLIlTYx6hriEO9d/swkNJMODM
+svEZFHey/HNfC0njTQTjre+J0R+qFxHczT6DDefgRpxvR5KmT/im8+DqAdXEN9bg
+VgNbAyYYJAE/EKWWvY8ICeQqFa/jJAbJclSxVrO2f+5AeWtIR2imAG8E0mFUqhdq
+xCVH8ncbBcso6TRuThKE
+=9C77
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/nkf-2.0.7-r1.ebuild b/app-i18n/nkf/nkf-2.0.7-r1.ebuild
deleted file mode 100644
index 1d87ce900578..000000000000
--- a/app-i18n/nkf/nkf-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.7-r1.ebuild,v 1.2 2011/01/08 19:35:49 arfrever Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs eutils perl-module distutils
-
-MY_P="nkf${PV//./}"
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/20770/${MY_P}.tar.gz
-	python? ( http://city.plala.jp/download/nkf/NKF_python.tgz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="perl python linguas_ja"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' Makefile || die
-
-	if use python; then
-		unpack NKF_python.tgz
-		# bug #248725
-		sed -i -e "s/-s/${CFLAGS}/" NKF.python/setup.py || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" nkf || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_compile
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils_src_compile
-	fi
-}
-
-src_test() {
-	emake test || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	dobin nkf || die
-	doman nkf.1
-	if use linguas_ja; then
-		./nkf -e nkf.1j > nkf.1
-		doman -i18n=ja nkf.1
-	fi
-	dodoc nkf.doc
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_install
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils_src_install
-	fi
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/app-i18n/nkf/nkf-2.1.0-r1.ebuild b/app-i18n/nkf/nkf-2.1.0-r1.ebuild
index 1b488e4dcd99..da87e62f633b 100644
--- a/app-i18n/nkf/nkf-2.1.0-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.0-r1.ebuild,v 1.1 2011/05/30 23:39:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.0-r1.ebuild,v 1.2 2011/06/06 23:30:49 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -17,7 +17,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-macos"
 IUSE="perl python linguas_ja"
 
 pkg_setup() {
-	python_set_active_version 2
+	if use python ; then
+		python_set_active_version 2
+	fi
 }
 
 src_prepare() {
@@ -69,3 +71,15 @@ src_install() {
 		distutils_src_install
 	fi
 }
+
+pkg_postinst() {
+	if use python ; then
+		distutils_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		distutils_pkg_postrm
+	fi
+}
diff --git a/app-i18n/nkf/nkf-2.1.0.ebuild b/app-i18n/nkf/nkf-2.1.0.ebuild
deleted file mode 100644
index 2d711ac8e55e..000000000000
--- a/app-i18n/nkf/nkf-2.1.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.0.ebuild,v 1.3 2011/04/23 15:09:01 grobian Exp $
-
-EAPI="3"
-
-inherit eutils distutils perl-module toolchain-funcs
-
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/44486/${P}.tar.gz
-	python? ( http://city.plala.jp/moin/NkfPython?action=AttachFile&do=get&target=NKF_python20090602.tgz -> NKF_python20090602.tgz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-macos"
-IUSE="perl python linguas_ja"
-
-src_prepare() {
-	sed -i \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		Makefile || die
-
-	if use python; then
-		mv "${WORKDIR}/NKF.python" "${S}" || die
-		sed -i -e "s/-s/${CFLAGS}/" NKF.python/setup.py || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nkf || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_compile
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils_src_compile
-	fi
-}
-
-src_test() {
-	emake test || die
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	dobin nkf || die
-	doman nkf.1
-	if use linguas_ja; then
-		./nkf -e nkf.1j > nkf.1
-		doman -i18n=ja nkf.1
-	fi
-	dodoc nkf.doc
-	if use perl; then
-		cd "${S}/NKF.mod"
-		perl-module_src_install
-	fi
-	if use python; then
-		cd "${S}/NKF.python"
-		distutils_src_install
-	fi
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}