Version bump

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 228 insertions, 16 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 6a7ca269905e..aeffb61126b9 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.51 2012/03/12 12:25:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.52 2012/05/19 23:23:15 dilfridge Exp $
+
+*vigra-1.8.0 (19 May 2012)
+
+  19 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> +vigra-1.8.0.ebuild,
+  +files/vigra-1.8.0-automagicness.patch, +files/vigra-1.8.0-numpy_doc.patch:
+  Version bump
 
   12 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Openoffice won't use system vigra for one header. Drop us from maint.
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 44f9ca9f188d..c7ef37a0ade3 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.7.1-automagicness.patch 1608 RMD160 caa7ccad70104818b326b40c02e3f35797de4b10 SHA1 fbb5b7843c17a8a5f55db13d458eef444cc5adbe SHA256 8d6d73ff40155cd34eff25ff8f32c8bd25f32d63264548b3262fb8b788526957
 AUX 1.7.1-fix-nosetest.patch 1506 RMD160 24134d08a00bccb3ed3194e18e2eeb73991985f9 SHA1 d5794217519442cf1d10cae997956ade3fd8f26e SHA256 21ad06a9cf2c0f0c48531be7209e1879dc57e6204717df20e4dcb3c1e8053a8c
@@ -8,25 +8,29 @@ AUX 1.7.1-gcc4.6.patch 1296 RMD160 ae867a0c7a38ca256b035eb3473df922fc8d927c SHA1
 AUX 1.7.1-hdf5.patch 1290 RMD160 c9dd4347ce5f289fe0389a0ab1b8f55f102b3d87 SHA1 16d7596331f0a3836e286265377a3907f7cdd9b8 SHA256 ec366d57999b7353fd57c9095c4bf88323639195ba5edd6c67a0ebb7b42a50f0
 AUX 1.7.1-numpy_doc.patch 996 RMD160 a92dadb31c3410bcf5ec29b5edcdfa537e53b98d SHA1 927e95a99f1d156209916b55f049f1c9961af8c8 SHA256 bb764e22b8af92d107e87a36e40e7c287189397adbc8e5de76c69ba3d8aeb555
 AUX 1.7.1-png-1.5.patch 1259 RMD160 782a8a41a8a6bc5433c98ef39a190bfe1eb7d57a SHA1 15370e3151eb84281b35d2bac97054662dc2bab9 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68
+AUX vigra-1.8.0-automagicness.patch 1509 RMD160 03adf3c5cfeaef54f67ea0ec2bb38cc073c1034c SHA1 2951c422de62e86bd52c08ed32a0878f22e8eac8 SHA256 55b89813234db00209c5c7c5f191861e6e3a0d363006acf972311ad4c3b0cd2c
+AUX vigra-1.8.0-numpy_doc.patch 990 RMD160 5d1eaa3d29729bb2f454f76b48ba57f2aaa37ce8 SHA1 1904ec4e2be19ad65e240ac75644e30c3e7ada1a SHA256 799527eba516607956030487b084f99f47037cc928a0ab84fec86bc9c00074f6
 DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8170b SHA1 f90f54da31a6544057c25df7dbcc6954604de079 SHA256 4fe9052085330300f8c8564021b67fc2c5d534132ef29e781d839feb5d5c0ec2
+DIST vigra-1.8.0-src.tar.gz 29814914 RMD160 99d781da6e0ca94ce3404e1bcb3adeb9e43a2017 SHA1 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2 SHA256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214
 EBUILD vigra-1.7.1-r1.ebuild 2852 RMD160 adccb8804cb8e3fc920bbf1cd27a5c94d98803c7 SHA1 dc9d536cc349c4469c7fdcd2046cb45bbcf34c9b SHA256 a13ab9cf9f848882f56d8de8584ed84501420b90d6aa75f8840e2d4afc984cdd
 EBUILD vigra-1.7.1.ebuild 2410 RMD160 768b0d86c90907e765d267940e88b80b80c4e783 SHA1 e7ad60b3187552ff01a6d6a023848f0af1ba85b3 SHA256 a0bbed02f61c660df3134b2f09733639e0e5a1152b08931fb1d66894118d004d
