Add upstream patch which fixes build when LINGUAS is empty, bug #492460.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 59 insertions, 17 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 25a2f742b105..c4223f5ecb1b 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.77 2013/11/24 17:36:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.78 2013/11/25 16:59:47 johu Exp $
+
+  25 Nov 2013; Johannes Huber <johu@gentoo.org>
+  +files/kid3-3.0.1-empty-linguas.patch, kid3-3.0.1.ebuild:
+  Add upstream patch which fixes build when LINGUAS is empty, bug #492460.
 
 *kid3-3.0.1 (24 Nov 2013)
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 2ec82c20e281..bf6d7e93fa10 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kid3-3.0.1-empty-linguas.patch 1247 SHA256 ab73d4e13f9efb35d8fb50c6c18b964fda873a13a90b06c156bd9eee328c77b9 SHA512 05d7f908ef4b42b1671391e9901871578d4c2c84c2c95d9eec07000fb6e68d126ec41d74f4a30743c43b9f05d09537a8f9225263c2a0437984d01f44094da625 WHIRLPOOL 7bcaf7a6c5cba6eb81c8a169bf029d8505a6d291b4bc62f488f7ef73a3d175bfe6e2bd104af1db747f9a46abf15cc101fcd7ffe087d2703dda76602a27de06e9
 AUX kid3-3.0.1-qt5-automagic.patch 7505 SHA256 5508184619c18e66de0a589d2b9011cb03ae8ab3ee6939803a8e73c7ae78205f SHA512 e260e5fa72a5051e4d84185cda3d881d8d79c8f9db6b0f7c2da0ae9e5e6dc05200ab3998cde5a819fdf0d0b5691310b87dbfd1030e84aa4d2639455a37982ca9 WHIRLPOOL d3dc165db092a5645d7b759a82a897e5352313af3779cc0f99e9d5d1ef3f030a0064bf4b06a537555b0d07d2ed54b106e4d439de395754b7741549f62e2e2e95
 AUX kid3-3.0.1-rpath.patch 1182 SHA256 ec29cc4eff8b4bf7a3704ed10efa42412804e8519733954dc87d56e8283de63c SHA512 ed7c310f60f494e040a0c7eadad04d6bf25a97e0a6bf5765891d415b71eefa8e6ea2847ef1cc1489ec8e30d7b193d9586870b1cecdb1d25a592e2c71deb25115 WHIRLPOOL fcf45374ed1b56c77e042355792dbebced9459ffda60fd3bdd21a155e8ee1b40aa000195fa114575fa3e6756256817048f209bdbb8fd4e7fac5332b6942b4093
 DIST kid3-2.2.1.tar.gz 941454 SHA256 2ac3ab6bbf8d2fdcc070a753ebdce868a5e9a2f0b3daddcc7c5b953ff39781b0 SHA512 430b3e001f66803e1ca7f08baa2c802504812e87ca0001282b15a009e1ad4daa78e91f84579347e523d46da440869a6b283edfb93f3dd7803d9ef3e6e1039a51 WHIRLPOOL 02a9479f7b0ec6bf7f6fbf514166a791af2ea7131e965d3bd2c65cdb001a4a91fea55f54d52221b55abb057398c27e3522cd69f455b61883405d6ad7afddc866
 DIST kid3-3.0.1.tar.gz 994466 SHA256 ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59 SHA512 d263ed3cd4152de5e9fe781a51ec0a6f2879f3b08812ec17d37d79fcfc38658afac771574a6ad2fde52081282169982df86702c0cb0eb4bbb6dba6d8dbc692be WHIRLPOOL 4d3c9912b24adc99a96c71b3253cd65cdf27937d6d8e08ca8a3cb82c2a08d8cf200d212a5a38bf1b65e9630d535bec1cd807e3c17101ad1877da078ae75b2377
 EBUILD kid3-2.2.1.ebuild 1240 SHA256 93ee19e1216601fdfbf46d68b058a8265e0e9c075d47026f9fbba82c7e06fe13 SHA512 76f67306c683fd37d5e31ddc781c50daf444d41988e40cf917b874d10538d642d39dcc30f82fb1d9664838769c27f57cad54c4eadf290fbdb71b5229b5c3817c WHIRLPOOL fd9c5198910597bfb4ea1417ed55cedef1afb3a6be45d2bba743cf1d99e2993693f09186a45ed48d53dd33f1618b4b6d9fd501c94b060b57ba2f25829f43ad73
