diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-11-02 08:19:02 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-11-02 08:19:02 +0000 |
| commit | 1d38b761e1ec15c246e61b28a0062479751e9ad5 (patch) | |
| tree | 7606b3e9938146126d0c50c668254f1b07c17b56 | |
| parent | Fixed automagic doxygen usage (diff) | |
| download | gentoo-2-1d38b761e1ec15c246e61b28a0062479751e9ad5.tar.gz gentoo-2-1d38b761e1ec15c246e61b28a0062479751e9ad5.tar.bz2 gentoo-2-1d38b761e1ec15c246e61b28a0062479751e9ad5.zip | |
Fixed automagic doxygen usage
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
| -rw-r--r-- | sci-libs/gamer/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gamer/files/1.4-doc.patch | 20 | ||||
| -rw-r--r-- | sci-libs/gamer/gamer-1.4.ebuild | 23 |
3 files changed, 42 insertions, 7 deletions
diff --git a/sci-libs/gamer/ChangeLog b/sci-libs/gamer/ChangeLog index 9faf6e296fb0..27691c8025fd 100644 --- a/sci-libs/gamer/ChangeLog +++ b/sci-libs/gamer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/gamer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.1 2010/11/01 14:30:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.2 2010/11/02 08:19:02 jlec Exp $ + + 02 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-doc.patch, + gamer-1.4.ebuild: + Fixed automagic doxygen usage *gamer-1.4 (01 Nov 2010) diff --git a/sci-libs/gamer/files/1.4-doc.patch b/sci-libs/gamer/files/1.4-doc.patch new file mode 100644 index 000000000000..642601bcc17b --- /dev/null +++ b/sci-libs/gamer/files/1.4-doc.patch @@ -0,0 +1,20 @@ +diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am +index 4067c1c..43867e2 100644 +--- a/doc/doxygen/Makefile.am ++++ b/doc/doxygen/Makefile.am +@@ -9,13 +9,11 @@ + ## Author: Michael Holst + ## ########################################################################### + +-docdir = @prefix@/doc/gamer +- + doc_DATA = gamer_doc + + gamer_doc: + $(doxygen_path) $(top_srcdir)/doc/doxygen/gamer.dox + + install-docDATA: +- mkdir -p $(docdir) +- cp -r ../api $(docdir)/ ++ mkdir -p $(DESTDIR)/@docdir@ ++ cp -r ../api $(DESTDIR)/@docdir@ diff --git a/sci-libs/gamer/gamer-1.4.ebuild b/sci-libs/gamer/gamer-1.4.ebuild index ea3b6f633c5f..3460016530db 100644 --- a/sci-libs/gamer/gamer-1.4.ebuild +++ b/sci-libs/gamer/gamer-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.4.ebuild,v 1.1 2010/11/01 14:30:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.4.ebuild,v 1.2 2010/11/02 08:19:02 jlec Exp $ EAPI="3" @@ -13,21 +13,30 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="GPL-2" -IUSE="" +IUSE="doc" -RDEPEND="dev-libs/maloc" -DEPEND="${RDEPEND}" +RDEPEND=">=dev-libs/maloc-1.4" +DEPEND=" + ${RDEPEND} + doc? ( + media-gfx/graphviz + app-doc/doxygen )" S="${WORKDIR}"/${PN} src_prepare() { - epatch "${FILESDIR}"/${PV}-multilib.patch + epatch \ + "${FILESDIR}"/${PV}-multilib.patch \ + "${FILESDIR}"/${PV}-doc.patch eautoreconf } src_configure() { local fetk_include local fetk_lib + local myconf + + use doc || myconf="${myconf} --with-doxygen= --with-dot=" fetk_include="${EPREFIX}"/usr/include fetk_lib="${EPREFIX}"/usr/$(get_libdir) @@ -35,8 +44,10 @@ src_configure() { export FETK_LIBRARY="${fetk_lib}" econf \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ --disable-triplet \ - --enable-shared + --enable-shared \ + ${myconf} } src_install() { |