new beta version

4 files changed, 38 insertions, 24 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ae81f841f64d..56b327f59658 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -2,16 +2,14 @@ MD5 2278730396a0852935751e13d2bd03a1 kdelibs-3.1.2-r1.ebuild 2538
 MD5 4872cc92351bc9f172622a137389535b kdelibs-3.1.4.ebuild 2393
 MD5 8e2c62542b5057932c67d95004293866 kdelibs-3.2.0_beta1.ebuild 2556
 MD5 5494755d3e4e4f90f3acc99cc7377524 kdelibs-3.0.4-r1.ebuild 2302
-MD5 ab23d1dd7c6ea3c9f04ac1dd12c8083e kdelibs-3.2.0_alpha2.ebuild 2203
 MD5 d6ab5cf79db69aa602457a3a95c30e83 kdelibs-3.0.5b-r1.ebuild 1996
-MD5 90fa9e0f3a37cad13218d54fe4d72768 kdelibs-3.2.0_beta2.ebuild 2557
-MD5 ae2b4d2485fd220de78e9944138743c9 ChangeLog 16867
+MD5 d228edf3458de9e947f3d6159885d441 kdelibs-3.2.0_beta2.ebuild 2555
+MD5 1b3ec7ca835786377a99a15ccaf7515f ChangeLog 17054
 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
 MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.4-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 762b24559d7e5b32397efa5526d5d15c files/digest-kdelibs-3.2.0_alpha2 69
 MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
 MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_alpha2 b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_alpha2
deleted file mode 100644
index 2da26156587a..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_alpha2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b853ca00e661f6f48cc61c91ace5a1f kdelibs-3.1.92.tar.bz2 11598065
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2 b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2
new file mode 100644
index 000000000000..842870a698f3
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2
@@ -0,0 +1 @@
+MD5 a74ee346270f3e997f9c2c114fd69c24 kdelibs-3.1.94.tar.bz2 12238846
diff --git a/kde-base/kdelibs/kdelibs-3.2.0_alpha2.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
index 8ae808c98073..9252d964dce8 100644
--- a/kde-base/kdelibs/kdelibs-3.2.0_alpha2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
@@ -1,9 +1,9 @@
 # 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_alpha2.ebuild,v 1.3 2003/11/14 20:07:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.1 2003/12/02 02:02:14 caleb Exp $
 inherit kde
 
-MY_PV=3.1.92
+MY_PV=3.1.94
 S=${WORKDIR}/${PN}-${MY_PV}
 
 IUSE="alsa cups ipv6 ssl"
@@ -16,31 +16,30 @@ 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
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 virtual/alsa )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
+	media-libs/audiofile
+	app-arch/bzip2
+	dev-libs/libxslt
+	dev-libs/libpcre
+	dev-libs/libxml2
+	ssl? ( dev-libs/openssl )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( net-print/cups )
+	media-libs/tiff
 	app-admin/fam-oss
 	app-text/ghostscript
 	media-libs/libart_lgpl
 	sys-devel/gettext
-	~kde-base/arts-1.2.0_alpha2"
+	~kde-base/arts-1.2.0_beta2"
 
 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
@@ -49,8 +48,12 @@ set-kdedir ${PV}
 
 src_unpack() {
 	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
+	cd ${S} && make -f admin/Makefile.common && aclocal
+	cd ${S}/kio/misc/kpac
+	cp Makefile.am Makefile.am.orig
+	sed -e 's: $(bindir): $(DESTDIR)/$(bindir):g' Makefile.am.orig > Makefile.am
+	rm Makefile.am.orig
+#	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
 }
 
 src_compile() {
@@ -66,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
+}