Do not inject CFLAGS. Unconditionally patch. Convert sed script to patch.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 34 insertions, 12 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index bb0ec46080c0..b4a621c0a534 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/nkf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.57 2013/12/01 07:21:09 matsuu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.58 2014/08/07 10:04:51 jer Exp $
+
+  07 Aug 2014; Jeroen Roovers <jer@gentoo.org> nkf-2.1.3.ebuild,
+  +files/nkf-2.1.3-strip.patch:
+  Do not inject CFLAGS. Unconditionally patch. Convert sed script to patch.
 
 *nkf-2.1.3 (01 Dec 2013)
 
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 2a97714459b0..aff1deea4cc2 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX nkf-2.1.3-strip.patch 328 SHA256 b6b35874a1aa5785a58693ef27e8e8096b9dd6a5513e58b865dc8f517cbab303 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d WHIRLPOOL 153749a8531cfe8488a067e1173a86a9a0385cf64933684197740cf95202989830d637d74db4940dddbda2a5c7807d082491c2b203ac08750625cc9851ab4d35
 DIST NKF_python.tgz 2242 SHA256 4dcf34edbd5baf5aabd9e0cd439ca342a99b92c6748311ab693e9277d40d552b SHA512 483a17b35bacbf98b4e96afb801ee048a398266d0547e6ee91686fe6900c5c5eddf4521a6c613c3e0a993d8035b25113a310415e9cbcca3a99093de3d1226e20 WHIRLPOOL b28ca62949c076b9c1de75dd6d97b0d974acd05e086c532a50e460f490618b980adbbd98dc68049d709d6e1c0ddf20070cbde1a6352d9230f3cdb76a24496698
 DIST NKF_python20090602.tgz 2318 SHA256 c86336e52398d836d6db4f9f169d11b4003ac02681b5e3395cd64c7823beb504 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9 WHIRLPOOL adea94cd33b4421754be16f64f70dd56a3cd7394852f16fb74bde812ef7c30c6d67285f0b832cdba941039755fb57f97592b94f127a020cdcbd064a4d0f67b58
 DIST nkf-2.1.2.tar.gz 158127 SHA256 034e8b676160fa7cfaf023ad130ce2d7a7309e917c8f41b308e9dc2f6218a0a6 SHA512 209d5e300ccbd346021e6e11f2754dafdeb3fdef744a5cfa02d5649c344bec93044e467b4b63f003ab02c7d9969d7230c6076befad9571857d895eecf7698e80 WHIRLPOOL 0654eba7deaa82b3bc563dc7ba15955e256944b6b82e99587918f9e225f958383927c5b751ccafe8f3967353050abe68cf340768deca6dcae36e4a5684e40a86
@@ -6,6 +10,13 @@ DIST nkf207.tar.gz 150501 SHA256 71d2ba992df209a00bb1dca45e3336729dc16e51b71526b
 EBUILD nkf-2.0.7.ebuild 1449 SHA256 b4a155c1682dc46a87638ed12f7d146e0806de1c119f8702f23abab0bcabecbd SHA512 e21b24680ed88d41ad5e9abd1b771a1333341fcf9a209f4da392bd3b3934976138c56a5f7b070b3a3e016878d963b77fef36175a8145075ead017b2dabef7a17 WHIRLPOOL d8aaf48e960b6c6db05c5f886b1f5dceb10e75f67b2839989df8aab253a73d6954000ad3f753a464186a48484f46e3fb18d26e47925f9b6f03eaff81e477cb6c
 EBUILD nkf-2.1.2-r1.ebuild 1756 SHA256 35688b223dfc44882eec4436fa352d907b3d100503eda24a32e7f83f17333ee8 SHA512 2a06910d1b24fcad7fd97c3cd28f3c0bfb166659f388d3947995fad40201b9ef8aeab721841517b07334fbc2c7c2f7e286bff2a47649f07714c3b5def909986a WHIRLPOOL fd5c03690d63bf159f3dfb469d25121552d98eebc01b3b6235b750c54e802854527a74f160f85f2b28b6029bc50589dd1c8763c0b19563bca8f6089e725ea091
 EBUILD nkf-2.1.2-r2.ebuild 1563 SHA256 d8f9daaa57d80de9f89c709fb2c577517802098e08c7baa548f320f54645cbdd SHA512 e0b76b1121008a2c20ed45c0a42ecfac76437a3760c96968522fd60c60c3a0c02979c70e94894ad4c929b738891888d04eaa174f9209996041a8d820b197c464 WHIRLPOOL 3572260bc9b1f961e4c2c914e58f35b77f6806dd320910f16cbb6e882217eae7f8f8775e57d58bf1be661d556ad137fbf2cc6695dcf765e489d6544eadd15601
