Add doc support for the vigra package.

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

3 files changed, 33 insertions, 18 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 35e35fba7f0c..628660a98444 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.30 2011/05/03 07:41:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.31 2011/07/29 11:49:33 scarabeus Exp $
+
+  29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> vigra-1.7.1.ebuild:
+  Add doc support for the vigra package.
 
   03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/1.7.1-gcc4.6.patch, vigra-1.7.1.ebuild:
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 65a7b854e0f3..7c68ca144e76 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -11,13 +11,13 @@ DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8
 DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 EBUILD vigra-1.6.0-r1.ebuild 1868 RMD160 08c8f8cf69882a08bf592338e21fd9d217f8ec1f SHA1 ee0998c032b980d83ba22c87d4529baf038f8528 SHA256 ca2a73b0793148da0324090b88c116b3a0980aa86638ade881f4d8dfa700303c
 EBUILD vigra-1.6.0.ebuild 1789 RMD160 69179708fa9529d8f407c287387074ba1919114e SHA1 9cc802878bdfdf969565d4206d8608445163f554 SHA256 3b65150bb7c379a9c2c84e7c8801a70f612dbb5e3d01e86a95874badc958a5aa
-EBUILD vigra-1.7.1.ebuild 1944 RMD160 311232d634a4ca294f5b7708975b6f1f0d267e3c SHA1 80594094e1c96d48f8e6c42ac269e5d166979539 SHA256 23e50dbbd5098d84af4f7e749569620d6c763455853950541818a7853f47b078
-MISC ChangeLog 4185 RMD160 6914083cab39e1e3b325d7e461a2b77804031fd2 SHA1 9f4e279c41dac75427bf3fd05d47993acab37df6 SHA256 c3beb3dbf67faa5a2b1fd97ef7a4c95e4b428f882f7556cfbec3e39c55931808
+EBUILD vigra-1.7.1.ebuild 2036 RMD160 66ff252603f5a013aa71e0b087db023619b7037e SHA1 c6f0b40ebd92a02c34a415f038f94d92b688b238 SHA256 b5ddcb8ffe3676835b94a970adb6cfa33020b9db4402b524c66d495543444b6c
+MISC ChangeLog 4302 RMD160 1975a3bc32248cf003d3362b1b3c654f03284957 SHA1 77247fe2005dbc8929db1b22adccb1654ea60715 SHA256 49be56736a19b95e7256ee4e4af59958b3b42e985820fd440b393475b962ab5a
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2/sZIACgkQHB6c3gNBRYdOSACgscTCGxqJCs3lsu9TRPzWahJ6
-4sYAoIBFb5mz7one9E3cwS5AoEuZItlJ
-=ESit
+iEYEARECAAYFAk4ynkIACgkQHB6c3gNBRYfABQCfUwiM40RzRRex7p4lvKZPEx4B
+Q1AAoIFRdFoEhubjAmLNiV/VugUHtAWE
+=chxb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/vigra-1.7.1.ebuild b/media-libs/vigra/vigra-1.7.1.ebuild
index bc2683e231b2..a321bdf8acf1 100644
--- a/media-libs/vigra/vigra-1.7.1.ebuild
+++ b/media-libs/vigra/vigra-1.7.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.4 2011/05/03 07:41:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.5 2011/07/29 11:49:33 scarabeus Exp $
 
-EAPI=4
+EAPI=3
 
 MY_P=${P}-src
 inherit base cmake-utils multilib
 
 DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
-HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
-SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${MY_P}.tar.gz"
+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"
@@ -18,12 +18,17 @@ IUSE="doc fftw hdf5 jpeg png test tiff"
 
 RDEPEND="
 	dev-libs/boost
+	fftw? ( >=sci-libs/fftw-3 )
+	hdf5? ( sci-libs/hdf5[-mpi] )
+	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
-	jpeg? ( virtual/jpeg )
-	hdf5? ( sci-libs/hdf5 )
-	fftw? ( >=sci-libs/fftw-3 )"
-DEPEND="${RDEPEND}"
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/1.7.1-png-1.5.patch"
@@ -32,23 +37,25 @@ PATCHES=(
 	"${FILESDIR}/1.7.1-gcc4.6.patch"
 )
 
-# Tests fail because they have hardcoded dependencies on those
-# optional in source so restrict them for now.
-# Possibly could be fixed and sent upstream
+# Restrict tests due to miscompilations
 RESTRICT="test"
 
 src_configure() {
 	local libdir=$(get_libdir)
 
+	# required for ddocdir
+	_check_build_dir init
 	# vigranumpy needs python so i can't test
 	# 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}"
-		"-DENABLE_DOC=OFF"
+		"-DWITH_VALGRIND=OFF"
 		"-DWITH_VIGRANUMPY=OFF"
+		$(cmake-utils_use_enable doc DOC)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with tiff)
@@ -62,6 +69,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_make doc
+}
+
 src_install() {
 	cmake-utils_src_install