commit: ad8c1a9ce24c88762c7e89a3bf363555fd9708e4
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 10:05:05 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 10:05:05 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=ad8c1a9c
sync with gentoo-x86
Package-Manager: portage-2.2.20
Manifest-Sign-Key: 072AD062
media-gfx/hugin/Manifest | 11 ++-
media-gfx/hugin/files/hugin-2013.0.0-boost.patch | 40 -----------
media-gfx/hugin/hugin-2013.0.0-r1.ebuild | 86 ------------------------
media-gfx/hugin/metadata.xml | 1 +
4 files changed, 5 insertions(+), 133 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 06994c0..7aff856 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,23 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX hugin-2013.0.0-boost.patch 1690 SHA256
4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512
280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7
WHIRLPOOL
60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
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-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_rc2.tar.bz2 10608223 SHA256
f5049021007faf9556d74e9f9de54dc34d95851982c9f0fbcc3493c7d317ccc7 SHA512
2ccd7c1f00c95d395b990f2a5f559e563773cfa3432f9951e08abd0eb91454e1baef4472a35679ca8afb06f3452e93c245b39c85255b4b7b19b29e92434b5290
WHIRLPOOL
578d5a1c6761da4b35386fc0368853b5da3b1eefa340ae9ee763230ab9b4e359eacb2593834ce4c6cc9bc46a816446bd16dae4dbb4c5bde7742a2a9d377cf270
-EBUILD hugin-2013.0.0-r1.ebuild 2032 SHA256
0ca939bbf6f39bccecc34c0e0f061c7d5be931a43945e4d808899d8634c7a9e3 SHA512
8cc153d87439d71b07481e3a5802c9aae196849f1fa2e7184a2d0e2d9c0845535630be011d30728940616b32565b0e8414205eea26c2b1f45d63c6b04cf82ac2
WHIRLPOOL
7ef6d9950d76f5f5e7ded1ba2820058cb629f754729415362a3a581084532a01265034c1bc1ca718423acb47316a2d4990e9dbd90cdf113c7446ad1b74aa90cc
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-2015.0.0_rc2-r1.ebuild 1965 SHA256
1825b654fd54ac52dbd907a7531085749211c6e5aaad62fbcf80032bab37133c SHA512
18370af060980ea46a0a5053047bb0a84072fa665a3a1540105aa8d4c7508f94dd84bd3fa2215469802b487c814ad74dcf70222af3b904d9892be912d01baa87
WHIRLPOOL
43d5f324892f2ef754c94ab38a0325869ef2144dee1df1e0e6008f271509dab22213fb1a2a20953d23c7eab2bcd51e5f0d032e1bf2dbfd19004c34e9d5676c11
EBUILD hugin-2015.0.0_rc2.ebuild 1971 SHA256
e32cf182495a6ff58108e820e07f8d4930d5e5f9d5597b40830428b6d0555b2f SHA512
eecfe1aa62cabf49f1cfa2b560c0396cf74d5100bc32abdb1ec36bcf011361592e5b97cde51a2e9af9093ee2baf698cc0e1bad61226bccb274c55a4d9a6468a5
WHIRLPOOL
751e3999d567370d69bdc2b9ab9fac551c78aee599552f2f40f7391b5b047667a95c385014ae5d999dbf41a082a8066542faf4ad0c960fef1155a4547e0e3dbf
EBUILD hugin-9999.ebuild 1997 SHA256
ba8e97a7965c84f140ee107213ef66ce345fb0a1e5058d959fad6a76721ff510 SHA512
b03915e3cc23df6ebb328483543f34622b2d28a7aaa784abaa54837a3dd803bcd5e527d7061d0cc018ee5f619009eec738643222ae1cbfc36c50ba37e9489433
WHIRLPOOL
49adc985ce65d265dec4b11c3297b74760c9746b24c396f1a79d2f76023546ee0daed98626dd6222464fdd724df25c415a3ecc105223b4805740159c28407600
-MISC metadata.xml 355 SHA256
4a16e5c3bc80342130bdddd83c2c3b90e5083e16b30bfb70575504da13b3935d SHA512
a975973abc1c7b5d5d31d956e67f44530306c690817db3c43913d80288205d3334cac1dff4dd7848f9a8701120133bd3795cca71a32e1f82f028ebac68979cba
WHIRLPOOL
0b64ae328658806b8adfab028b16b0f3bbf8f20377c20f0ebfd396294f30ceddc3059b30b74219fc88fe5a1e0a62dcc572eaf86c4908273965ca6a8ae23789fc
+MISC metadata.xml 395 SHA256
1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512
52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21
WHIRLPOOL
dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlWZMZAACgkQkKaRLQcq0GJFgACdHkngxZ0KI2AzDW/6krqp+/Qe
-thAAn0xBLaETQz26XGWFivC8etHg+QpI
-=XEAe
+iEYEAREIAAYFAlWqJNEACgkQkKaRLQcq0GLojwCdF9Fx1oQXHBAcY1SZ1skAj3Z5
+BM4An3xBr6jpP8xSMktdGb1x3720Ln33
+=OQ1E
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
b/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
deleted file mode 100644
index fa077b0..0000000
--- a/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- CMakeLists.txt | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6d88a4..3b1ced4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
- # Now it is a cache variable you can edit in cmakesetup --TKS
- #
- IF( NOT Boost_root_suffix )
-- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir."
FORCE )
-+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir."
FORCE )
- ENDIF( NOT Boost_root_suffix )
-
- IF(WIN32)
-@@ -267,13 +267,16 @@ IF(WIN32)
- set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- ENDIF(WIN32)
--FIND_PACKAGE(Boost 1.41 COMPONENTS thread date_time regex filesystem
iostreams system signals)
--IF (NOT Boost_FOUND)
-- IF(WIN32)
-- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try
editing Boost_root_suffix")
-- ELSE()
-- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires
at least version 1.41")
-- ENDIF()
-+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem
iostreams system)
-+IF(NOT Boost_FOUND)
-+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem
iostreams system signals)
-+ IF (NOT Boost_FOUND)
-+ IF(WIN32)
-+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try
editing Boost_root_suffix")
-+ ELSE()
-+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin
requires at least version 1.44")
-+ ENDIF()
-+ ENDIF (NOT Boost_FOUND)
- ENDIF (NOT Boost_FOUND)
-
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
deleted file mode 100644
index ec59412..0000000
--- a/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-2013.0.0-r1.ebuild,v
1.9 2015/01/05 10:17:27 pinkbyte Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-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="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-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"
-IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- <dev-libs/boost-1.54.0:=
- 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.18:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8=[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- 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)
-
-PATCHES=( "${FILESDIR}"/${P}-boost.patch )
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- 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
- python_optimize
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index f8ec8fb..abdaa4c 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -5,6 +5,7 @@
<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>
