Quote ${S} uses, replace cjk useflag with linguas_ja, use doman to install the manpage, and respect LDFLAGS.

Package-Manager: portage-2.1.2_rc3-r8

3 files changed, 31 insertions, 22 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index be8e688fc11f..1c1afed7a719 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/nkf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.33 2006/10/21 13:30:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.34 2006/12/20 23:24:23 flameeyes Exp $
+
+  20 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> nkf-2.0.7_beta1.ebuild:
+  Quote ${S} uses, replace cjk useflag with linguas_ja, use doman to install
+  the manpage, and respect LDFLAGS.
 
   21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> files/nkf-python.patch:
   Don't strip binary when linking, thanks to Patrick Lauer for reporting in
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 27de502e6c65..1383b91dd373 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -16,14 +16,14 @@ EBUILD nkf-2.0.5-r1.ebuild 1267 RMD160 a1de5043294aa92474c1183f8f2a308b3729a5ff
 MD5 bc5b24c355a080625bee420e10e148d1 nkf-2.0.5-r1.ebuild 1267
 RMD160 a1de5043294aa92474c1183f8f2a308b3729a5ff nkf-2.0.5-r1.ebuild 1267
 SHA256 b90efa8096b9136d951e26f89f9a13d73f2a6cf990987b45ca1f450e6c4087a9 nkf-2.0.5-r1.ebuild 1267
-EBUILD nkf-2.0.7_beta1.ebuild 1319 RMD160 fc19b53117b0a56cc7b8d82336a5d53c7daed184 SHA1 75f931975c2314fa9138252335cff97015fda16b SHA256 06b0eb9d23af4f86cb632514d91dced1f1a2dfbb96fc59d410c90d2a0e2ba52e
-MD5 a2dc93aa9c9a01d0f3f899959508faae nkf-2.0.7_beta1.ebuild 1319
-RMD160 fc19b53117b0a56cc7b8d82336a5d53c7daed184 nkf-2.0.7_beta1.ebuild 1319
-SHA256 06b0eb9d23af4f86cb632514d91dced1f1a2dfbb96fc59d410c90d2a0e2ba52e nkf-2.0.7_beta1.ebuild 1319
-MISC ChangeLog 3747 RMD160 788b52ae83243e63a7103f48a62355e7dd4a951c SHA1 86ad8552cd03a208bc5588d00942f0a2abaf226d SHA256 aa3ab00dbda597ccb06b0b059a4a45c104d2ac1ca2a8f6f3113eddb6a64eb776
-MD5 9d6dda74b91dbe158466b80f8fd6b645 ChangeLog 3747
-RMD160 788b52ae83243e63a7103f48a62355e7dd4a951c ChangeLog 3747
-SHA256 aa3ab00dbda597ccb06b0b059a4a45c104d2ac1ca2a8f6f3113eddb6a64eb776 ChangeLog 3747
+EBUILD nkf-2.0.7_beta1.ebuild 1381 RMD160 330fea6e631ea0def6fbd8572b01c1615025fe00 SHA1 41b60d0ac04e3109a8329d89c3480c8a1decea48 SHA256 f3e39c236a3509128830a0ecbba50d565961eb45ea3d5c9c4a312ae983b19ab0
+MD5 4f2752c9ba900ef029366a6d0b4170e1 nkf-2.0.7_beta1.ebuild 1381
+RMD160 330fea6e631ea0def6fbd8572b01c1615025fe00 nkf-2.0.7_beta1.ebuild 1381
+SHA256 f3e39c236a3509128830a0ecbba50d565961eb45ea3d5c9c4a312ae983b19ab0 nkf-2.0.7_beta1.ebuild 1381
+MISC ChangeLog 3938 RMD160 71aae80832001eb927e0b24958c93071c477f13e SHA1 6e15ecbde8fd8dd671506464afe6120da29d10e7 SHA256 882b94f06a3d3b20be565d64dc557a1c02674d83584f0d2e6b2dc2daf31bb929
+MD5 50c6621bc0f537ec58acc4695c9d9929 ChangeLog 3938
+RMD160 71aae80832001eb927e0b24958c93071c477f13e ChangeLog 3938
+SHA256 882b94f06a3d3b20be565d64dc557a1c02674d83584f0d2e6b2dc2daf31bb929 ChangeLog 3938
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -38,9 +38,9 @@ MD5 2d190e096f9ce9ee749efa4be8dd863f files/digest-nkf-2.0.7_beta1 226
 RMD160 8f7bb09d040139dc04dcb5d8f743562b08714227 files/digest-nkf-2.0.7_beta1 226
 SHA256 433522a50492a11d4456dc32de6be7295de33cc14f6c376308ef717c496ce352 files/digest-nkf-2.0.7_beta1 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFOiEfAiZjviIA2XgRAtwjAJsGw0xcc8mEl6R3fiCdovmqze9S/gCeLEIO
-8GYje8ANl6l6BVOA5GcvX/0=
-=s+ud
+iD8DBQFFicY1AiZjviIA2XgRAhjqAJ9BmiilvCl2Qg4FK13uhUgMFEp6rgCg3RtU
+Sw1IK141h2xiSUIlYjPzXEk=
+=mHG9
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/nkf-2.0.7_beta1.ebuild b/app-i18n/nkf/nkf-2.0.7_beta1.ebuild
index 854d031f6a92..32eaf0b19540 100644
--- a/app-i18n/nkf/nkf-2.0.7_beta1.ebuild
+++ b/app-i18n/nkf/nkf-2.0.7_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_beta1.ebuild,v 1.1 2006/06/17 13:55:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.7_beta1.ebuild,v 1.2 2006/12/20 23:24:23 flameeyes Exp $
 
 inherit toolchain-funcs eutils perl-app distutils
 
@@ -13,17 +13,24 @@ SRC_URI="mirror://sourceforge.jp/nkf/20055/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="perl cjk"
+IUSE="perl linguas_ja"
 #IUSE="${IUSE} python"
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 S="${WORKDIR}/${MY_P%%b*}"
 
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		"${S}/Makefile"
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" nkf || die
 	if use perl; then
-		cd ${S}/NKF.mod
+		cd "${S}/NKF.mod"
 		perl-module_src_compile
 		perl-module_src_test
 	fi
@@ -39,15 +46,13 @@ src_compile() {
 src_install() {
 	dobin nkf || die
 	doman nkf.1
-	if use cjk; then
-		dodir /usr/share/man/ja/man1
-		insinto /usr/share/man/ja/man1
+	if use linguas_ja; then
 		./nkf -e nkf.1j > nkf.1
-		doins nkf.1
+		doman -i18n=ja nkf.1
 	fi
 	dodoc INSTALL* nkf.doc
 	if use perl; then
-		cd ${S}/NKF.mod
+		cd "${S}/NKF.mod"
 		perl-module_src_install
 	fi
 	#if use python; then