summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-08-09 08:30:24 +0000
committerJeroen Roovers <jer@gentoo.org>2014-08-09 08:30:24 +0000
commitec7d8fd7888978ce8a88f411cb929bb591f211f3 (patch)
treeb0d8ba672d182bb07d8b5d831b4c5716b72d9dce /app-i18n
parentbump; drop py3.2 add py3.4, upgrade doc build (diff)
downloadhistorical-ec7d8fd7888978ce8a88f411cb929bb591f211f3.tar.gz
historical-ec7d8fd7888978ce8a88f411cb929bb591f211f3.tar.bz2
historical-ec7d8fd7888978ce8a88f411cb929bb591f211f3.zip
Make USE=python mv/patch conditional again (bug #519464 by Takurou Kitagawa).
Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/nkf/ChangeLog5
-rw-r--r--app-i18n/nkf/Manifest12
-rw-r--r--app-i18n/nkf/nkf-2.1.3.ebuild10
3 files changed, 15 insertions, 12 deletions
diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index 965abd551ce0..cd1205a0b41c 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-i18n/nkf
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.60 2014/08/07 18:25:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.61 2014/08/09 08:30:22 jer Exp $
+
+ 09 Aug 2014; Jeroen Roovers <jer@gentoo.org> nkf-2.1.3.ebuild:
+ Make USE=python mv/patch conditional again (bug #519464 by Takurou Kitagawa).
07 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> -nkf-2.0.7.ebuild,
-nkf-2.1.2-r1.ebuild, -nkf-2.1.2-r2.ebuild, nkf-2.1.3.ebuild:
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index 2fe538a592a6..84249c51da34 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -4,15 +4,13 @@ Hash: SHA256
AUX nkf-2.1.3-strip.patch 328 SHA256 b6b35874a1aa5785a58693ef27e8e8096b9dd6a5513e58b865dc8f517cbab303 SHA512 a23bf0164bcf765f3b846a564c55bd783362e6f84b6f582d4d84b5ec8b711ca07d23d104ef5de2e84de5d6754b064034736ecadc5ceab6bda9ad59f00f2f527d WHIRLPOOL 153749a8531cfe8488a067e1173a86a9a0385cf64933684197740cf95202989830d637d74db4940dddbda2a5c7807d082491c2b203ac08750625cc9851ab4d35
DIST NKF_python20090602.tgz 2318 SHA256 c86336e52398d836d6db4f9f169d11b4003ac02681b5e3395cd64c7823beb504 SHA512 3baee969daaba43e7ddee0d3b6d3d73ed67cfb0a3c3cbdabcdcda9fa1e61ccf374cd686ee096d031c3c48541c6be6daacf82e3b05885de63b88344d137c306d9 WHIRLPOOL adea94cd33b4421754be16f64f70dd56a3cd7394852f16fb74bde812ef7c30c6d67285f0b832cdba941039755fb57f97592b94f127a020cdcbd064a4d0f67b58
DIST nkf-2.1.3.tar.gz 195020 SHA256 8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2 SHA512 e40798d4084657b545bdaa9904229b0a424a9be076c16993b97d206c3e82490c45288eaab417c6eea70b770f89530f90e98e1a659f8f7e4b928eea4396d1e738 WHIRLPOOL 360ab7047da404159d8c9ce736f5d389934bbe33e3feae488be8df7aa87c48c2c39fba9e6a60a5fbd7850311303f906d3c544a48fdfb6163bf1ae106f0aaf639
-EBUILD nkf-2.1.3.ebuild 1514 SHA256 5da9036acdd8767bd99f26fa304615abc94bfcc00318a7a69de1f86dd99acfbf SHA512 a31c979bd80b91ceb1364531f7289740997b2c3977a36364e771b2b5ae04f9f1fd5c6139f83232aee41cd0a829f57846a31c4ce35f81a7b36aec0c4cae06ce43 WHIRLPOOL 9baf29944826685c325eed42485a563c6a80014e1d5f1ac615635a6665650a46e5c8603b26059302a8cbe3c399fde03365915ca18d9d4c2a351c2119e48bc656
-MISC ChangeLog 7196 SHA256 c70fe3678d3331baec0b5ecf128dfd8b0d72265e0128c2460885674b672e7316 SHA512 7b7ea78ad5f7e55d38e39c96656a4df750e14cc74a2f04387de4502a5ef33f23d55addf743932141b11f59d9a63f0338ebf3609097e7ad0f32f6dea332080e31 WHIRLPOOL 6b7f2245e848525005312df74ba92759afe3ac57e1e97d200e1c005c33e744616b03fc045b60df757c0cb02cbd418de5a7b8bff2ae0c40d5b3ecf1f4d4896951
+EBUILD nkf-2.1.3.ebuild 1536 SHA256 13d8413572dc3550d00418738dbaa6cee7c15bb4138f0687cee441350320bc83 SHA512 7e7fc74ef497c524e70aa79a8607ba79656b5e6017c375413e5fb4a9d6df0f935f76064952a0b24fddc64e2b0f951ae927c2f40fc9fb40e5320ac62019b1d536 WHIRLPOOL 201d0b6709bb284974f9c6a4653ec5830443e649aa8402e697959f9e19370c789d71b2df2f809ca426b0871d9ed60c49c427576d5fe6e421eb152897e709590d
+MISC ChangeLog 7338 SHA256 dfc0bc34e04905d13493f3e75d26ddf66f91c151f3efb90efa5a86890d7d2e4d SHA512 796df31c3a08a7ee9690a5fc869a6ed63dbe824531a6b1d4f6ff255472e10c7087a042dce875132357eb2b134ce6c9122df20679a68f3f34acd5ba3e9dbec1f6 WHIRLPOOL 6db5c9f7ad4001ca8856a5d385a08d59c9d1d2c4c0d32cfffb41585ad14c06d413b8ce89a4a273cabd6c7dc8536b47ee5d58b388bd80d7e459db7239c6f3b9a0
MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iJwEAQEIAAYFAlPjxbsACgkQG9wOWsQutdaqkAQA1E7hwEy31lBk7fQ0Vwpv6tS4
-LwDp6XwFTUc1WqH5Ss3Kf0FcHbmKnPZGQAQVboNOShXtQEFD/9uHRgqDcv9qjFeD
-Y/bYIhhBrga4E8f8+HMbK3DF2A3YwF1+SDsHjYVkTYs+kN6ior2+jpmrLLD9k9Vj
-UWXPnjFuc7E7wkXTT+g=
-=Bgn7
+iEYEAREIAAYFAlPl3CAACgkQVWmRsqeSphODsACeNdfl+DSGgE7qlc5xQjDBJIG/
+g44An0KBbvYJJ0g7K+4IkKqrbGnZxe0b
+=Wp5s
-----END PGP SIGNATURE-----
diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild
index 1a405fde39d1..d1014361da30 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-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.4 2014/08/07 18:25:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.5 2014/08/09 08:30:22 jer Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -21,9 +21,11 @@ src_prepare() {
-e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
Makefile || die
-
- mv "${WORKDIR}/NKF.python" "${S}" || die
- epatch "${FILESDIR}"/${P}-strip.patch
+
+ if use python; then
+ mv "${WORKDIR}/NKF.python" "${S}" || die
+ epatch "${FILESDIR}"/${P}-strip.patch
+ fi
}
src_compile() {