commit:     34ad6029479147ff70cd24ba65155afe37fab3ea
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 16:52:15 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:52:15 2015 +0000
URL:        https://gitweb.gentoo.org/dev/maekke.git/commit/?id=34ad6029

version bump to 2015 beta2 and fix repoman warnings

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

 media-gfx/hugin/Manifest                           | 13 +++++++-----
 ...-9999.ebuild => hugin-2015.0.0_beta2-r1.ebuild} | 20 +++++++++---------
 ...gin-9999.ebuild => hugin-2015.0.0_beta2.ebuild} | 24 +++++++++++-----------
 media-gfx/hugin/hugin-9999.ebuild                  | 12 ++++++-----
 media-gfx/hugin/metadata.xml                       |  1 -
 5 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 73378da..247ff66 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -6,15 +6,18 @@ AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 
d4c9b4770bcac21aaa476646c08654885
 AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 
d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 
3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485
 WHIRLPOOL 
63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
 DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 
484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 
dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86
 WHIRLPOOL 
c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
 DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 
f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 
f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5
 WHIRLPOOL 
e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
+DIST hugin-2015.0.0_beta2.tar.bz2 10605613 SHA256 
cb24d2c33a81c9401e8b2f28cce49e25d3809d997406c0769808b61a6c8f9474 SHA512 
5022ff49959b65710a30b9e5d67de02dd749a672e8ac59e024a1b5b024a8ab7a397849bd2b2a0b2fa96c7f30f687e49ae746332ac617f6f206766d1c2d1c279c
 WHIRLPOOL 
bb5ab66df088faf8b3ab0377118eeaaa61b5a6a896d71cc59f56c26c240328c0eef5c9bb76ec98c5b0f18aafd77a13ece92a1555101f196740fe91ef535e443d
 EBUILD hugin-2013.0.0-r1.ebuild 2036 SHA256 
5b66671dffb017e904a6e4e08d1f1ec90c5c0f05acff95689148d1bf78787737 SHA512 
90dee04d5c6adeec7f84a0961e0ba42b7a02bf3386ca4357dd04d0e3416e191607d4ba07ba7f3f98676261cb7639f090f3c854f223b2a19de6f9e7826bff9dd3
 WHIRLPOOL 
b701a7c3206d51b342ccc896e48da4d044e39d8221674de1541e159d07b91c34e9746588af8320bb68022e265134163be75bcd115e310a4de15be7b2ec2a0adc
 EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 
bc39b72f20e906bb6311f2ba4806309bec6f7c983bfd1b031b8171b5338f0c48 SHA512 
f4ac540e28739b8f5851c3e92a9815f4a6e8a5ef6b2bb721b3ee68e902dae91af51dba80d68de5b1d4e3b14340bd660817502b7899cb4897fba3a91d64623f31
 WHIRLPOOL 
bf40a784c443994394c035654253e0d6de25346a393b12bd3fcdaa0cff6d3253f13ab6e4461886be133af34a0d4b9efcaaf713abf765a6833525443afc5f2b47
 EBUILD hugin-2014.0.0.ebuild 2097 SHA256 
46796a312c60e413a824fff95b8624f1e33ec050b153ba13c3de6c26502697d8 SHA512 
074310a4f0951790c6c8ebc43191ba3cc677937d0a7c1002693b40b7934cb599b9c3681fe5c9f4539ef8734439ebe8cc30624686263455c16dd8777756e559dd
 WHIRLPOOL 
65da1b816638b3ec0d51b891cc3f1f195f4c3aea1e055e7185acecbc3217f426537efe37e57c87c9b7c08cbf7890174a2bf4c14a8e449fe6a521489669168a54
-EBUILD hugin-9999.ebuild 2033 SHA256 
4ecb687517f373ffe547edee0dba76948d19b434a08b1298c8708bb2c79ba1dc SHA512 
be3f2fdb1ad69ab8197b82be34e9061431381c1581bbaecb6092ff1da8ba44d2fa5eebec08c222676e150bc10627ca440ce74bff4b1a2dbfd34c427bd4199d3e
 WHIRLPOOL 
aa82437f1b2cdcb3d50fe1c6712a51a63033da2a34343ad08dd0de957dc0b6b980622dd00e510a639cc6e892a272c0788aa02e1daed93232a71167cff2eece1f
-MISC metadata.xml 395 SHA256 
1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 
52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21
 WHIRLPOOL 
dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
+EBUILD hugin-2015.0.0_beta2-r1.ebuild 1959 SHA256 
c4cbe9628626957b55d7d44e189b076c534ae331c8e8071736dfb2f90480c093 SHA512 
75021fe1a96dcda7e0b3b09ed64069f2e72dbd52822398c985054ca5c5c904f1c3821903f50c0c567f7b085f81f6e4482347964a46a5cb58ba77f5e576a5cc50
 WHIRLPOOL 
bb01b9cb99ece5b02b09fa0c2793fc733a18ccdc131d44dc4ebe01f66d50e24f42036f9af220dfc4d1478b4400f485aac1c889e333a90094c69300afafaa7605
+EBUILD hugin-2015.0.0_beta2.ebuild 1965 SHA256 
6271ffecb5b3eefb416352fcc039b756994c375d00ee9e615ade79f4c67b97ac SHA512 
11dca13d0ee2e438368b1aa610e036cdcfc07bf98eb0315743a1f04c1c5f8b4050075224891ef6696eba18ff2cccea6bbc04af1434c002116e0e42ef44347ad7
 WHIRLPOOL 
