Fixed automagic doxygen usage

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

4 files changed, 46 insertions, 12 deletions

diff --git a/media-libs/sg/ChangeLog b/media-libs/sg/ChangeLog
index b81dad342a74..3a14d421182f 100644
--- a/media-libs/sg/ChangeLog
+++ b/media-libs/sg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.1 2010/11/01 13:59:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.2 2010/11/02 08:59:07 jlec Exp $
+
+  02 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-doc.patch,
+  sg-1.4.ebuild:
+  Fixed automagic doxygen usage
 
 *sg-1.4 (01 Nov 2010)
 
diff --git a/media-libs/sg/Manifest b/media-libs/sg/Manifest
index b7bcbdf0dc33..4bd13aab4419 100644
--- a/media-libs/sg/Manifest
+++ b/media-libs/sg/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.4-doc.patch 526 RMD160 ae3489deacb5e1b1be7b2f294d4d140a440d72c4 SHA1 824ed0c4a6a85f505f2ea79fe8bbe4ae3327e36f SHA256 1b8aa95f81921f8bc4f0c5a920464411eb771087632f459fc1e1fe00901794cb
 AUX 1.4-opengl.patch 2304 RMD160 d05d3da21999311c6a21cc1e86a49f4be72b4f8c SHA1 a0b771515e3f6231eafb5dcb405b09b26df441b5 SHA256 eb17a5c419e3e586e80aafe19620f4db0c5e066348568e65de2885db876299d9
 DIST sg-1.4.tar.gz 2860654 RMD160 b1a6a774ccffcd1b9c57917b51f73feba5e08da8 SHA1 1dc69218b85e076adb4ae587021c0d5327e1d291 SHA256 1f4199a97630b68dff6b19db482a327ef3e0f0153891391704b5f97a8090fc04
-EBUILD sg-1.4.ebuild 1475 RMD160 a754a1b04aa65f0887478628d8347f23709136a2 SHA1 4757155dc0028c79853aa884ec996b6c1f0cd2ca SHA256 7cf6196aa603e1c2ebfb99a126a81db8d8ef9e92e3c868ce50b022cae70852a7
-MISC ChangeLog 341 RMD160 e77875efa5dd13673dd6ffafe4408859264a5a5d SHA1 b7ce0b8fe30b3eec1062a9f1fde11daa18a78ebf SHA256 172a2b8a4e2442da33439a97c373d6080e2b9bbd4edf87a783e68ef346f63b3e
+EBUILD sg-1.4.ebuild 1674 RMD160 ca19d72b6e61192514c77a125a1e7e5107e816c3 SHA1 954309ed4d568b228506ebf12efba1305244c5c5 SHA256 8d23eebc980462bdad682f5c70aaae2397f07d8f5b3d31363e70fbb0290b6e9d
+MISC ChangeLog 460 RMD160 a9ac22b15d81a17021db6bf6ceaf44a008999816 SHA1 95eebc38a5abad2228490f44fec1dc9566ef4016 SHA256 250d2b6de18f7074408d2112e04a01d56b7fda075593597533e4757849ea15e0
 MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzOx9oACgkQgAnW8HDreRbqvQCfeKqAeaV3vCd/WFdKyCOeIjYW
-vOoAoMy0/NUazV+wdQWtI25LjCSwyEPd
-=WqTM
+iEYEARECAAYFAkzP0uAACgkQgAnW8HDreRZkPACgnC+UXNrMrp5ZmCztkE2KlaKD
+ek8AoLB08ag8UHBBC7HvAVNdihTzpmsU
+=lYzf
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sg/files/1.4-doc.patch b/media-libs/sg/files/1.4-doc.patch
new file mode 100644
index 000000000000..cfc1b21b20cb
--- /dev/null
+++ b/media-libs/sg/files/1.4-doc.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
+index 3ee562c..7f424e8 100644
+--- a/doc/doxygen/Makefile.am
++++ b/doc/doxygen/Makefile.am
+@@ -29,13 +29,11 @@
+ ## Author:  Michael Holst
+ ## ###########################################################################
+ 
+-docdir = @prefix@/doc/sg
+-
+ doc_DATA = sg_doc
+ 
+ sg_doc: 
+ 	$(doxygen_path) $(top_srcdir)/doc/doxygen/sg.dox
+ 
+ install-docDATA:
+-	mkdir -p $(docdir)
+-	cp -r ../api $(docdir)/
++	mkdir -p $(DESTDIR)/@docdir@
++	cp -r ../api $(DESTDIR)/@docdir@/
diff --git a/media-libs/sg/sg-1.4.ebuild b/media-libs/sg/sg-1.4.ebuild
index a23f0727e2cd..0969b839fd96 100644
--- a/media-libs/sg/sg-1.4.ebuild
+++ b/media-libs/sg/sg-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/media-libs/sg/sg-1.4.ebuild,v 1.1 2010/11/01 13:59:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.4.ebuild,v 1.2 2010/11/02 08:59:07 jlec Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-IUSE="opengl"
+IUSE="doc opengl"
 
 RDEPEND="
 	dev-libs/maloc
@@ -22,13 +22,19 @@ RDEPEND="
 		virtual/glu
 		virtual/opengl
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen )"
 
 S="${WORKDIR}"/${PN}
 
 src_prepare() {
 	rm src/{gl,glu,glw} -rf
-	epatch "${FILESDIR}"/${PV}-opengl.patch
+	epatch \
+		"${FILESDIR}"/${PV}-opengl.patch \
+		"${FILESDIR}"/${PV}-doc.patch
 	eautoreconf
 }
 
@@ -50,12 +56,15 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"
 
+	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+
 	use opengl && myconf="${myconf} --enable-glforce --enable-gluforce --enable-glwforce"
 
 	econf \
-		${myconf} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-triplet \
 		--enable-shared \
-		--disable-triplet
+		${myconf}
 }
 
 src_install() {