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

[Markus Meier]

commit:     88320cc0d863e84fc017a522e7f8e676407ef2ac
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 18:04:58 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 18:05:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88320cc0

media-gfx/hugin: version bump

Package-Manager: portage-2.2.27

 media-gfx/hugin/Manifest                               |  1 +
 .../{hugin-9999.ebuild => hugin-2016.0.0_rc1.ebuild}   | 18 ++++++++----------
 media-gfx/hugin/hugin-9999.ebuild                      | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 34addc4..ac2a267 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
 DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 
2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 
bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
 WHIRLPOOL 
f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
+DIST hugin-2016.0.0_rc1.tar.bz2 10507908 SHA256 
1be18902e70d541a8b2d2855cff7ccd8ce5bdc3836a6185a5d94262392b4f533 SHA512 
cb3326513153a7ae3471286baba52ff37d10cd75c52c9c7852c097a3760f8c0aeb3643a039ddddf60f13b3aae4b31d782f8f3d17380328fdfee4c6b94953d488
 WHIRLPOOL 
096f2dda5a6af476052079d9fff398cddf6bda630f921612e086190482d077dd997b195a0f340cf652179c6e340e48141055b2a87ad329b5d06badaef97c5f49

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
similarity index 83%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
index 061cae1..5d675f1 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2016.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,17 +7,15 @@ 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_})"
@@ -25,7 +23,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ 
linguas_})"
 CDEPEND="
        !!dev-util/cocom
        dev-db/sqlite:3
-       >=dev-libs/boost-1.49.0-r1:=
+       >=dev-libs/boost-1.49.0-r1:0=
        dev-libs/zthread
        >=media-gfx/enblend-4.0
        media-gfx/exiv2:=
@@ -38,7 +36,7 @@ CDEPEND="
        >=media-libs/vigra-1.9.0[openexr]
        sci-libs/fftw:=
        sys-libs/zlib
-       virtual/opengl
+       virtual/glu
        virtual/jpeg:0
        virtual/opengl
        x11-libs/wxGTK:3.0=[X,opengl]
@@ -59,8 +57,8 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
 pkg_setup() {
        DOCS="authors.txt README TODO"
        mycmakeargs=(
-               $(cmake-utils_use_enable lapack LAPACK)
-               $(cmake-utils_use_build python HSI)
+               -DBUILD_HSI=$(usex python ON OFF)
+               -DENABLE_LAPACK=$(usex lapack ON OFF)
        )
        use python && python-single-r1_pkg_setup
 }

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-9999.ebuild
index 061cae1..50ecf8a 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,7 +25,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ 
linguas_})"
 CDEPEND="
        !!dev-util/cocom
        dev-db/sqlite:3
-       >=dev-libs/boost-1.49.0-r1:=
+       >=dev-libs/boost-1.49.0-r1:0=
        dev-libs/zthread
        >=media-gfx/enblend-4.0
        media-gfx/exiv2:=
@@ -38,7 +38,7 @@ CDEPEND="
        >=media-libs/vigra-1.9.0[openexr]
        sci-libs/fftw:=
        sys-libs/zlib
-       virtual/opengl
+       virtual/glu
        virtual/jpeg:0
        virtual/opengl
        x11-libs/wxGTK:3.0=[X,opengl]
@@ -59,8 +59,8 @@ S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
 pkg_setup() {
        DOCS="authors.txt README TODO"
        mycmakeargs=(
-               $(cmake-utils_use_enable lapack LAPACK)
-               $(cmake-utils_use_build python HSI)
+               -DBUILD_HSI=$(usex python ON OFF)
+               -DENABLE_LAPACK=$(usex lapack ON OFF)
        )
        use python && python-single-r1_pkg_setup
 }