-EBUILD nkf-2.1.3.ebuild 1559 SHA256 efc2d7688c03492e877481abc5ac08e2abd063066884cf226d5d39326c38ab6b SHA512 fc794a47eda23af58b2d83fed91f3c839472a489ca4655f20dbe569f6050fa67f015d90913bbe12f09e5a0f0ce19593ef387c87491aa32654fc91e5968d33786 WHIRLPOOL 0311137801d719ae725fcd4877490613de4f47ea97b7a8b1a427c995c9757b70355b48250ac828ea0a978b552914acb90cfb9181b0625bfdb6af5672b8d7b989
-MISC ChangeLog 6755 SHA256 c6a284994e251379a4d116139d301a720e44545224fa2f966edf8777ca78914a SHA512 750af5552334dd0b39c9c6918f1544d626ad502da7f34d536c363b6bd62968a0b79226f194098f3b6205aa85222f2fd155e9dca5f180dcc8b98a44fbcbfad974 WHIRLPOOL 6a70a07a76430447c133c066207c7bec07e4adb7d8d0b9f4978c69c00f3bc108441b8eb5072eb3515fff35072cd08ffdeca0e6e090a07a13048ec0adec8ca9a1
+EBUILD nkf-2.1.3.ebuild 1518 SHA256 5125aa0510529a152a8b1a9bbde40306b63f8ccb2d7645fc6771c03896e3d45d SHA512 64da51d46ca09ec79824104d5867f1a1bfcc004192cb54b6d33435f4a2a5c89510dd3414274d367c1d5bd54b5dc0c3bb83e4af49cdc75bb68113b7b13b9f44de WHIRLPOOL 7cd53bb8c1c4346e6e2ea5a9ba3a569e8319ed1f65a05bc615a15a48cb8b04b7c3ab0bb596b666eb79f3d445448f81c03c2cc9073774b09d5ab9870176b1ea76
+MISC ChangeLog 6926 SHA256 2e6e8acf20086aa8d5616a0c5f2706c6e2bbefef15cc6e0de310aa87b430aead SHA512 829d87cd15c4241107e3c6f4d21ccf4a1c7cea17426da83a4836085e98543e5f9dd2a18113b197ac4974b249f37970683a48d2fc80bbd4dd6f54ba02fd93aa60 WHIRLPOOL b454f0165a342c16f75d4fe545cf2cfcb1b45ed3c0c0bd9f2b37102ba4eac6b60207f95943671106cfe695dd43c33a4007cf8ae1a0ceb0bddea2da6ad4870ac3
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPjT0QACgkQVWmRsqeSphMjzACfaM7K/JPbY3OZHO2vLfoNs4gt
+odQAni10szD6YYnu2vAB7oMmeNYvtF1u
+=3p0x
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/files/nkf-2.1.3-strip.patch b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
new file mode 100644
index 000000000000..5cfac8820f82
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.3-strip.patch
@@ -0,0 +1,9 @@
+--- a/NKF.python/setup.py
++++ b/NKF.python/setup.py
+@@ -8,5 +8,4 @@
+        author="Matsumoto Tadashi",
+        author_email="ma2@city.plala.jp",
+        ext_modules = [
+-               Extension("nkf", ["NKF_python.c"],
+-                         extra_link_args = ['-s'])])
++               Extension("nkf", ["NKF_python.c"])])
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
index 3006ecf19273..c79befffa214 100644
--- a/app-i18n/nkf/nkf-2.1.3.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.1 2013/12/01 07:21:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.2 2014/08/07 10:04:51 jer Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,14 +18,12 @@ IUSE="perl python linguas_ja"
 
 src_prepare() {
 	sed -i \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
 		-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
+	
+	mv "${WORKDIR}/NKF.python" "${S}" || die
+	epatch "${FILESDIR}"/${P}-strip.patch
 }
 
 src_compile() {