add in make apidox

3 files changed, 24 insertions, 9 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 3d047406d787..d9a2d566dffa 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.97 2003/11/01 13:07:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.98 2003/11/08 22:09:26 caleb Exp $
+
+  08 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_beta1.ebuild:
+  Add back in kdelibs apidocs compilation is the user has the doc flag set.
 
 *kdelibs-3.2.0_beta1 (01 Nov 2003)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 4f8e3907360f..745b62324fc4 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,10 +1,10 @@
 MD5 c6d6b8ad780f8c1bbc8f3402c6f9c2e4 kdelibs-3.1.2-r1.ebuild 2539
 MD5 bf687e727fccd8c0546d442135f9333e kdelibs-3.1.4.ebuild 2397
-MD5 b9a530a9abe29b39481bdbe47ab8a0c6 kdelibs-3.2.0_beta1.ebuild 2369
+MD5 7a6a3ead283480034beb3d680254c853 kdelibs-3.2.0_beta1.ebuild 2626
 MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
 MD5 0993a7138e7f50c37cb0eee920fe8d58 kdelibs-3.2.0_alpha2.ebuild 2202
 MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
-MD5 8beefdce975aa0787b383919fbec320a ChangeLog 16628
+MD5 79219bc44cc2477354414e5c52a52542 ChangeLog 16780
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
diff --git a/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild
index 2f693afa7c45..d6ca2fa8251e 100644
--- a/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild,v 1.2 2003/11/03 20:27:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild,v 1.3 2003/11/08 22:09:26 caleb Exp $
 inherit kde
 
 MY_PV=3.1.93
@@ -16,7 +16,6 @@ SRC_URI="mirror://kde/unstable/${MY_PV}/src/${PN}-${MY_PV}.tar.bz2"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
-#RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
 DEPEND="dev-lang/perl
 	>=media-libs/audiofile-0.1.9
 	>=sys-apps/bzip2-1.0.1
@@ -38,9 +37,9 @@ newdepend "/autotools"
 RDEPEND="$RDEPEND
 	app-text/sgml-common
 	cups? ( net-print/cups )
+	doc? ( app-doc/doxygen )
 	dev-lang/python"
 
-
 qtver-from-kdever ${PV}
 need-qt $selected_version
 need-autoconf 2.5
@@ -70,14 +69,27 @@ src_compile() {
 	use x86 && myconf="$myconf --enable-fast-malloc=full"
 
 	kde_src_compile configure make
+
+	use doc && make apidox
 }
 
 src_install() {
 	kde_src_install
 	dohtml *.html
 
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	if [ `use doc` ]; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
 }
 
+pkg_postinst() {
+	if [ `use doc` ]; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}