version bump: fix dependencies by Nikoli in bug #551800, should also fix problems with newer boost from bug #549986

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x072AD062

5 files changed, 202 insertions, 17 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 79921133dd6e..a671fcb2925e 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.159 2015/07/18 10:04:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.160 2015/07/28 16:31:52 maekke Exp $
+
+*hugin-2015.0.0_rc3-r1 (28 Jul 2015)
+*hugin-2015.0.0_rc3 (28 Jul 2015)
+
+  28 Jul 2015; Markus Meier <maekke@gentoo.org> +hugin-2015.0.0_rc3.ebuild,
+  +hugin-2015.0.0_rc3-r1.ebuild, hugin-9999.ebuild:
+  version bump: fix dependencies by Nikoli in bug #551800, should also fix
+  problems with newer boost from bug #549986
 
   18 Jul 2015; Markus Meier <maekke@gentoo.org> -hugin-2013.0.0-r1.ebuild,
   -files/hugin-2013.0.0-boost.patch:
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 89e997d8e6a8..72d968afa9e1 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -4,15 +4,18 @@ Hash: SHA256
 AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b
 AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
 DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
+DIST hugin-2015.0.0_rc3.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
 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 ChangeLog 26105 SHA256 dd2145529282455fcc9612ca72a2920dccf4e8cb574193b7cb3185bafa8a2043 SHA512 3abc704b0c24fb058649f0ffe6fc2b123726f8ffcef5cc7c135968155210ca33cbf7a257e8f862a8b65d556238f95126bbac856b51684b462870d4c73153a858 WHIRLPOOL 6b579fbd77b213d1ba6ce311299b239f44e4557015fc0ca896a21a3e9fd83a09149540b9b2d74a253ec25490b384b5bb1a32677bb146e976f835f73996fcf6d7
+EBUILD hugin-2015.0.0_rc3-r1.ebuild 2141 SHA256 3a9694b57b5c843d672afdfc89ab88aa1ae86335ffb67572576ea456155b48d1 SHA512 3ef35dbd814cc5e19710bc88475e424b6883cafa5e45fbdeb87fb76a9c3e54424a5ee70d42ea88c5e202454d492d1e04528b88adf6284c488e4473a731dae135 WHIRLPOOL da9a8e43f425f06c7d35f716655e8aaa0417c216fe6dea5c3e2f95484605fca13c68243d714d2a7a38958b590b9e1ea99e74e3462bb47e6152bd64258dbb6209
+EBUILD hugin-2015.0.0_rc3.ebuild 2144 SHA256 94379f9322c042aac87cffbbac31a66bad0882dfb93f42078ac29f072e61ca3b SHA512 491cbe8f7ab965787880514b4d2a60c9165469133b394adb6031ea4bb2ac7763befff041f75a726be8d7aaf05b802169f755f20f53d2754813805ca1842c051a WHIRLPOOL 7b7130fbef0b692234a9df1fc2452ce5494d3748ea14b458c810829f3035b64cd4c205d9da991fb3d572ad94ead324e9f5730d944bedf91e948d5b73946f93ba
+EBUILD hugin-9999.ebuild 2137 SHA256 90fa99c56dd2509813a8e79a532d1fc9fbec8b0b9f6c988e342cd4f4cfee8ac0 SHA512 549cb5c7e9f30323816bc84b7a78d6f9486a7746696b56cac8c3bc6004f079345abc1cfb806c14ae975bd39050b79b6464bb989cf2d045f35823124e7eed4b4a WHIRLPOOL 3f8704bfdcef23a4d0978ee96643833b5ebdef562b7781d3c2e18a84181514a9fcea0dcf9a5a6a6cb3300576fa79ceca3712dfadfabef341e699a10f843f5d23
+MISC ChangeLog 26426 SHA256 3c33d492fecea920ff1ddefe845ccf992449070c7d5d1b91e9d4211d5163d02a SHA512 e694902238030a63ccacb5633a4598769b1577fc119f4138ca8e0f0952c029f96238f945004a016094d94598c4803bf0b4f5d809999dddeb5488b237ec4e6d8d WHIRLPOOL 670ca969676b755af49a64233a02aa977392bfd5f07f823df311d434ca86eeb9bab83c5318a2e17ab8a181cae63379b6ab8170a12bda1d40cf1b49206f97cc5f
 MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWqJMEACgkQkKaRLQcq0GLwOgCglob4cXWXRmdWetCwScoTvKFL
-5IkAn1R+XLuoR3bOAidBaOEN7Fz8Y850
-=j7WF
+iEYEAREIAAYFAlW3rnoACgkQkKaRLQcq0GIZsQCeKOKFcufOifAMKfsMOv0ft/y9
+1fkAoJ2gx22MqxsxfyST3PG7l9xB2XP4
+=/nXL
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..35c3796bb288
--- /dev/null
+++ b/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild
@@ -0,0 +1,86 @@
+# 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-2015.0.0_rc3-r1.ebuild,v 1.1 2015/07/28 16:31:52 maekke Exp $
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+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_})"
+
+CDEPEND="
+	!!dev-util/cocom
+	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/libpano13-2.9.19_beta1:0=
+	media-libs/libpng:0=
+	media-libs/openexr:=
+	media-libs/tiff:0
+	>=media-libs/vigra-1.9.0[openexr]
+	sci-libs/fftw:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/wxGTK:3.0=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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)
+	)
+	use python && python-single-r1_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
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca@valencia) dir=ca_ES@valencia;;
+			*) dir=${lang};;
+		esac
+		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+	done
+}
diff --git a/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild b/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild
new file mode 100644
index 000000000000..94923880c7f3
--- /dev/null
+++ b/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild
@@ -0,0 +1,86 @@
+# 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-2015.0.0_rc3.ebuild,v 1.1 2015/07/28 16:31:52 maekke Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+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_})"
+
+CDEPEND="
+	!!dev-util/cocom
+	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/libpano13-2.9.19_beta1:0=
+	media-libs/libpng:0=
+	media-libs/openexr:=
+	media-libs/tiff:0
+	>=media-libs/vigra-1.9.0[openexr]
+	sci-libs/fftw:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/wxGTK:2.8=[X,opengl,-odbc]
+	lapack? ( virtual/blas virtual/lapack )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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)
+	)
+	use python && python-single-r1_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
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca@valencia) dir=ca_ES@valencia;;
+			*) dir=${lang};;
+		esac
+		use linguas_${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 d794f58855fe..8eed879be53e 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: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.7 2015/07/28 16:31:52 maekke Exp $
 
 EAPI=5
 
@@ -19,32 +19,35 @@ LICENSE="GPL-2 SIFT"
 SLOT="0"
 KEYWORDS=""
 
-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"
+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_})"
 
 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/opengl
+	virtual/jpeg:0
+	virtual/opengl
 	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/lapack )
+	lapack? ( virtual/blas virtual/lapack )
 	sift? ( media-gfx/autopano-sift-C )"
 RDEPEND="${CDEPEND}
 	media-libs/exiftool"
 DEPEND="${CDEPEND}
+	dev-cpp/tclap
 	sys-devel/gettext
 	virtual/pkgconfig
 	python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
@@ -77,8 +80,7 @@ src_install() {
 
 	for lang in ${LANGS} ; do
 		case ${lang} in
-			ca) dir=ca_ES;;
-			cs) dir=cs_CZ;;
+			ca@valencia) dir=ca_ES@valencia;;
 			*) dir=${lang};;
 		esac
 		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}