Gentoo Archives: gentoo-commits

From: Markus Meier <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
Date: Sun, 10 Jul 2016 09:14:19
Message-Id: 1468142009.9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65.maekke@gentoo
1 commit: 9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65
2 Author: Markus Meier <maekke <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 10 09:13:29 2016 +0000
4 Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 10 09:13:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1f18ac
7
8 media-gfx/hugin: version bump, migrate to I10N
9
10 Package-Manager: portage-2.3.0
11
12 media-gfx/hugin/Manifest | 1 +
13 ...hugin-9999.ebuild => hugin-2016.2.0_rc1.ebuild} | 23 ++++++++++------------
14 media-gfx/hugin/hugin-9999.ebuild | 15 +++++++-------
15 3 files changed, 18 insertions(+), 21 deletions(-)
16
17 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
18 index 38839a5..5e6e4f9 100644
19 --- a/media-gfx/hugin/Manifest
20 +++ b/media-gfx/hugin/Manifest
21 @@ -1,2 +1,3 @@
22 DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
23 DIST hugin-2016.0.0.tar.bz2 10508576 SHA256 b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512 029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1 WHIRLPOOL 2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4
24 +DIST hugin-2016.2.0-rc1.tar.bz2 10396049 SHA256 b1a68b7890b4d463e18408993ea7ef57aefe9c4b3a5a9724e9bbacf9d0d371a3 SHA512 d1f75772db6ab70af0fdbdad32c3c7770fb6660886646ea164f8c7ccf668a1cd2d14af1d61d45f9f9b28f49e78a19fb8678d4d7706e1ddd8989f9c44abe159b7 WHIRLPOOL 6c30aa339d8a0bef7c714b93dddc362eb67b5a333f0e22361eaba6c0f79e486fef0136c5b7296d0425040dd98d514ea364e1afba470489e356954d55fd266288
25
26 diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
27 similarity index 74%
28 copy from media-gfx/hugin/hugin-9999.ebuild
29 copy to media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
30 index 50ecf8a..4b80209 100644
31 --- a/media-gfx/hugin/hugin-9999.ebuild
32 +++ b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild
33 @@ -7,20 +7,18 @@ EAPI=5
34 WX_GTK_VER="3.0"
35 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
36
37 -inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
38 +inherit python-single-r1 wxwidgets versionator cmake-utils
39
40 DESCRIPTION="GUI for the creation & processing of panoramic images"
41 HOMEPAGE="http://hugin.sf.net"
42 -SRC_URI=""
43 -EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
44 -EHG_PROJECT="${PN}-${PN}"
45 +SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
46
47 LICENSE="GPL-2 SIFT"
48 SLOT="0"
49 -KEYWORDS=""
50 +KEYWORDS="~amd64 ~ppc ~x86"
51
52 -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"
53 -IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
54 +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"
55 +IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
56
57 CDEPEND="
58 !!dev-util/cocom
59 @@ -66,9 +64,6 @@ pkg_setup() {
60 }
61
62 src_prepare() {
63 - sed \
64 - -e 's:-O3::g' \
65 - -i src/celeste/CMakeLists.txt || die
66 rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
67
68 cmake-utils_src_prepare
69 @@ -80,9 +75,11 @@ src_install() {
70
71 for lang in ${LANGS} ; do
72 case ${lang} in
73 - ca@valencia) dir=ca_ES@valencia;;
74 - *) dir=${lang};;
75 + ca) dir=ca_ES;;
76 + ca-valencia) dir=ca_ES@valencia;;
77 + cs) dir=cs_CZ;;
78 + *) dir=${lang/-/_};;
79 esac
80 - use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
81 + use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
82 done
83 }
84
85 diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
86 index 50ecf8a..6fbb401 100644
87 --- a/media-gfx/hugin/hugin-9999.ebuild
88 +++ b/media-gfx/hugin/hugin-9999.ebuild
89 @@ -19,8 +19,8 @@ LICENSE="GPL-2 SIFT"
90 SLOT="0"
91 KEYWORDS=""
92
93 -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"
94 -IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
95 +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"
96 +IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
97
98 CDEPEND="
99 !!dev-util/cocom
100 @@ -66,9 +66,6 @@ pkg_setup() {
101 }
102
103 src_prepare() {
104 - sed \
105 - -e 's:-O3::g' \
106 - -i src/celeste/CMakeLists.txt || die
107 rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
108
109 cmake-utils_src_prepare
110 @@ -80,9 +77,11 @@ src_install() {
111
112 for lang in ${LANGS} ; do
113 case ${lang} in
114 - ca@valencia) dir=ca_ES@valencia;;
115 - *) dir=${lang};;
116 + ca) dir=ca_ES;;
117 + ca-valencia) dir=ca_ES@valencia;;
118 + cs) dir=cs_CZ;;
119 + *) dir=${lang/-/_};;
120 esac
121 - use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
122 + use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
123 done
124 }