Version bump

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

4 files changed, 209 insertions, 1 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/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
+}