Version bump to 1.9.0.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 197 insertions, 17 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 5f153d269298..a596ddc2d84b 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.60 2013/04/28 15:42:20 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.61 2013/06/04 12:05:47 scarabeus Exp $
+
+*vigra-1.9.0 (04 Jun 2013)
+
+  04 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/vigra-1.9.0-automagicness.patch, +vigra-1.9.0.ebuild:
+  Version bump to 1.9.0.
 
   28 Apr 2013; Andrey Grozin <grozin@gentoo.org> vigra-1.8.0-r1.ebuild,
   +files/vigra-1.8.0-doxygen.patch:
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index a3f89cdb0134..7381efb22a27 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -5,27 +5,28 @@ AUX vigra-1.8.0-automagicness.patch 1509 SHA256 55b89813234db00209c5c7c5f191861e
 AUX vigra-1.8.0-doxygen.patch 2018 SHA256 8bd12921d90a14f91d22dcd6709a4cfe2e96b48d60352c9141c842f6b9c6bb88 SHA512 9c6bf091175fc02b56ec89e0f0211de7848202d950fdf81323da78cf9942bc2567f3af313ca17e02805403f0eb2e5e53e3e4335e5bf4dd9e209ccb292dc46085 WHIRLPOOL a464eee54d1c4bf21164500d30b34c026421ee06d789049a5ab21dff0b97c641fe15b67cd12c754652d043183bda460b0aac78e2b90ea63a911c6ad3d58cd745
 AUX vigra-1.8.0-gcc47.patch 951 SHA256 d5639c277d8e1504ea37a492c505dffe85db7285bed1a4de37a92698f2b1aaab SHA512 a05f7b2ba49b3241bba92b4483dd57c34b5ff51d71d274817e3967cf8346d5156d8179f3c0e98939ae6318c4b1cde2d5b9766a1e949a3c0ec991f8262551fbcb WHIRLPOOL 7bdce572c8ea23e887e2cd3e6f7a323ac70e09b1c2aeadcd7720ab38044643e3c9daefcc484eb03132a1d822ac3ab182986cd08d04408b8d8882159e58d0fdc2
 AUX vigra-1.8.0-numpy_doc.patch 990 SHA256 799527eba516607956030487b084f99f47037cc928a0ab84fec86bc9c00074f6 SHA512 da5f73c2d18735be63e3e1637b14fb243e509f6c0e7988acc75eccb41e41d3b16b2b8f241b21da517d0e7a454d6be58e1585015d9ce6908e6863bfe0790a5049 WHIRLPOOL a086912ef98565a2fa177f2de19bc26c699ccc2393a7d5d073152f9763913951457cf6e1557d1ddc12387cd126bfd74b5c054f663c09ecdff7a6e4d31aee49e5
+AUX vigra-1.9.0-automagicness.patch 2470 SHA256 5eadf96f9468b60f978ab051c84ce55379ddc709bb4a50284d8b1d532e4eb699 SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44 WHIRLPOOL cf35f6ecd0f407a9dd87824fb0ee4df6a31aee16abd61843d7e8ca1f32cebe0a00891dd4e2669651a6dcb7cfc85b7a9982bf27684e6a511f9a03b9add6084a29
 DIST vigra-1.8.0-src.tar.gz 29814914 SHA256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214 SHA512 a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1 WHIRLPOOL 002d4cb5a74741db53e4215888357a68c39680632059f3e83e1f67e820a99a48b15c0f0ebde5aea8ba50dd53a7c80d4408c1dab32bdfeb6f1c3c95685597f3e0
+DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9
 EBUILD vigra-1.8.0-r1.ebuild 3128 SHA256 4da063e377133eb2170f737618554cb3fecdeb1ebd7e59aba9a4fdec04ba82c6 SHA512 432332e4818b15ffc569ecdea0498c9b6fe4840ffe3dc2497386e322a0827ad448da226c748cec4828632ae6c10b2c277cde05f2bee4ac029ce36fe34dcf24bd WHIRLPOOL 9d328c9e12f799081d1948b7fbc57f5790a9ee88db30e30af67d790efab31657ed27f8b196cdf20beb353caabeb1dfc6341c3ec040f37185f6675064a4e5c3a6
 EBUILD vigra-1.8.0.ebuild 2782 SHA256 68381d99ea67f61481f8d98333a9ca063cf657b5ef4993e831847d960f631943 SHA512 eb5773a44f026424d9bb478d5fbfc6856c26db6b1167be9bbe189ffb3ef9053b4819db8931bee555686e8651a1faeb3805ca6320a0253f6ab0efaa4316eca251 WHIRLPOOL f5a0045c703cf5be8b09ee66320a736723a26e82448d590a171e9cd23b95e5a35d0ddb3344a4ae8148da5505753a2e5f6a4c0eb4a9246dd8df7b730728304e84
