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

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 21 insertions, 154 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/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
-}