Fixed automagic doxygen usage

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 59 insertions, 19 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index 17f190b710fb..7ba233d4987e 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/punc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.5 2010/10/31 15:01:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.6 2010/11/02 08:37:41 jlec Exp $
+
+  02 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-doc.patch,
+  punc-1.4.ebuild:
+  Fixed automagic doxygen usage
 
   31 Oct 2010; Justin Lecher <jlec@gentoo.org> files/1.4-linking.patch:
   Added missing linking libs
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 60e5e725c50a..fc9f038062a7 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX 0.2_p1-configure.patch 2119 RMD160 6cc11262aff3e8fc976c0bb23216fb1367ac59d6 SHA1 c24928f41d87a502629e87a16e8515e640951e28 SHA256 3591f2f8cdeb1582b12d04f7c66420e6581a70a66e3f9cc735f156cd02739e26
 AUX 0.2_p1-underlinking.patch 5390 RMD160 a7b54e8bda912e5b1d6f51d4d5242a6c31a7c9bf SHA1 82f77e70dd48cb7522e5866e916e07d47df77ed0 SHA256 f5fa9af72c719d8f346fb2e49aa3d690087bf66dfcfeabbd7de53600f1df2911
+AUX 1.4-doc.patch 534 RMD160 1ad6b3124686b4f64c3265855ed54b28eb38cbee SHA1 1a5f91fe46b619810c7f171c0953eeb0d1696a55 SHA256 625da0650f17e89b7be3fff73a10e47a6d9ead1ba7e25644c5c4f54a53c79c40
 AUX 1.4-linking.patch 5885 RMD160 c9ec7898c770187244a79402ee9245e44be2f23f SHA1 22bc29068cd058591a4cefecab7ba6b447dbc136 SHA256 fc9c93ce34e86f8c1f62a047e332b3a90f95cf426aa357a04b4cd3a577c0328c
 AUX punc-0.2_p1-libdir.patch 602 RMD160 045d2cca71835a4288d4a599231d508f8f41629a SHA1 456de24ccdf603eb40ffdaf9ee59a412ce6967ff SHA256 04303cfbe7655a9fdfc4e56c94652cdab6a0a1e6635585cd7451a046685e2c1c
 DIST punc-0.2-1.tar.gz 6645934 RMD160 c00936f26f7096cb66e0a323f7dc22ea40fdc0d4 SHA1 e7211c9a6067d73a56081df0a5f56021ac16b464 SHA256 05dcbc75191b73d3df5b108308b96c6c557ed9b1bd0611a0cc1956edc5541c5d
 DIST punc-1.4.tar.gz 7036966 RMD160 0f3f690a2a95dddeda21c6d4865c5ec08a451d07 SHA1 59adbba5c40f30e5cccbb26731e8a7d47b0a3087 SHA256 3f85b736924ed691a3452a3bf66e3455e73a200f8d67ae9f0f18eb25a51af181
 EBUILD punc-0.2_p1.ebuild 1586 RMD160 90c158e9ddd5b01eb8778bc0a309766b6b7e426f SHA1 d67d702da457af4deb3d51d942f2057c04d6eac4 SHA256 1b1e912fad8d47e7625187ba3a961f07bc47822721f342ceab310b732f9d8ba3
-EBUILD punc-1.4.ebuild 1709 RMD160 d8c3fe0604079370bad00d4ca1137087711f20bf SHA1 5039345af81748bfbfb9cd00f07ffb96f85a0383 SHA256 09fae67e2c1f4a0e40a9bb0587eb3348ec22d384f6e41ec07c85a8963883eeec
-MISC ChangeLog 929 RMD160 3cb66e418649e7f712e83ecfdcb9af871d82581b SHA1 580707a7152c824c79369c5924f7ba10fdc661e6 SHA256 510a2ad52993745eda5bf206ff3f28b8142edac3beed05e8babbdefc0446824e
+EBUILD punc-1.4.ebuild 1954 RMD160 25d68a17c0aa770104907637651c9b2f9c95aa6e SHA1 98aa710352ef17b6cf576d6d67fa75d58d4a72d7 SHA256 73793babdda11d78af90f6d2a50c5fbe275cbd55cbfeca96b2ff073e54bd73db
+MISC ChangeLog 1050 RMD160 cc1b93f4bf3c1479f4e2ddc65a8d1a9cddfd7a87 SHA1 fb759cda970c23080275fb82095e9455d5d7cf94 SHA256 5548cb3ce2bd64cfd197296ecac6c5b2d2a52334b4a83724d491e5066f6b9266
 MISC metadata.xml 1268 RMD160 1c3eeab7f7f1713110d9012f1a32cc1735349521 SHA1 3cd959da5f7e94c760842dd8067b84b563cced77 SHA256 4dcd334a724ddcd75185f52fb0159c6a2aa5bab4c192634dca7685e22977790f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzNhLoACgkQgAnW8HDreRa5rQCgzrluGf4bD6csCfpt5WktS0uT
