Change nkf-python upstream address. Update LICENSE. Bug #405235

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 107 insertions, 16 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index 159016f1412b..76ed1e4cf9fe 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2011/11/20 15:15:34 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.52 2012/03/15 01:47:50 naota Exp $
+
+*nkf-2.1.2-r1 (15 Mar 2012)
+
+  15 Mar 2012; Naohiro Aota <naota@gentoo.org> +nkf-2.1.2-r1.ebuild:
+  Change nkf-python upstream address. Update LICENSE. Bug #405235
 
 *nkf-2.1.2 (20 Nov 2011)
 
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 49f2213ef67e..005f11229737 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -8,23 +8,24 @@ DIST nkf-2.1.2.tar.gz 158127 RMD160 91c0d413a70299246591d314d33f45e71eba51a7 SHA
 DIST nkf207.tar.gz 150501 RMD160 da6eebf7dd59d934eca40f2f6588e97078c8d68a SHA1 97ee0920a5cd935acd08ca789c7b8c810a594311 SHA256 71d2ba992df209a00bb1dca45e3336729dc16e51b71526bd20f897cc6127a275
 EBUILD nkf-2.0.7.ebuild 1454 RMD160 64fc9b49769462e487be3f827250940cd6ce723d SHA1 d3f77626a41f13e4a4444b3c0b681b77f524aa83 SHA256 1658f9fedb2331032c532ce1eb86d1bc5bc69171a37b6b6361c920760cb8ad17
 EBUILD nkf-2.1.0-r1.ebuild 1801 RMD160 252af4fef84915cb3ed2b1d187eaeb3c05a55073 SHA1 93c37f48402766213f71f7fd494500b583981273 SHA256 63ee7d06900377dce0bf1d0b58a78e27885c61919f269af82c33c3db77bc357a
+EBUILD nkf-2.1.2-r1.ebuild 1740 RMD160 bf2bb33503ffd032cfc72565770908888419c809 SHA1 92619dd9ccfd1eb81a5aaead9485d1ef4930611a SHA256 70fea57143a562d4a09ec185f690877c8e508404d57e12da6f3d95d7c9fe36a8
 EBUILD nkf-2.1.2.ebuild 1798 RMD160 fbe3781940d8f3726a2d3aad83a22b5288d0ae90 SHA1 0e82117c18482bcb579750ca97308145d40b5644 SHA256 baf68da6971595cd44c90aa29a74152643540784ee3ef411504c3a892d6cd1a7
-MISC ChangeLog 5941 RMD160 f260dda77010341f49ef0126c5cb7d75b1780314 SHA1 d88834b784d48319915dd1e4f2daf9ab8a8fc3aa SHA256 b0c49cab4e4d4ffc0fa58f0a5384a2fb8f524e85715b6689026a09282f8293f9
+MISC ChangeLog 6106 RMD160 87a1c2b192bfd38a668e0a1f19f0ea882c2eff0c SHA1 3eb060d90255ed873952648bc6791827d91321c5 SHA256 221ad26b2e927d8e0ae985439cc1b2fe2143e8b3fcb14ecb38470644f0462821
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyRmZAAoJEDYO1FT4VRUUFJ8QAJYQNi/w9e8QcjPtA/LnGQy7
-OBfYW+N9Z0K5RQ/OYrlrX5NGRDi+NJCq0RJLoKTXal0fSWSy/8J98NPPKd6IlayU
-IDRWqoJLpOw5nLBm4UIX4Rk4MhMQPtc5ZKobK0kJzlHPpVir8C2ujLACSm16xlJn
-giPBqQ9dIMTSJSqZvcpH2iuDVcABZ5w9U9wqd5fZnwfIBcydO9k9kDrkJiwOkRGX
-KlTBwtR50Q/08yzU7hSPY4qnarPUJgFcTQmpGf24TiHJbdLlWwjZwu0ky1Qr3vp8
-dvq3t+cWEHhVUcItAVznUf+x9ix8GuKxu9rGSGsxblJS68tI9Ie3X9N9W9IeO7Uy
-c5um+tPPUYvDQV1VnIql6Fzt4DavQQRGCRrgkohAf30iOL4Ic2frbT45OvDULIxk
-B6rbf7L/LjmyXQdn2N4bOcah9y74ng8HfIaEJbjsz4A8Hp+C0fY6USsGE5isgWng
-Ln1tCzHrZK49incJpMGConEnsnJQHKXmrWzMLqDRxZaukjU5T3m1LM7yiR5igVqq
-YTC2Q/7EUJ+UZMdD4YZsgJU+aTmNKjL/qCDo+bIL7HtxofZ+Js6UBm72Hqdwq24I
-CoTxZnX9LufUeo6Wzi1PtvpZJYOYPtuIbJwEALU9f+POZreP7EjLTNz3wMxyFCrx
-wb7fhv0rIIydqzim559J
-=wMz7
+iQIcBAEBCAAGBQJPYUozAAoJEDYO1FT4VRUUrN8P/3BbJ/IzdK5vRjgDDr0JO8or
+mRnFxs17bdxMWZ9+jD7cX8L/GDbW68WdgMFAsqz9ony6GlvLj3UPqFJjcVUxMqeR
+ZE4x5KRKYKDWKdWVr8P2mpkCxrK4Mk46AjRr8oCqDKvJzjcReZeIrW9mplJG3X+Y
+1ZBLtPzkQFWVbwIzA5CPF2zrlqFDJY4JQN+GcR/qLCET0aYexprI/KhPr3s8ByyT
+rIBMvL6hdu56STSpav7zEKH/KNIT0BRgQTEXJ0KvQXluOGLJDzf/1Mz2LDmXP3Iz
+axZ/eTiFepetnOwUwQHXBcY4KM8Yir7xFCx1Bf4QeDq6soa4IgBEezGuvuaY9CV7
+5D6getxfGx3+yVSwM/K1/xZ+4geUA1wUGXSaR/lIFMArS/9/v0QeVE+qYirzq7s5
+H+Uqrs1xUqi/9fubQ1WGcGwuEssQj44cd9rchsh8o3+zmfY/FpvfmD75PvkmyfZb
+rhxGgyJKZmPdyvxEUIBQWFK2qbwgsHOawnsokSE1kD9RUuMYOGQosRecPl2vIY5f
+lRdPzt974wZPtbCbpUoImYTBu3C81w7CbeQCZFqv+ZbH8FxaHVFnIvix/KMuu8tp
+gy+6gvrIzWhqwp5cIvyKyukXZrrfebhI8Qu0boe+sXGtaKrZ5izsmwx0tleVeHYQ
+fnljvO5aFD9hrirIhfS5
+=sv50
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/nkf-2.1.2-r1.ebuild b/app-i18n/nkf/nkf-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..4fb40fa533cd
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.2-r1.ebuild,v 1.1 2012/03/15 01:47:50 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+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/53171/${P}.tar.gz
+	python? ( http://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="perl python linguas_ja"
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+	fi
+}
+
+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() {
+	if use python ; then
+		distutils_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		distutils_pkg_postrm
+	fi
+}