Gentoo Archives: gentoo-commits

From: Markus Meier <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/
Date: Wed, 01 Jan 2014 19:25:33
Message-Id: 1388603127.e70e471eb0a1c5071d977f61e623c274ee8026e5.maekke@gentoo
1 commit: e70e471eb0a1c5071d977f61e623c274ee8026e5
2 Author: Markus Meier <maekke <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 19:05:27 2014 +0000
4 Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 19:05:27 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=e70e471e
7
8 bump, cleanup LINGUAS, adjust media-libs/libpano13 dep
9
10 Package-Manager: portage-2.2.7
11 Manifest-Sign-Key: 072AD062
12
13 ---
14 media-gfx/hugin/Manifest | 10 ++++++----
15 ...ugin-9999.ebuild => hugin-2014.0.0_beta1.ebuild} | 21 ++++++++++-----------
16 media-gfx/hugin/hugin-9999.ebuild | 6 +++---
17 3 files changed, 19 insertions(+), 18 deletions(-)
18
19 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
20 index 9177486..1c7e87e 100644
21 --- a/media-gfx/hugin/Manifest
22 +++ b/media-gfx/hugin/Manifest
23 @@ -8,16 +8,18 @@ AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130
24 AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
25 DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
26 DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
27 +DIST hugin-2014.0.0_beta1.tar.bz2 10991694 SHA256 cdcd47360676c9ae0acaf9b1fbd5826a9ad24730ca1bfa999705508c86680048 SHA512 32142f22f2ce2f3b47de041a36158c57c76118cb35a5c1d21ec65aba966b8c3f6d66a31c06861e4604375266cee4ab1cee2d6dfe5b427c6b6255d7bab830f688 WHIRLPOOL ee5bd39a80e75af251f1328199c7a9fc380a3bf11d5434eba0d5bd6cda35a194cbb365aff51068012c46bc3112ecb05dc7c63cbe4336642fd012937088168ea1
28 EBUILD hugin-2012.0.0-r1.ebuild 2052 SHA256 06bb971f9d9e2ae8ab4e7293999e4a18f3b64c2aebfe17738981a0ff9080e50a SHA512 eb78e137df90f14d7fc34aafd1587e039f9b83ded4f81b6ea2fe7c6124b29e9b93ea344e5b45e6b3ae66a4eb9d9bdeb8b9c7573a022508da17a6278ca2379918 WHIRLPOOL fce55fb7306ce8e80af5e80d3d575f759fa8f8471e9ac724e18dfa4323c2c5c804d370d92cc069d3806f4ef3514dd06a11b9c028c0f69015011d93c7fdd2a10c
29 EBUILD hugin-2012.0.0.ebuild 1648 SHA256 b49e5866a8ff84c4f5ff4781faa30d94d7fe945b29a217e663c66bc02b7cced6 SHA512 ff7bd929200b93a13dced894633370a5e1abe11d58e78d2001e71832342fe10478bd9c7d9c35da252b8520fd845d960fca1823e053e5afc72d2519ca7b1bc730 WHIRLPOOL 106f4eeed3afa6c4d4ee7c181ce8a2989e88e61511401105d36bc67544901598f31b882d0547e31db89fe5daeb249e435223ddb9985bc274b7c73864daba9421
30 EBUILD hugin-2013.0.0-r1.ebuild 2016 SHA256 29076d91c2c1a62cf285f49566ca24d46a3a2d87d05b13cf451dea955efdccbd SHA512 e18371d45b3a8bba7bf8497bbff985a13a9968cedf55ab871970e73c682cbe625d3b82ce2a266111d4e3b413d15095f968723144c209f587681d527b50a8ae5a WHIRLPOOL 5997618182d48e51897c8177ab20c4835e5d078ee352e3583c8824c86c309347f10491767cc3949bd9e9ae62908ef46a4705b430020d05e2dba0f766dd635961
31 EBUILD hugin-2013.0.0.ebuild 2031 SHA256 f74611a30d1cf9731b3859c5ee329e9b9689b074a107c9db5ac7c485785d8ad2 SHA512 6b6ca9eda832052a39169036da7551ca104d84b4318267e09b2be66d96b8c5282503b415efb2bd70e203686b60e91866de0db92a51c5870e47829d31828aab1f WHIRLPOOL 09344e7300d92a04e04ae3ee4d98b55e8140575149fb3b8c7fec82bbcbcdbdc8a578d028e830a0df1c75d6c7b9f3de8508b8ebf800c17351a832e18d7bbb0733
32 -EBUILD hugin-9999.ebuild 2005 SHA256 7fba9359638296cae0fee953c7fb8b9e36d66ecc3e4e1d4836d76abf57165caf SHA512 a915adee1e3f2368c8e486088af2180fb2545faf260a6fd8d0736163b3113ed829d33257b82233bd26c54344888c976b0b3a4dcf9e0ed8a23192d9a40c39cf1f WHIRLPOOL 913a35d30b0c722a780633911df21a274f872f2afd9b258d388b46282434d03f18da40c1e304e00bad01ebb83058a1b7e73e52885cb2e068701a93aedf61dc81
33 +EBUILD hugin-2014.0.0_beta1.ebuild 1963 SHA256 09e0f6d2fde239e5b901364810680dc9654ea1b5f64bd71f62b8530bebc1d51f SHA512 5cd9bbf870656e44951ba6f517c639a61980517c9529a12a8fc48f3d2a5add421a5ab0a2f4cf557faa7207de5573767df9a8b01750b2d60f7035b77518d07a62 WHIRLPOOL 72ed071e52309f027405f3bf3ac937a58cbd1834a5e3205f1fda4a1d927f3c9298fbabc381f8ef1cc6800eeeacd0f94219c76fb14545df197fdcf029b5e38572
34 +EBUILD hugin-9999.ebuild 1996 SHA256 b0ab987aa2202ac0cd16c4929d407d51852b96aad1dd74eb48df4f61983f2788 SHA512 2a12646256af303d15019c539327f2152974d76097b87b88db2011a5761ddfe493f630c83d542dd93b1bf944bb3c73264adfb1f4be70a8bf1154995d4265aab4 WHIRLPOOL 5349a237c3192daccf5acfe56b49840a0a04f414fcd4001fcaeecb034ce37df4e2969a006a6595a8fd0df5499e66fc0ec76d2650cec91d2a6ae6ea54194f4b34
35 MISC metadata.xml 389 SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803 SHA512 29609682ab87309ae4c688476d73cb996f6f97fceecfb084343b9b371d28dc6bfcdd6034dc6086b4d1ebb6e37bba7840085fe126aef0e41a32454f7a9e4d231d WHIRLPOOL 180338c5e90a9340360500c879066385841c3a568559236095156dfb2fd8783e6971c0d4d72fe7f8cc07d53466a3b4b51525c0d58be572a226730e7451066e4e
36 -----BEGIN PGP SIGNATURE-----
37 Version: GnuPG v2.0.22 (GNU/Linux)
38
39 -iEYEAREIAAYFAlKwvNsACgkQkKaRLQcq0GKIrACgkC8VJWltVAX5Lvx3Z5Sm8zZI
40 -QJMAn3kp0vp+560Ra26OpSQHaUz88QdT
41 -=W7sM
42 +iEYEAREIAAYFAlLEZvcACgkQkKaRLQcq0GK7CACfRIOF/bMBiHfqj4Lw3ViHJdrC
43 +rucAnR4zOD56nWqnZlfCca+n2YyP7G41
44 +=o2cb
45 -----END PGP SIGNATURE-----
46
47 diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-2014.0.0_beta1.ebuild
48 similarity index 73%
49 copy from media-gfx/hugin/hugin-9999.ebuild
50 copy to media-gfx/hugin/hugin-2014.0.0_beta1.ebuild
51 index 1b8e365..829ef47 100644
52 --- a/media-gfx/hugin/hugin-9999.ebuild
53 +++ b/media-gfx/hugin/hugin-2014.0.0_beta1.ebuild
54 @@ -1,25 +1,24 @@
55 -# Copyright 1999-2013 Gentoo Foundation
56 +# Copyright 1999-2014 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.2 2013/12/08 12:11:57 jlec Exp $
60
61 EAPI=5
62 +
63 WX_GTK_VER="2.8"
64 PYTHON_COMPAT=( python{2_7,3_2,3_3} )
65
66 -inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
67 +inherit base python-single-r1 wxwidgets versionator cmake-utils
68
69 DESCRIPTION="GUI for the creation & processing of panoramic images"
70 HOMEPAGE="http://hugin.sf.net"
71 -SRC_URI=""
72 -EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
73 -EHG_PROJECT="${PN}-${PN}"
74 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
75
76 LICENSE="GPL-2 SIFT"
77 SLOT="0"
78 -KEYWORDS=""
79 +KEYWORDS="~amd64 ~ppc ~x86"
80
81 -LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
82 -IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
83 +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"
84 +IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
85
86 CDEPEND="
87 !!dev-util/cocom
88 @@ -32,11 +31,10 @@ CDEPEND="
89 media-libs/freeglut
90 media-libs/glew:=
91 media-libs/lensfun
92 - >=media-libs/libpano13-2.9.18:0=
93 + >=media-libs/libpano13-2.9.19_beta1:0=
94 media-libs/libpng:0=
95 media-libs/openexr:=
96 media-libs/tiff
97 - sci-libs/flann
98 sys-libs/zlib
99 virtual/jpeg
100 x11-libs/wxGTK:2.8=[X,opengl,-odbc]
101 @@ -66,6 +64,7 @@ src_prepare() {
102 -e 's:-O3::g' \
103 -i src/celeste/CMakeLists.txt || die
104 rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
105 +
106 cmake-utils_src_prepare
107 }
108
109
110 diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
111 index 1b8e365..9b2c667 100644
112 --- a/media-gfx/hugin/hugin-9999.ebuild
113 +++ b/media-gfx/hugin/hugin-9999.ebuild
114 @@ -1,4 +1,4 @@
115 -# Copyright 1999-2013 Gentoo Foundation
116 +# Copyright 1999-2014 Gentoo Foundation
117 # Distributed under the terms of the GNU General Public License v2
118 # $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
119
120 @@ -18,7 +18,7 @@ LICENSE="GPL-2 SIFT"
121 SLOT="0"
122 KEYWORDS=""
123
124 -LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
125 +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"
126 IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
127
128 CDEPEND="
129 @@ -32,7 +32,7 @@ CDEPEND="
130 media-libs/freeglut
131 media-libs/glew:=
132 media-libs/lensfun
133 - >=media-libs/libpano13-2.9.18:0=
134 + >=media-libs/libpano13-2.9.19_beta1:0=
135 media-libs/libpng:0=
136 media-libs/openexr:=
137 media-libs/tiff