Fixed automagic doxygen usage

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

4 files changed, 44 insertions, 10 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/Manifest b/dev-libs/maloc/Manifest
index fd8b815c24ca..c10d2342b790 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX 0.2.1-asneeded.patch 525 RMD160 ca668ffe9ff62d609055b16ced6429571a411866 SHA1 1e98144533411489f80943e5b678bb792361496f SHA256 46f6b4bb0ee25040a7d0117341acebb4e6e9c459737abf0f04772b8dc42e6991
 AUX 0.2.1-mpi.patch 653 RMD160 da9fa5ea837b68538c8c43930d30e9cdeabf1ccf SHA1 eaaf73f2cd210c63bb8ed841481744e587869884 SHA256 9d76868accbd89a8960bd61a35d20da359d4f04744761e0b12fb05440a106800
 AUX 1.4-asneeded.patch 533 RMD160 d80bdc8d199b9cd335d56d2673adae0697c08bcc SHA1 048c038adec7941303c55e9c3a46f01d80b6afc2 SHA256 7c6b2fbe5d159dd2646865b7d182c82d30fd9891959a08af8df7796edf5baf60
+AUX 1.4-doc.patch 539 RMD160 1ad12e1470ae8f25d8a27d20cdaa0fd5cda4c63e SHA1 a2bbabf10efa12a57426aa7915ac5e379112dea2 SHA256 1d57cf372751ea99eba4156c7933e60574da7790e3e7e8bca9718db65e549ed8
 AUX 1.4-mpi.patch 652 RMD160 8f4f13ef3d5440e6df76a0cce734755ada5419a3 SHA1 7127fb76bfd938f852a73a775501f66f22e2bb22 SHA256 db2d9dcbb369988a08e59cea750df35fc91d0d375204d24df03f9c9b66ca4f93
 DIST maloc-0.2-1.tar.gz 739622 RMD160 503cccc43a6e7de76e1ec33c11b45a9f764f9e6b SHA1 2f1b0a0cbc38eda5324228deabc1ea59e4e2253c SHA256 9b29c4b6401adf20ce1ab3c47fe71066ca7952eb10db4b1e6b1440973f616cda
 DIST maloc-1.4.tar.gz 797520 RMD160 52890e85bf94073409a30e80006ae933cc7b738b SHA1 e5a677463a88a8022babf0ed896cb086f00d10bd SHA256 cba0c6730f148bf7ddb77dac07e497655642f43b632256fcebf3192b45af1833
 EBUILD maloc-0.2.1-r3.ebuild 1308 RMD160 28930a2f4f588d34a7e84efd155d51da40d07d76 SHA1 4b0c9ebce66f5bf8234befb1956573ef918b8d35 SHA256 c9b3122e0119e197572dcc65de537ca14a0a7670e3f199d1d2e96a8585702ecb
-EBUILD maloc-1.4.ebuild 1085 RMD160 08c3d705e55e3dc9c742ea2d4b52a4c9aed4db4d SHA1 5e4c99737002b488caf0f4b30528fc1e183ac03d SHA256 08dc26c84a3684aa29331ca2a030aa95fa4aabd5b8b8ce036c489b06daffd24d
-MISC ChangeLog 2667 RMD160 f5f5cfb56d888065fb7e9e4f60d3f8a9c060472b SHA1 b8a154ed132db31b1be582c35d5e94ddd3973dde SHA256 df88a4aa1c8041c03274f361974a7ea207921c35c79f76d2fddfd2df2cae6a90
+EBUILD maloc-1.4.ebuild 1305 RMD160 73db285ba587ac26c99255c667018e3fac4c5b3e SHA1 ffdde7e0ed81f8b48dd59b6fff11b6f2e2ee5961 SHA256 06b044429c2d4006433011dfcf2ffc2cff4675e887531dd5c8ba356b834c5d7e
+MISC ChangeLog 2789 RMD160 b439963a775acf2adc5e8c64f89f6c66e6d5aa93 SHA1 ef5fbd19ddb555cd0f37c239c7d75aacbca19805 SHA256 8cd9e8251a7ace2474ff3be3fd7cffd01527355e92871c6e188b0f1faee4a51d
 MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzNe9UACgkQgAnW8HDreRY1ZQCfe7Ee0kwh6RhnQau5UXwxUl8J
-dsMAoI7ZorhQdigNArKO6HMAWFJ3olP3
-=z6Do
+iEYEARECAAYFAkzPxZ0ACgkQgAnW8HDreRbPcwCgt793AhD+uoKvnSSACqRd7npU
+WacAn1aL2P8Q5bXTzOjzdlPXKkmReWJk
+=y2Iy
 -----END PGP SIGNATURE-----
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() {