[gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/

[Markus Meier]

commit:     b6036681541d95554ab8a5ae2d85e50f51a80433
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 17:10:16 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 17:10:16 2015 +0000
URL:        https://gitweb.gentoo.org/dev/maekke.git/commit/?id=b6036681

sync live ebuild

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 072AD062

 media-gfx/hugin/Manifest          | 8 ++++----
 media-gfx/hugin/hugin-9999.ebuild | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f975156..662b4d0 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -12,12 +12,12 @@ EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 
bc39b72f20e906bb6311f2ba4806309bec6f
 EBUILD hugin-2014.0.0.ebuild 2097 SHA256 
46796a312c60e413a824fff95b8624f1e33ec050b153ba13c3de6c26502697d8 SHA512 
074310a4f0951790c6c8ebc43191ba3cc677937d0a7c1002693b40b7934cb599b9c3681fe5c9f4539ef8734439ebe8cc30624686263455c16dd8777756e559dd
 WHIRLPOOL 
65da1b816638b3ec0d51b891cc3f1f195f4c3aea1e055e7185acecbc3217f426537efe37e57c87c9b7c08cbf7890174a2bf4c14a8e449fe6a521489669168a54
 EBUILD hugin-2015.0.0_rc1-r1.ebuild 1965 SHA256 
1825b654fd54ac52dbd907a7531085749211c6e5aaad62fbcf80032bab37133c SHA512 
18370af060980ea46a0a5053047bb0a84072fa665a3a1540105aa8d4c7508f94dd84bd3fa2215469802b487c814ad74dcf70222af3b904d9892be912d01baa87
 WHIRLPOOL 
43d5f324892f2ef754c94ab38a0325869ef2144dee1df1e0e6008f271509dab22213fb1a2a20953d23c7eab2bcd51e5f0d032e1bf2dbfd19004c34e9d5676c11
 EBUILD hugin-2015.0.0_rc1.ebuild 1971 SHA256 
e32cf182495a6ff58108e820e07f8d4930d5e5f9d5597b40830428b6d0555b2f SHA512 
eecfe1aa62cabf49f1cfa2b560c0396cf74d5100bc32abdb1ec36bcf011361592e5b97cde51a2e9af9093ee2baf698cc0e1bad61226bccb274c55a4d9a6468a5
 WHIRLPOOL 
751e3999d567370d69bdc2b9ab9fac551c78aee599552f2f40f7391b5b047667a95c385014ae5d999dbf41a082a8066542faf4ad0c960fef1155a4547e0e3dbf
-EBUILD hugin-9999.ebuild 1991 SHA256 
9b8e1035b98eec28a54ec94fb010270baa9c9518a6deb4f5af7b5a09929c74ff SHA512 
14c02211c90f05a836e5fb1c8879a5866e5d9f6e16c3c9bd70866535654d825dfd98c87ffa54f2d0f2a97927d04c971ddb356b0dabaf7f9aee5fa1e52785bebd
 WHIRLPOOL 
a7728ea7d197fd5eb9a42f8941922a0945a53930c1b25d653a6326441e8ac255fcf5e1987c23438f76355a7413588f3558626f282af2e004895874091fe68a12
+EBUILD hugin-9999.ebuild 1997 SHA256 
ba8e97a7965c84f140ee107213ef66ce345fb0a1e5058d959fad6a76721ff510 SHA512 
b03915e3cc23df6ebb328483543f34622b2d28a7aaa784abaa54837a3dd803bcd5e527d7061d0cc018ee5f619009eec738643222ae1cbfc36c50ba37e9489433
 WHIRLPOOL 
49adc985ce65d265dec4b11c3297b74760c9746b24c396f1a79d2f76023546ee0daed98626dd6222464fdd724df25c415a3ecc105223b4805740159c28407600
 MISC metadata.xml 355 SHA256 
4a16e5c3bc80342130bdddd83c2c3b90e5083e16b30bfb70575504da13b3935d SHA512 
a975973abc1c7b5d5d31d956e67f44530306c690817db3c43913d80288205d3334cac1dff4dd7848f9a8701120133bd3795cca71a32e1f82f028ebac68979cba
 WHIRLPOOL 
0b64ae328658806b8adfab028b16b0f3bbf8f20377c20f0ebfd396294f30ceddc3059b30b74219fc88fe5a1e0a62dcc572eaf86c4908273965ca6a8ae23789fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWB5O8ACgkQkKaRLQcq0GL7CQCbB63AellbV8ln37l4RVuUpQ/K
-T0kAn2ecdIr+iEFFzfi6Gy+McyT8vNV2
-=Hkxu
+iEYEAREIAAYFAlWETPgACgkQkKaRLQcq0GKrYwCcCZCVTsmJN5Z1FWKtmj92Ddus
+Du8AoJuNKjVAJYXWJF8vHwBYO4pHE44o
+=6Tm5
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-9999.ebuild
index 93cf918..9da8664 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -19,13 +19,11 @@ LICENSE="GPL-2 SIFT"
 SLOT="0"
 KEYWORDS=""
 
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN 
zh_TW"
+LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR 
ro ru sk sv zh_CN zh_TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
 
 CDEPEND="
        !!dev-util/cocom
-       app-arch/zip
-       dev-cpp/tclap
        dev-db/sqlite:3
        >=dev-libs/boost-1.49.0-r1:=
        dev-libs/zthread
@@ -47,6 +45,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
        media-libs/exiftool"
 DEPEND="${CDEPEND}
+       dev-cpp/tclap
        sys-devel/gettext
        virtual/pkgconfig
        python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
@@ -79,8 +78,7 @@ src_install() {
 
        for lang in ${LANGS} ; do
                case ${lang} in
-                       ca) dir=ca_ES;;
-                       cs) dir=cs_CZ;;
+                       ca@valencia) dir=ca_ES@valencia;;
                        *) dir=${lang};;
                esac
                use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}