diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-29 11:49:33 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-29 11:49:33 +0000 |
| commit | 80fa7fc5e1a59e80360b9e4d4714cf60540445dd (patch) | |
| tree | 309a87232126aa1ac8531be36af0fd59f674a606 /media-libs/vigra | |
| parent | Remove -g from CPPFLAGS wrt #376903 by Agostino Sarubbo (diff) | |
| download | gentoo-2-80fa7fc5e1a59e80360b9e4d4714cf60540445dd.tar.gz gentoo-2-80fa7fc5e1a59e80360b9e4d4714cf60540445dd.tar.bz2 gentoo-2-80fa7fc5e1a59e80360b9e4d4714cf60540445dd.zip | |
Add doc support for the vigra package.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/vigra')
| -rw-r--r-- | media-libs/vigra/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.7.1.ebuild | 36 |
2 files changed, 28 insertions, 13 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/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 |