Fixed automagic doxygen usage

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

4 files changed, 48 insertions, 12 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/Manifest b/sci-libs/gamer/Manifest
index 5724df4606a3..21dec7391d01 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.4-doc.patch 535 RMD160 cf367f54358caf438edf91341138d7eeb9d785ba SHA1 7142b84ff0d17a19cd81c4208563e159f08637c0 SHA256 dadce11b0201712e55bf1ddc095f174b2ea5424ce37c29ac7f815b4211a27a95
 AUX 1.4-multilib.patch 849 RMD160 693534c70383f42f9786f477390af6e3f85da496 SHA1 282270bee8df24be47ed094d42ad835c3f1c0e9a SHA256 6ad93bb5d1d8826cacf8cf4be4d3b7be40fadd9e2b8eac69068637a08160d740
 DIST gamer-1.4.tar.gz 3948295 RMD160 13710685ea1675cf4a60fcb6b55613ccccfe27c2 SHA1 3e7873ae5418b9fc8995fd2941a6597faadad664 SHA256 8b4177556e2868632dee3ffd941903ded4f763b0955b616b8bf97809c0e75ce1
-EBUILD gamer-1.4.ebuild 956 RMD160 965a6874964259dbae909c4cd8adefbb30038e9b SHA1 ea5773627af8c8ee492ca63517acac76490dd90a SHA256 c96fb7f3080356db14e38db8cf8c0523a1fbb7696678eafa908c2b39a30fe70b
-MISC ChangeLog 351 RMD160 d54af7d68aa7faf31fd77ff8f5dc4439fa9db06b SHA1 7fbdae06137caae02cd3da30aa900d54dce43f7c SHA256 72924e2cb14ac25d2f53ae149ed087542fec10cb187734f50746e7bba65f9ba8
+EBUILD gamer-1.4.ebuild 1188 RMD160 002f00f8d1e766abe9f027519cfc18761f530708 SHA1 384e901078f1f12ddcb37caa0e0e44f43840bc3c SHA256 725dbe163d93803d7e937c6fc570ee458762b018ea8a0a1ec0875aecc9eafad7
+MISC ChangeLog 473 RMD160 2b8bcb713f502b9603378e98294b4c33d783cc8c SHA1 37c0a4a69b236d4dc5731ab8e0d9b001cd71b1bd SHA256 84d3515b8200879aa3c6529895e50611b2408e25deb3028a38e6753c3e618c53
 MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzOzv4ACgkQgAnW8HDreRbx+ACfTAj+QHPZBBekwI+Ug5+tLmx2
-G2QAn2yjf7jSq9RP0qlS9xwcznQ3d8yw
-=d8l/
+iEYEARECAAYFAkzPyXoACgkQgAnW8HDreRYybQCfXLpxFP50pM4X7OWZMfXfKavK
+JC0AoKvPVcBSNaMQu3WWXi6H61L00oPC
+=EZxy
 -----END PGP SIGNATURE-----
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() {