diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-11-02 08:02:34 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-11-02 08:02:34 +0000 |
| commit | 8d206c3fbff1e80655d30d869cc35e0015d010e1 (patch) | |
| tree | d4af7902318baf3bc258f785fc92b70cd330fd51 /dev-libs/maloc | |
| parent | Version bump mercurial to 1.7. (diff) | |
| download | gentoo-2-8d206c3fbff1e80655d30d869cc35e0015d010e1.tar.gz gentoo-2-8d206c3fbff1e80655d30d869cc35e0015d010e1.tar.bz2 gentoo-2-8d206c3fbff1e80655d30d869cc35e0015d010e1.zip | |
Fixed automagic doxygen usage
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/maloc')
| -rw-r--r-- | dev-libs/maloc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/maloc/files/1.4-doc.patch | 21 | ||||
| -rw-r--r-- | dev-libs/maloc/maloc-1.4.ebuild | 16 |
3 files changed, 38 insertions, 5 deletions
diff --git a/dev-libs/maloc/ChangeLog b/dev-libs/maloc/ChangeLog index e934d84520fa..f068b264c744 100644 --- a/dev-libs/maloc/ChangeLog +++ b/dev-libs/maloc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/maloc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.19 2010/10/31 14:23:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/ChangeLog,v 1.20 2010/11/02 08:02:34 jlec Exp $ + + 02 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-doc.patch, + maloc-1.4.ebuild: + Fixed automagic doxygen usage *maloc-1.4 (31 Oct 2010) diff --git a/dev-libs/maloc/files/1.4-doc.patch b/dev-libs/maloc/files/1.4-doc.patch new file mode 100644 index 000000000000..73be364812cc --- /dev/null +++ b/dev-libs/maloc/files/1.4-doc.patch @@ -0,0 +1,21 @@ +diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am +index 2686292..8f77fe2 100644 +--- a/doc/doxygen/Makefile.am ++++ b/doc/doxygen/Makefile.am +@@ -29,14 +29,12 @@ + ## Author: Michael Holst + ## ########################################################################### + +-docdir = @prefix@/doc/maloc +- + doc_DATA = maloc_doc + + maloc_doc: + $(doxygen_path) $(top_srcdir)/doc/doxygen/maloc.dox + + install-docDATA: +- mkdir -p $(docdir) +- cp -r ../api $(docdir)/ ++ mkdir -p $(DESTDIR)/@docdir@ ++ cp -r ../api $(DESTDIR)/@docdir@ + diff --git a/dev-libs/maloc/maloc-1.4.ebuild b/dev-libs/maloc/maloc-1.4.ebuild index 024638f8ec4e..794eb8d77117 100644 --- a/dev-libs/maloc/maloc-1.4.ebuild +++ b/dev-libs/maloc/maloc-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/dev-libs/maloc/maloc-1.4.ebuild,v 1.1 2010/10/31 14:23:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.4.ebuild,v 1.2 2010/11/02 08:02:34 jlec Exp $ EAPI="3" @@ -12,11 +12,14 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -IUSE="mpi static-libs" +IUSE="doc mpi static-libs" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" sys-libs/readline + doc? ( + media-gfx/graphviz + app-doc/doxygen ) mpi? ( virtual/mpi )" DEPEND="${RDEPEND}" @@ -25,18 +28,23 @@ S="${WORKDIR}/${PN}" src_prepare() { epatch \ "${FILESDIR}"/${PV}-mpi.patch \ - "${FILESDIR}"/${PV}-asneeded.patch + "${FILESDIR}"/${PV}-asneeded.patch \ + "${FILESDIR}"/${PV}-doc.patch eautoreconf } src_configure() { + local myconf use mpi && export CC="mpicc" + use doc || myconf="${myconf} --with-doxygen= --with-dot=" econf \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ $(use_enable mpi) \ $(use_enable static-libs static) \ --disable-triplet \ - --enable-shared + --enable-shared \ + ${myconf} } src_install() { |