-EBUILD kid3-3.0.1.ebuild 1492 SHA256 d0edc8b9840ee3264e347c4f1c23a7568b21841f56e7613d66918ba1792f493f SHA512 e2a9f80f505f35b4842cf648421ce3709bc84c339585edc6629ab6f596c1de70cb50a99cdd642768b6062f019b99f65330e1375b4f6bcd1f8f2f9892382ab748 WHIRLPOOL 9edd8043d97b04a6eb91a0b598a428f77c09b57d2cfb39f13ceda6702ded82effee6d40d7a9d9c4a6d33b61e5b89b380890a9d9f9531f7ee07d752ef42d164c3
-MISC ChangeLog 10332 SHA256 9abc02d6967734c811eb2838fdf63865bf47dbb00d18b893e2c6c98d595e23f4 SHA512 356df3a365d227efcf30c469ded4be7d5203c572e735574074bbd53e719806030c13d587861622e396c23209d0740acba211d8f9d783e88a36ea611eb08c030b WHIRLPOOL f70809e9fbed2f61ce93d1c64bb58a85084c9f8ad2cb7e710951576e838bb78ca66497c398d6738116196ab624d1d7bcf9775975acabef4f827d61e99e7bfbae
+EBUILD kid3-3.0.1.ebuild 1532 SHA256 cebf988ba188c86ee3c9350f494fa46dc04b105e889308419cd7d57e14de2f03 SHA512 2484ade73e51fc6ae16e2b1bf69dea3197fb9f704d8de9ea6897779956cfeb269f0ad063364294b39d69d407cc4602ac0c5805cba0db34863e02f5fc2b2b6909 WHIRLPOOL 29eb3675be41a0e74b71ddb58db399052fc2f777df2233c46cc61085ca75be9bfb7d8eff3aa3f240f02ccb9819efc8eea92c5bd5c2bfb1ed85d743950b43a6dc
+MISC ChangeLog 10516 SHA256 2ddcaded1d552e64e28df0161fd8745f7ee142b6c023417bf96301729f11f4e0 SHA512 e74cb5c8e3b8bb6cf200dcdb1e4ca6aa3c7ec633d61944193bf7c1f7891faa8e6b813657f783b82ccc548b91c5dc1b69e89aada1a1c5c5e81bb7ed584bf211ee WHIRLPOOL b684d02546c568e3f97cb18f0876e562ce1e64f657d31c376c5c64c86e2d6fc2d7cbdf5e3bf5eadaf467a3e3ed6638d31547c7b2f27119935681a5df93b456bb
 MISC metadata.xml 475 SHA256 dde0d0079de6cfad661da09b25a6b52bbabad7f4f04ee7c7b138d389a8e56a40 SHA512 b388605658b98f7a1a0a434cdb689d548c92b89936ed39b3d36c2fb35038da022963babafbd884292a8537f14b9d95164b19d71aaaf5521ee11d4f75683fbc69 WHIRLPOOL cf2cc2e08e403190efa4b8aed778c6653ae69a81102dee00d9783a2c650fd23984c8abd0a248b0aaecbfc2315ff9199a11ea3733027a4611e1c8118904773d48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSkjkpAAoJEGVpnaTzz9K9EwAP/1R5w6A0cVq4ln9nN0InIYiW