3b9f233f537b1faf463456a8b4a0b654232c294e80046dd0194283ab6a0a59444576992f3c38bcd1e1c3db4790a39e7af6bf4123baa6982cfd7c88c7d71e71fe
+EBUILD hugin-9999.ebuild 1991 SHA256 
9b8e1035b98eec28a54ec94fb010270baa9c9518a6deb4f5af7b5a09929c74ff SHA512 
14c02211c90f05a836e5fb1c8879a5866e5d9f6e16c3c9bd70866535654d825dfd98c87ffa54f2d0f2a97927d04c971ddb356b0dabaf7f9aee5fa1e52785bebd
 WHIRLPOOL 
a7728ea7d197fd5eb9a42f8941922a0945a53930c1b25d653a6326441e8ac255fcf5e1987c23438f76355a7413588f3558626f282af2e004895874091fe68a12
+MISC metadata.xml 355 SHA256 
4a16e5c3bc80342130bdddd83c2c3b90e5083e16b30bfb70575504da13b3935d SHA512 
a975973abc1c7b5d5d31d956e67f44530306c690817db3c43913d80288205d3334cac1dff4dd7848f9a8701120133bd3795cca71a32e1f82f028ebac68979cba
 WHIRLPOOL 
0b64ae328658806b8adfab028b16b0f3bbf8f20377c20f0ebfd396294f30ceddc3059b30b74219fc88fe5a1e0a62dcc572eaf86c4908273965ca6a8ae23789fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTP+qIACgkQkKaRLQcq0GJEowCfblpy/6r0KnJNUBvJho+4qne0
-FKIAnjXxKmaypwCZsTXNy3HdbiJL/7JJ
-=9l6m
+iEYEAREIAAYFAlVYxz4ACgkQkKaRLQcq0GJBjgCgkzWjN+F6A+ES7C7LQnY8uy68
+XIEAn0P/k/7F2D+Ud3ymNI211sjloy7j
+=Uvij
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-2015.0.0_beta2-r1.ebuild
similarity index 81%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2015.0.0_beta2-r1.ebuild
index d794f58..dfc921a 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0_beta2-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.6 
2014/12/20 16:36:16 maekke Exp $
+# $Header: $
 
 EAPI=5
 
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit base 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=" 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//\ /\ linguas_})"
@@ -26,19 +24,21 @@ CDEPEND="
        !!dev-util/cocom
        app-arch/zip
        dev-cpp/tclap
+       dev-db/sqlite:3
        >=dev-libs/boost-1.49.0-r1:=
        dev-libs/zthread
        >=media-gfx/enblend-4.0
        media-gfx/exiv2:=
        media-libs/freeglut
        media-libs/glew:=
-       media-libs/lensfun
        >=media-libs/libpano13-2.9.19_beta1:0=
        media-libs/libpng:0=
        media-libs/openexr:=
-       media-libs/tiff
+       media-libs/tiff:0
+       >=media-libs/vigra-1.9.0[openexr]
+       sci-libs/fftw:=
        sys-libs/zlib
-       virtual/jpeg
+       virtual/jpeg:0
        x11-libs/wxGTK:3.0=[X,opengl]
        lapack? ( virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-2015.0.0_beta2.ebuild
similarity index 79%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2015.0.0_beta2.ebuild
index d794f58..66ce103 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0_beta2.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.6 
2014/12/20 16:36:16 maekke Exp $
+# $Header: $
 
 EAPI=5
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="2.8"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit base 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=" 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//\ /\ linguas_})"
@@ -26,20 +24,22 @@ CDEPEND="
        !!dev-util/cocom
        app-arch/zip
        dev-cpp/tclap
+       dev-db/sqlite:3
        >=dev-libs/boost-1.49.0-r1:=
        dev-libs/zthread
        >=media-gfx/enblend-4.0
        media-gfx/exiv2:=
        media-libs/freeglut
        media-libs/glew:=
-       media-libs/lensfun
        >=media-libs/libpano13-2.9.19_beta1:0=
        media-libs/libpng:0=
        media-libs/openexr:=
-       media-libs/tiff
+       media-libs/tiff:0
+       >=media-libs/vigra-1.9.0[openexr]
+       sci-libs/fftw:=
        sys-libs/zlib
-       virtual/jpeg
-       x11-libs/wxGTK:3.0=[X,opengl]
+       virtual/jpeg:0
+       x11-libs/wxGTK:2.8=[X,opengl,-odbc]
        lapack? ( virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"
 RDEPEND="${CDEPEND}

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-9999.ebuild
index d794f58..93cf918 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.6 
2014/12/20 16:36:16 maekke Exp $
+# $Header: $
 
 EAPI=5
 
@@ -26,19 +26,21 @@ CDEPEND="
        !!dev-util/cocom
        app-arch/zip
        dev-cpp/tclap
+       dev-db/sqlite:3
        >=dev-libs/boost-1.49.0-r1:=
        dev-libs/zthread
        >=media-gfx/enblend-4.0
        media-gfx/exiv2:=
        media-libs/freeglut
        media-libs/glew:=
-       media-libs/lensfun
        >=media-libs/libpano13-2.9.19_beta1:0=
        media-libs/libpng:0=
        media-libs/openexr:=
-       media-libs/tiff
+       media-libs/tiff:0
+       >=media-libs/vigra-1.9.0[openexr]
+       sci-libs/fftw:=
        sys-libs/zlib
-       virtual/jpeg
+       virtual/jpeg:0
        x11-libs/wxGTK:3.0=[X,opengl]
        lapack? ( virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"

diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index abdaa4c..f8ec8fb 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -5,7 +5,6 @@
   <longdescription>hugin is a panorama stitching program</longdescription>
   <use>
     <flag name="sift">automatically align images with
-               <pkg>media-gfx/autopano-sift</pkg> or
                <pkg>media-gfx/autopano-sift-C</pkg></flag>
   </use>
 </pkgmetadata>

Reply via email to