-gcUAnRnGhLidEVcmZY1tYE2nSAe5yu5A
-=naF5
+iEYEARECAAYFAkzPzdsACgkQgAnW8HDreRYlIACeJyl/Y1LNfSIFYQFJ2VtT4rYb
+rJgAniEuOo800h99ni/DLAyv0TY/j7kD
+=Svv6
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/punc/files/1.4-doc.patch b/sci-libs/punc/files/1.4-doc.patch
new file mode 100644
index 000000000000..ad17da322f17
--- /dev/null
+++ b/sci-libs/punc/files/1.4-doc.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
+index ca42fe0..264ba82 100644
+--- a/doc/doxygen/Makefile.am
++++ b/doc/doxygen/Makefile.am
+@@ -29,13 +29,11 @@
+ ## Author:  Michael Holst
+ ## ###########################################################################
+ 
+-docdir = @prefix@/doc/punc
+-
+ doc_DATA = punc_doc
+ 
+ punc_doc: 
+ 	$(doxygen_path) $(top_srcdir)/doc/doxygen/punc.dox
+ 
+ install-docDATA:
+-	mkdir -p $(docdir)
+-	cp -r ../api $(docdir)/
++	mkdir -p $(DESTDIR)/@docdir@
++	cp -r ../api $(DESTDIR)/@docdir@/
diff --git a/sci-libs/punc/punc-1.4.ebuild b/sci-libs/punc/punc-1.4.ebuild
index 6fd674aadda6..e55fd253e103 100644
--- a/sci-libs/punc/punc-1.4.ebuild
+++ b/sci-libs/punc/punc-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/punc/punc-1.4.ebuild,v 1.1 2010/10/31 13:30:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.4.ebuild,v 1.2 2010/11/02 08:37:41 jlec Exp $
 
 EAPI="3"
 
@@ -13,9 +13,9 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug mpi static-libs"
+IUSE="debug doc mpi static-libs"
 
-DEPEND="
+RDEPEND="
 	dev-libs/maloc[mpi=]
 	dev-libs/libf2c
 	sci-libs/amd
@@ -25,14 +25,19 @@ DEPEND="
 	sci-libs/umfpack
 	virtual/blas
 	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen )"
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
 	epatch \
-		"${FILESDIR}"/${PV}-linking.patch
+		"${FILESDIR}"/${PV}-linking.patch \
+		"${FILESDIR}"/${PV}-doc.patch
 
 	cp tools/tests/pmg/*.f src/pmg/ -f
 	cp tools/tests/pmg/*.c src/pmg/ -f
@@ -42,21 +47,31 @@ src_prepare() {
 }
 
 src_configure() {
-	export FETK_INCLUDE="${EPREFIX}/usr/include"
-	export FETK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
+	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)
+	export FETK_INCLUDE="${fetk_include}"
+	export FETK_LIBRARY="${fetk_lib}"
 	export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)"
-	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
+	export FETK_BLAS_LIBRARY="${fetk_lib}"
 	export FETK_SUPERLU_LIBRARY="-lsuperlu"
-	export FETK_ARPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
-	export FETK_UMFPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
-	export FETK_CGCODE_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
-	export FETK_AMD_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
+	export FETK_ARPACK_LIBRARY="${fetk_lib}"
+	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
+	export FETK_CGCODE_LIBRARY="${fetk_lib}"
+	export FETK_AMD_LIBRARY="${fetk_lib}"
 
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug vdebug) \
 		--enable-shared \
-		--disable-triplet
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-triplet \
+		${myconf}
 }
 
 src_install() {