-/Xw7VBms3yHcVpz0/daSnGHbWdVkMpL2wqj3xHApF1+6sdfwiql+TVOVyhsF1Z/7
-xcVhAGOOE8PZSBibyZiA7LTEC2u6RyVBAijcCzKLkFioXC/kKQN4/3/izVGQV+u5
-khQdiyw8rabcYVVW4AmEchrZCj62C8yNdcSENzXSY0xowBZ7MGwTMJfTlbA9Dsgu
-7GyLV4rKP3EWEK07z7v0ivNjObxV7rZhF8+mRzfzMLeU6+KDQ6WnSbo3ag4hIf0r
-6Qfm5+EmWgT1e2+sM5+Ez+gLSR1lAxM6luRr8+0jZnPYdjyaQ/3Mn2WkatoiyAev
-95moERRpkDIMGnWamWsRHIM7sqxSIoUbboQ3XsKUG6RqFZSQN9jgppe6xb6O3vl6
-71fFXIJZMBPZUO66I7yLAKjnktiWHvIO5xvMBcOWxHeq6YOmPzSS9YR5v0Z0v/NF
-tm0sMO4RCbQZyRT4zBTVjQiUUB5qJIIW9w6htu6KhSTlA3H6X18yXiGoq8HG2b5C
-m7p+M05a21djd4lTVgmLVbJc5D3hIuSbEsmbsI2BisuXfEmEuW4HLBlF8ySZGSFl
-EyRl0YtCCg+K3qhkidrF19BYLXWmjNN/eWlopBcRd+2tXtsQX1bxkjlMZGJuLNMP
-7eHKOluyHOw7D/sUxmc1
-=TIRg
+iQIcBAEBCAAGBQJSk4IIAAoJEGVpnaTzz9K9FK0P/17RJZY7PGWPgZfInbKr3uHm
+h9BWI/rtVwRLD2hRducXW+faGsUJB0wmAD/+w8I9tlD7G0lPT3lua3eBLyuf5fSu
+q/wFE/2txh70b3p5drFHiDJea4rhjdcA53ibE25iFlEEd6x2Et6LbrreLBmIx7RG
+hH42tNmiagcrOaVhQLcXqewZ1pjyj97LtDe8i7tTwo8slTNNfSIF83s+AwadU7Rh
+0EnvCVCrb29Cpn79EY6Q7QGJ1V++ftuj6ATaYn29EtZYRAruT9Aiwh3i1aeTY0jE
+YfjtYsKBWMRvliILCzHOIckG8KvZNdX1edRorKBSRvaxQRuO/vW9mErokM0M5Rv3
+cdUxJzeeB1aqADynl96ciJ5ABNN/h5EqrdD+/QKVEgWmtGjs3jR5+KgEe94qUWz4
+NX9hvlRrmGLreVf89P3IY/J696OAYqznSQCV1zoFi/PoMEOWN/rccUn86qkW4MCj
+EsEfKHYoq6Gci0odHpbjPbKBM68dfnAuaXDKM4vNvaPt9CuAW3bKlK2iOua9Q/+3
+glLXkbZJ9sZzYq52BsSEuie0zGU6wHRsSUIFXqkwVl2ylFW929IKqJ8LprWhDQiZ
+Pa2a2Y8W+lC+W83UfmlSxfFQyg4Xmot8u1y9Mi5fwpcVhxs3AoxBerG/S+W5nyGf
+Iq8s+iE4hnbIaAAiTQdY
+=jAUg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch b/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch
new file mode 100644
index 000000000000..ad9c1097f1d3
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.0.1-empty-linguas.patch
@@ -0,0 +1,36 @@
+commit 94f91f422fbbaaa4af7e46cdaf8fb55c5f675b93
+Author: Urs Fleisch <ufleisch@users.sourceforge.net>
+Date:   Mon Nov 25 07:55:53 2013 +0100
+
+    Enable building with all translations disabled, [bugs:#84].
+    
+    In Gentoo, it is possible to disable linguas by renaming them from
+    .po to .po.old. If all po files are disabled this way, cmake failed.
+
+diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
+index f036ea6..6cd9fdb 100644
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -22,13 +22,15 @@ if (APPLE OR WIN32)
+   endforeach (_currentPoFile)
+ endif (APPLE OR WIN32)
+ 
+-add_custom_command(
+-   OUTPUT ${_tsFiles}
+-   COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/po2ts.pl
+-     ${QT_LUPDATE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
+-     ${CMAKE_CURRENT_SOURCE_DIR}/../src
+-   DEPENDS ${_poFiles}
+-)
++if (_tsFiles)
++  add_custom_command(
++     OUTPUT ${_tsFiles}
++     COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/po2ts.pl
++       ${QT_LUPDATE_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
++       ${CMAKE_CURRENT_SOURCE_DIR}/../src
++     DEPENDS ${_poFiles}
++  )
++endif (_tsFiles)
+ if (APPLE OR WIN32)
+   qt4_add_translation(_qmFiles ${_tsFiles} ${_qtTsFiles})
+   add_custom_target(translations "ALL" DEPENDS ${_qmFiles})
diff --git a/media-sound/kid3/kid3-3.0.1.ebuild b/media-sound/kid3/kid3-3.0.1.ebuild
index f382e7be01e9..8c4e178e0559 100644
--- a/media-sound/kid3/kid3-3.0.1.ebuild
+++ b/media-sound/kid3/kid3-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.0.1.ebuild,v 1.1 2013/11/24 17:36:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.0.1.ebuild,v 1.2 2013/11/25 16:59:47 johu Exp $
 
 EAPI=5
 
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-qt5-automagic.patch"
 	"${FILESDIR}/${P}-rpath.patch"
+	"${FILESDIR}/${P}-empty-linguas.patch"
 )
 
 src_configure() {