Make API docs truly optional, bug 385645.

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

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index c4c19b40a17fb2ff2d7ea1dc98a859a8ceb2334e..ec7f5af564a55148f7e33109ac3bc1a0d00753bf 100644 (file)
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2011/10/04 21:37:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.36 2011/10/05 22:06:11 reavertm Exp $
+
+*vigra-1.7.1-r1 (05 Oct 2011)
+
+  05 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> +vigra-1.7.1-r1.ebuild:
+  Make API docs truly optional, bug 385645.
 
   04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> vigra-1.7.1.ebuild:
   x86 stable wrt bug #385217

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index adeffbeda582d9ca762024d0dfa33f3b22db72ed..9da02f61969f583a0a1e6ce216175d935748c370 100644 (file)
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 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
@@ -13,13 +13,14 @@ AUX vigra-1.6.0-ldflags.patch 543 RMD160 a4ec09c3c4667f67b8b0be48d65fe5ba0e7d3d1
 DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8170b SHA1 f90f54da31a6544057c25df7dbcc6954604de079 SHA256 4fe9052085330300f8c8564021b67fc2c5d534132ef29e781d839feb5d5c0ec2
 DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 EBUILD vigra-1.6.0.ebuild 1789 RMD160 69179708fa9529d8f407c287387074ba1919114e SHA1 9cc802878bdfdf969565d4206d8608445163f554 SHA256 3b65150bb7c379a9c2c84e7c8801a70f612dbb5e3d01e86a95874badc958a5aa
+EBUILD vigra-1.7.1-r1.ebuild 2523 RMD160 775af157bab33b8404a7957aff5e4dbf5af77d2a SHA1 b3b8621fd5756594ed72ffd942e49bed690f6041 SHA256 c18e7f5f43474e7e5ce27f572fe84e57d530c4594f0c7ef4cd26af1b62ba9077
 EBUILD vigra-1.7.1.ebuild 2370 RMD160 e17d6d58c5c74f176bcf3be34f64afd0ceacd734 SHA1 c7267d750f7ef30c473c8d42aa255736c6b03548 SHA256 09030d1a01f63b595a57609debdaf1977eeb8fc42aa8c00b77f4bc8413b7706a
-MISC ChangeLog 5015 RMD160 5b79a907a8e18b3afb6ecdd56d8143b9e5a56c9f SHA1 e43dbf5f2b2a22f3de8e41e818064b069de51b4d SHA256 92d76f2985674869d87a7bee72327e92c4ea37178da89bbf4683e6a65fb9cb54
+MISC ChangeLog 5167 RMD160 14d50ecfc1516733308e1ba8bddb1d18f810267d SHA1 926d10ab3eda205da720a5abb0a18437ec0cca47 SHA256 c719eb4bd4c302276455f5f912dd3c1235a66a5e3736580b2cf8fbfe0e6133a8
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk6LfLUACgkQuUQtlDBCeQKrfACfXGDc3DTsUNEivjSDzlOZSEKj
-P2sAnAwFXn8GAxNCr59ImsgyfPmpIpcv
-=xYik
+iEYEARECAAYFAk6M1NgACgkQFuHa/bHpVdsKuACeN/EowE99DUFTX92/uCqSETKH
+fL4AoMVhEkGozQesOFHeBrhqYmnKRVGa
+=Nnh7
 -----END PGP SIGNATURE-----

diff --git a/media-libs/vigra/vigra-1.7.1-r1.ebuild b/media-libs/vigra/vigra-1.7.1-r1.ebuild
new file mode 100644 (file)
index 0000000..5c597c5
--- /dev/null
+++ b/media-libs/vigra/vigra-1.7.1-r1.ebuild
@@ -0,0 +1,105 @@
+# 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-r1.ebuild,v 1.1 2011/10/05 22:06:11 reavertm Exp $
+
+EAPI=4
+
+MY_P=${P}-src
+inherit base cmake-utils multilib
+
+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"
+IUSE="doc +fftw +hdf5 +jpeg +png +python test +tiff"
+
+RDEPEND="
+       dev-libs/boost
+       fftw? ( >=sci-libs/fftw-3 )
+       hdf5? ( sci-libs/hdf5 )
+       jpeg? ( virtual/jpeg )
+       png? ( media-libs/libpng )
+       python? (
+               || ( dev-lang/python:2.6 dev-lang/python:2.7 )
+       )
+       tiff? ( media-libs/tiff )
+"
+DEPEND="${RDEPEND}
+       doc? (
+               app-doc/doxygen
+               python? ( dev-python/sphinx )
+       )
+       test? (
+               python? ( dev-python/nose )
+       )
+"
+
+PATCHES=(
+       "${FILESDIR}/1.7.1-png-1.5.patch"
+       "${FILESDIR}/1.7.1-automagicness.patch"
+       "${FILESDIR}/1.7.1-hdf5.patch"
+       "${FILESDIR}/1.7.1-gcc4.6.patch"
+       "${FILESDIR}/1.7.1-numpy_doc.patch"
+       "${FILESDIR}/1.7.1-fix-tests.patch"
+       "${FILESDIR}/1.7.1-fix-nosetest.patch"
+)
+
+REQUIRED_USE="
+       doc? ( hdf5 fftw )
+       python? ( hdf5 )
+       test? ( hdf5 python fftw )
+"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+DOCS=(README.txt)
+
+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 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}/
+}