-MISC ChangeLog 8911 SHA256 0a1ecce4cb103a973393c5ec93c145b47af14d290c07725f9e2aaf47e641ec77 SHA512 2dc8c0c8a8c83d665a711b38699470f73021f67f2961603ba504c849808fdb9f952bc8ad068842e1f5e2ac4100a643576bbf0759afcc52e2b3eee5185d8f75ca WHIRLPOOL 6d77b4643323394a260e904dc21d3a6272ac36e98ff1efdc4be6bf0a407a52403cf618b6f81fc53aafe9bd3287948dfb427127945de6474a34290883837c47e4
+EBUILD vigra-1.9.0.ebuild 2731 SHA256 5ece47869dc756717ef35e04dd2a43db4e56bf712c11f4af9ee3fd4744bd0371 SHA512 31ff0fa7aefbb9ea1e5154c42be24b4e130b155e5ab14d6c693b50e26f3b205a98b2550ba8905699f8bc2f8167a769928dd6c647087dbfe601d1c576389abba3 WHIRLPOOL eaea0e288020fd073641f5dfe80b8dc7a55c07f99199a76c7ab1236a258c35c0a0024499df9bd45220a546c54bd61d5963ebbe4767b0005fd383539fa67e6808
+MISC ChangeLog 9086 SHA256 1f74f0c4c9b5205d849bfbaedf5bd089a1adffb03f7bff70da6745f34237bbed SHA512 c6341f9fb8f27d1bef3234abd8fbfff00e3f5661f74c305c78dceeb6a4edad3c858ee5a2b3e852b7c03f13088b95fea17662c22aca1a5256914e45b0099abf95 WHIRLPOOL 5512a834a7fc6f0f82c2592eacb501d078480c3e3b47e0770d15f961f6d412d0b9bf61e0764d5f90f66c5d6687fddc1e0d431ff147f88549db9e531de0bddfd1
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRfUO/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MPBwP/0YZnmA4xQPJccLUeZQLKKkH
-Gw4GA7TUHdOBktgDjdRjjujLvEtM+T+ZGIX4enC/IfcgMmmaM4JVNkZRnG1mrl6j
-+eO5o4N1Kp56w7VH8QPZae4tzBSB21sryMqV4RIpzz8EgZmO4GebhShk9A4Ys/92
-1YmRbnDpUWsTaWDFyAN2wVl/11WHrMX8xlU9tbNCaC6WTovdlp0WX/fC1qUUpKLy
-o58/EmxmNwhyzZ+rX7nLK98z5y84EoZtsKhAS8krYz6JrKeS9OrYmkE75OWliuwG
-d/tY74oOlRd+CPeFtTJtaXrvx5SVJB+WbmiTnQ590CVxIluAxpKhgfzFifgyfy6V
-M/Z/oNwa626mijU9ux3iZoSW+Ba3IukRNYFrKTN6CYApA4xq6hkIRIQCHUxulIVd
-5qpF8fsT65zD/GeIpMdKDOa41sutoxcVHUNhdGRprmT6sAZT9KxDDN64wct3USEW
-fdEeDRM4+06AwpgBkgjpWOWPmnTrTDwntpWGge1zNfX3kCQ71JMhbFo0PU+aSGcC
-do6kL60g3+VvMNr3LPgIxgcvTU3jsrdvc2C3J5+SBi8DNF1nCDoIC07BBCNUI1XA
-K+bmwAQSwiI1viSbqqfmEE/K5Uo0gjY1A1sJ2Ybky1Qigzo7EMpOLxA4NfdlT2oq
-WFF6UCGCmF3UamoJ8SRN
-=FYDB
+iQIcBAEBCAAGBQJRrdgcAAoJEOSiRoyO7jvo37MP/RPcGM+qtXgM5GXilpUp8lwD
+25r7Dysm8+3Xohbnl7/GmN05X4rHwoAlkVONk52SQw3r5NnhUvnJluD3AwX7K2Ao
+/K84UpLzQYa+P8ls+d0n9zu0L+kizSnZrw6ct0Ev4mndory/9P/WJV/5N4iZqVm2
+HsyJ5m0ZeNfmIyUV2/+bu0+F4JzP38FihpDmsi7+ZJE680x7jOk56Zk+5sAxZPMU
+IdYHHbNr4gDP5cAtbFgMMBnyisobMlaQjra27+pmXCubp8sngJrqdlApHHV9rm9s
+l7ZGaBSw3pA+PGLI53P2X+T2WkDuocqfHmMtmzF1PXtipYwyb9K0tcukxZrkG/4p
+edTHA2fVmTV+QfbMO/2e4IAFnvy30bKWeZdsrHOHvtFrrt47jLvOSxSbydVBPVyJ
+oaZ0IIQkuwNFG+fRxQXFPkxdMalNis5yNh8ml7UeU7qe1eqDd033LIiGsB8sQfXX
+78fks5vm31bwNmUbB7AWpAes2tkn8pCTSqnCqC3IV61J8CIQrdqcjtao4ZKcy+vC
+Yk8q3l//q0uPmLsqZmw4nwSqSg2hYn/tGhfcMWJSmS7rUgJKm0qhPqoQ91ltJCpp
+ZwznmF1KeVSWQWBznZ8TBFfrTpvJsTr/fxA8T8aHQxhyCbJiazePIcv8jESKtA3I
+EltDC4iKPGlGol8nCCt1
+=tWv2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
new file mode 100644
index 000000000000..e6deb761d1c5
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
@@ -0,0 +1,74 @@
+diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
+--- vigra-1.9.0.old/CMakeLists.txt	2013-06-04 13:38:43.158564579 +0200
++++ vigra-1.9.0/CMakeLists.txt	2013-06-04 13:45:19.290550486 +0200
+@@ -57,13 +57,27 @@
+ #     search for dependencies
+ #
+ ##################################################
++OPTION(WITH_TIFF "Enable tiff support" ON)
++OPTION(WITH_JPEG "Enable jpeg support" ON)
++OPTION(WITH_PNG "Enable png support" ON)
++OPTION(WITH_OPENEXR "Enable openexr support" ON)
++OPTION(WITH_FFTW3 "Enable fftw support" ON)
++OPTION(ENABLE_DOC "Build documentation" ON)
+ 
+ INCLUDE(VigraFindPackage)
+-VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
+-VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
+-VIGRA_FIND_PACKAGE(PNG)
+-VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
+-VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++IF(WITH_TIFF)
++    VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
++ENDIF()
++IF(WITH_JPEG)
++    VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
++ENDIF()
++IF(WITH_PNG)
++    VIGRA_FIND_PACKAGE(PNG)
++ENDIF()
++IF(WITH_FFTW3)
++    VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
++    VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++ENDIF()
+ IF(WITH_OPENEXR)
+     VIGRA_FIND_PACKAGE(OpenEXR)
+ ENDIF()
+@@ -72,8 +86,10 @@
+ ENDIF()
+ 
+ SET(DOXYGEN_SKIP_DOT TRUE)
++IF(ENABLE_DOC)
+ FIND_PACKAGE(Doxygen)
+ FIND_PACKAGE(PythonInterp)
++ENDIF()
+ 
+ IF(WITH_VIGRANUMPY)
+     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
+diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
+--- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:38:43.207564577 +0200
++++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:45:51.962549323 +0200
+@@ -1,4 +1,4 @@
+-IF(PYTHON_SPHINX)
++IF(PYTHON_SPHINX AND ENABLE_DOC)
+     # vigranumpy documentation generation using sphinx
+     IF(DEFINED VIGRANUMPY_DOCDIR)
+         MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
+@@ -49,7 +49,7 @@
+             ${VIGRANUMPY_DOCDIR}
+         COMMENT "Generating vigranumpy documentation")
+ 
+-ELSE(PYTHON_SPHINX)
++ELSE(PYTHON_SPHINX AND ENABLE_DOC)
+     # no vigranumpy documentation if sphinx not available
+     ADD_CUSTOM_TARGET (doc_python 
+         ${CMAKE_COMMAND} -E echo
+@@ -57,7 +57,7 @@
+         "(sphinx-build not found)"
+         VERBATIM)
+ 
+-ENDIF(PYTHON_SPHINX)
++ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
+ 
+ ADD_DEPENDENCIES(doc_python vigranumpy)
+ ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
new file mode 100644
index 000000000000..31fb2046c259
--- /dev/null
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.9.0.ebuild,v 1.1 2013/06/04 12:05:47 scarabeus Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+
+# This ebuild could use python-r1 in the future when upstream gets Python 3.x
+# support working
+inherit cmake-utils eutils multilib python-single-r1
+
+MY_P=${P}-src
+
+DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
+
+# Pull in dev-lang/python:2.7 for vigra-config which is always installed
+RDEPEND="dev-lang/python:2.7
+	>=dev-libs/boost-1.52.0-r6[python?,${PYTHON_USEDEP}]
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( sci-libs/hdf5 )
+	jpeg? ( virtual/jpeg )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+	)
+	test? (
+		python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
+	)"
+REQUIRED_USE="doc? ( hdf5 fftw )
+	python? ( hdf5 )
+	test? ( hdf5 python fftw )"
+
+DOCS=( README.txt )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagicness.patch
+
+	# Don't build nor install API docs when not requested
+	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+
+	# required for ddocdir
+	_check_build_dir init
+	local mycmakeargs=(
+		-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
+		-DLIBDIR_SUFFIX=${libdir/lib}
+		-DDOCINSTALL=share/doc/${PF}
+		-DWITH_VALGRIND=OFF
+		$(cmake-utils_use_with python VIGRANUMPY)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with hdf5)
+		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use test CREATE_CTEST_TARGETS)
+		$(cmake-utils_use test AUTOBUILD_TESTS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_make doc
+}
+
+src_test() { :; } #390447
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}