-MISC ChangeLog 7144 RMD160 2da1eb8ea6f728c582404d1ee1fc172b94909b06 SHA1 7672b3b8f51e2baafab5c2b4cae4b93a71d364d8 SHA256 d06c3a375f99fd07b9b855055cfabd8840df5bb725b548db66ac1acad1fada4a
+EBUILD vigra-1.8.0.ebuild 2752 RMD160 9da20b4d4f9a2ed4b3e34328825b678e360e0dbd SHA1 4ad1dc11b026f814d655d40cc94a96890266e1d3 SHA256 503a245db4145768a3638efcc0b868864ef6df337e9838827081377973245125
+MISC ChangeLog 7344 RMD160 5e7a2299af8003a599a2837ee964b5fc69b95bba SHA1 0e970e8b22d5d227c597d72d486c7272c1273d8a SHA256 dfc81a4608a95494c593b6ed6007675a461cef77d561173e2839da2d54a0e1f1
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPXexOAAoJEOSiRoyO7jvo51kP/1CrEETYrybpvXSasVNAHmmb
-7ce/SH6kcsEASwTm6uptkkIEvOnc5Rb0y+51dNvGCy1ACjWvYmte1SDDLcDaeR/N
-eZW3ppoFqgjgkJ9d4n+ZLbS95Y+E1OR0+/mMGsVZM8o84RFOAiO4SU20vweFwKxd
-R8cx8RnTlJPG/ZKem37PZ4ohSTlN70tG0DqhDr6c6NA9EbM5bIsKNsG9hlZ0LG8c
-vZ7KHwe718CfikBXy6pwlDAjF/D56wVavrIPkxG551SsjtHOLPzvaWUs9a/fP9xL
-A7h30NMF1Lfa8oNoNwBljXd0OSrxy3si/8hyyGNed/Y6uNR5o/gLUstXdeWhZXSQ
-o5NenTfPK/XNHn1+p8IBMPPU9g58oceTukLw+6j+R0uwptsOUsJzRn5jcdmI/RQj
-PX/JWXzuDVtPOaVyK8Xe6nkYA1wXrBgBXZG75nSLmvuk9RLybWgsCMvgGg1tCyyA
-o2++9w07iMP2KYtFFLiimMHqX0BbY+c5hozDA66Vfmu4vYLvhFO7GlKLx/ut4wrG
-AdAW4t/jx4gvV9y3V6Q1BAWkuig2Sqw1Qh9cAMEdZjdzCvJiNEjiH4KeFzJ0NAGh
-arTwmX1juXsSOxfMmdMhaKnZ85U/OeAg0eIlKOVmQBtdnEcV6EtxIFnssHrzDtXJ
-VkjwCkoMftP2TC5B4mFV
-=KR1c
+iQIcBAEBCgAGBQJPuCuMAAoJENwGBM22xffeCEcQAJdnZREliJI6RRXSSnJ+q60b
+nJsziLjRZN7CBYBCBC7//g/3MKQLHbplrxYw2U+2wRDRFOkLofawSpxbTUNzh0R1
+JT2PFz8MMz4t2aDTysuluoEYre+i3LGBGCe6i6JRu7WmHPO+Hc+LjgY9zGSArCQX
+Nirx9taSuGhfzdWZbj7f3SFBQJyGLLgr21i5y+akvoKrSir+prGs5FVozJlJ0eop
+77Q+IhVqqWk2t33OPfjL3HZWDdQndfgZ2ronNYn2JvHoUNYeW6r/wb/Ki5DdOaHL
+FND/7v5l022SamIKPlVg3bZWJI/yA7ZxwEtkZjpKXPIUeBKQE6Sh3h4FroZldBpA
+LRGHtdo1Uook0xYTOEbVzP2M1sEv2YBkaHQq9ytoYiM8yn0OYb+xqZzjHrW+4tDQ
+gJXRMEoetfYhbxkNvV8nPb5KXZX/vpF/w673OfWoYsWFEZ1dCFheDEKl81mCSODq
+LgN6s+PFnL/FgGOom8eqI+k6UKGL6ZYfPHHHeheyDCCaYFg0B3nMC+fzhrgJhIgb
+oPV11tkXO0YyA58URqlD/8sFURtwbfwcW3UG1eLlWbucSjQhpxyyXUFqcKum9MP7
+acrMPVn9yIaHS2fhVOQGt//0lxMAFkgE0+asBaqKVLVfLlKBUFz8A3KxiexFfSYR
+UNoQrBl4eF6zdqoafd39
+=ECGR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/vigra-1.8.0-automagicness.patch b/media-libs/vigra/files/vigra-1.8.0-automagicness.patch
new file mode 100644
index 000000000000..8f0c5fff0650
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-automagicness.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b75688..18d01ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,19 +46,38 @@ ENDIF ()
+ ##################################################
+ 
+ INCLUDE(VigraFindPackage)
++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)
++
++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_OPENEXR)
+ VIGRA_FIND_PACKAGE(OpenEXR)
++endif()
++if(WITH_FFTW3)
+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3)
++endif()
+ IF(WITH_HDF5)
+     VIGRA_FIND_PACKAGE(HDF5)
+ ENDIF()
+ 
+ SET(DOXYGEN_SKIP_DOT TRUE)
++if(ENABLE_DOC)
+ FIND_PACKAGE(Doxygen)
+ FIND_PACKAGE(PythonInterp)
++endif()
+ 
+ IF(WITH_VIGRANUMPY)
+     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
+@@ -317,10 +336,4 @@ ELSE()
+   MESSAGE( STATUS "  vigranumpy will NOT be installed" )
+ ENDIF()
+ 
+-IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR
+-   NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND)
+-  MESSAGE( STATUS "" )
+-  MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" )
+-ENDIF()
+-
+ MESSAGE( STATUS "---------------------------------------------------------" )
diff --git a/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch b/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch
new file mode 100644
index 000000000000..f4bb98ac62c6
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch
@@ -0,0 +1,28 @@
+diff --git a/vigranumpy/docsrc/CMakeLists.txt b/vigranumpy/docsrc/CMakeLists.txt
+index 547cf81..d12a6f7 100644
+--- a/vigranumpy/docsrc/CMakeLists.txt
++++ b/vigranumpy/docsrc/CMakeLists.txt
+@@ -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 @@ IF(PYTHON_SPHINX)
+             ${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 @@ ELSE(PYTHON_SPHINX)
+         "(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.8.0.ebuild b/media-libs/vigra/vigra-1.8.0.ebuild
new file mode 100644
index 000000000000..90abeca5e074
--- /dev/null
+++ b/media-libs/vigra/vigra-1.8.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0.ebuild,v 1.1 2012/05/19 23:23:15 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+PYTHON_USE_WITH_OPT="python"
+PYTHON_USE_WITH="threads xml"
+
+MY_P=${P}-src
+
+inherit base cmake-utils multilib python
+
+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"
+
+RDEPEND="
+	>=dev-libs/boost-1.40[python?]
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( sci-libs/hdf5 )
+	jpeg? ( virtual/jpeg )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		python? ( dev-python/sphinx )
+	)
+	test? (
+		python? ( dev-python/nose )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-automagicness.patch"
+	"${FILESDIR}/${P}-numpy_doc.patch"
+)
+
+REQUIRED_USE="
+	doc? ( hdf5 fftw )
+	python? ( hdf5 )
+	test? ( hdf5 python fftw )
+"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+DOCS=(README.txt)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# Don't build nor install API docs when not requested
+	use doc || sed -e '/ADD_SUBDIRECTORY(docsrc)/d' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+
+	# required for ddocdir
+	_check_build_dir init
+	# vigranumpy needs python and if enabled it ooms
+	# doc needs doxygen and python
+	# walgrind no use for us since we restrict test
+	# $(cmake-utils_use_with valgrind VALGRIND)
+	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_install() {
+	cmake-utils_src_install
+
+	# drop useless cmake files from libdir
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN}/
+}
+
+src_test() { : ; }
+# bug 390447
+
+pkg_postinst() {
+	use python && python_mod_optimize vigra
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup vigra
+}