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

[Markus Meier]

commit:     9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 09:13:29 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 09:13:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1f18ac

media-gfx/hugin: version bump, migrate to I10N

Package-Manager: portage-2.3.0

 media-gfx/hugin/Manifest                           |  1 +
 ...hugin-9999.ebuild => hugin-2016.2.0_rc1.ebuild} | 23 ++++++++++------------
 media-gfx/hugin/hugin-9999.ebuild                  | 15 +++++++-------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 38839a5..5e6e4f9 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1,3 @@
 DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
 WHIRLPOOL 
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
 DIST hugin-2016.0.0.tar.bz2 10508576 SHA256 
b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512 
029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
 WHIRLPOOL 
2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
+DIST hugin-2016.2.0-rc1.tar.bz2 10396049 SHA256 
b1a68b7890b4d463e18408993ea7ef57aefe9c4b3a5a9724e9bbacf9d0d371a3 SHA512 
d1f75772db6ab70af0fdbdad32c3c7770fb6660886646ea164f8c7ccf668a1cd2d14af1d61d45f9f9b28f49e78a19fb8678d4d7706e1ddd8989f9c44abe159b7
 WHIRLPOOL 
6c30aa339d8a0bef7c714b93dddc362eb67b5a333f0e22361eaba6c0f79e486fef0136c5b7296d0425040dd98d514ea364e1afba470489e356954d55fd266288

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
similarity index 74%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
index 50ecf8a..4b80209 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
@@ -7,20 +7,18 @@ EAPI=5
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets versionator cmake-utils
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net";
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin";
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-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_})"
+LANGS=" ca ca-valencia cs 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//\ /\ l10n_})"
 
 CDEPEND="
        !!dev-util/cocom
@@ -66,9 +64,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       sed \
-               -e 's:-O3::g' \
-               -i src/celeste/CMakeLists.txt || die
        rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
 
        cmake-utils_src_prepare
@@ -80,9 +75,11 @@ src_install() {
 
        for lang in ${LANGS} ; do
                case ${lang} in
-                       ca@valencia) dir=ca_ES@valencia;;
-                       *) dir=${lang};;
+                       ca) dir=ca_ES;;
+                       ca-valencia) dir=ca_ES@valencia;;
+                       cs) dir=cs_CZ;;
+                       *) dir=${lang/-/_};;
                esac
-               use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+               use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
        done
 }

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-9999.ebuild
index 50ecf8a..6fbb401 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -19,8 +19,8 @@ LICENSE="GPL-2 SIFT"
 SLOT="0"
 KEYWORDS=""
 
-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_})"
+LANGS=" ca ca-valencia cs 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//\ /\ l10n_})"
 
 CDEPEND="
        !!dev-util/cocom
@@ -66,9 +66,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       sed \
-               -e 's:-O3::g' \
-               -i src/celeste/CMakeLists.txt || die
        rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
 
        cmake-utils_src_prepare
@@ -80,9 +77,11 @@ src_install() {
 
        for lang in ${LANGS} ; do
                case ${lang} in
-                       ca@valencia) dir=ca_ES@valencia;;
-                       *) dir=${lang};;
+                       ca) dir=ca_ES;;
+                       ca-valencia) dir=ca_ES@valencia;;
+                       cs) dir=cs_CZ;;
+                       *) dir=${lang/-/_};;
                esac
-               use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+               use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
        done
 }