new revision

5 files changed, 104 insertions, 62 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index c8830c1bc373..67939314613f 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.3 2002/04/26 06:45:15 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.4 2002/04/26 22:51:42 verwilst Exp $
+
+*koffice-1.2_beta1-r1 (27 April 2002)
+
+  27 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  Seemed i was still pointing to the kde-packagers URL..
+  And the real URL seems to have all patches included already..
+  This revision also fixes the docbook errors most of you were having.
+  And i changed the description of the ebuild :o)
 
 *koffice-1.2_beta1 (26 April 2002)
 
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1 b/app-office/koffice/files/digest-koffice-1.2_beta1
deleted file mode 100644
index fc0ab065e620..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f2e53851eb2b7eec7faa52048afb07a koffice-1.2-beta1.tar.bz2 7901314
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1-r1 b/app-office/koffice/files/digest-koffice-1.2_beta1-r1
new file mode 100644
index 000000000000..b3231873b7fc
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.2_beta1-r1
@@ -0,0 +1 @@
+MD5 5df9c55daabcc5df4327724d40f436cf koffice-1.2-beta1.tar.bz2 7901619
diff --git a/app-office/koffice/koffice-1.2_beta1-r1.ebuild b/app-office/koffice/koffice-1.2_beta1-r1.ebuild
new file mode 100644
index 000000000000..2eacbd5a81b7
--- /dev/null
+++ b/app-office/koffice/koffice-1.2_beta1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Author Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1-r1.ebuild,v 1.1 2002/04/26 22:51:42 verwilst Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-base || die
+
+need-kde 3
+
+S="${WORKDIR}/koffice-1.2-beta1"
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+
+SRC_URI="ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2-beta1/src/koffice-1.2-beta1.tar.bz2"
+
+DEPEND="$DEPEND
+	>=dev-lang/python-2.2"
+
+
+src_unpack() {
+
+	unpack koffice-1.2-beta1.tar.bz2
+	cd ${S}/kword
+	
+	# This fixes the doc compilation error.. Seems kinda ugly, but beta2 will fix this#
+	cd ${S}/doc/kformula
+	mv index.docbook index.docbook.orig
+        sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/koffice
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kontour
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/koshell
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kpresenter
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kspread
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kugar
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/kword
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+	cd ${S}/doc/thesaurus
+        mv index.docbook index.docbook.orig
+	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
+        rm -f index.docbook.orig
+
+}
+
+src_compile() {
+
+    export LIBPYTHON="`python-config --libs`"
+    export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
+
+    myconf="$myconf --enable-all"
+    kde_src_compile myconf
+
+    #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
+    CFLAGS2="$CFLAGS"
+    CXXFLAGS2="$CXXFLAGS"
+
+    CFLAGS=${CFLAGS/-fomit-frame-pointer}
+    CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
+
+    cd ${S}
+    kde_src_compile configure
+    cd kchart/kdchart
+    emake || die
+
+    cd ${S}
+    CFLAGS="$CFLAGS2"
+    CXXFLAGS="$CXXFLAGS2"
+    kde_src_compile configure
+    emake || die
+
+}
+
+
diff --git a/app-office/koffice/koffice-1.2_beta1.ebuild b/app-office/koffice/koffice-1.2_beta1.ebuild
deleted file mode 100644
index acb726e78ebd..000000000000
--- a/app-office/koffice/koffice-1.2_beta1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1.ebuild,v 1.1 2002/04/26 06:45:15 verwilst Exp $
-. /usr/portage/eclass/inherit.eclass || die
-inherit kde-base || die
-
-need-kde 3
-
-S="${WORKDIR}/koffice-1.2-beta1"
-DESCRIPTION="KDE Office Set"
-HOMEPAGE="http://www.koffice.org/"
-
-SRC_URI="http://www.gentoo.org/~verwilst/koffice-1.2-beta1.tar.bz2"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2"
-
-
-src_unpack() {
-
-	unpack koffice-1.2-beta1.tar.bz2
-	cd ${S}/kword
-	patch -p0 < ${FILESDIR}/${P}-kwdoc.diff
-	patch -p0 < ${FILESDIR}/${P}-kwcanvas.diff
-	patch -p0 < ${FILESDIR}/${P}-kwtableframeset.diff
-	patch -p0 < ${FILESDIR}/${P}-kwtextframeset.diff
-	patch -p0 < ${FILESDIR}/${P}-kwtextframeset.h.diff
-
-}
-
-src_compile() {
-
-    export LIBPYTHON="`python-config --libs`"
-    export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-    myconf="$myconf --enable-all"
-    kde_src_compile myconf
-
-    #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
-    CFLAGS2="$CFLAGS"
-    CXXFLAGS2="$CXXFLAGS"
-
-    CFLAGS=${CFLAGS/-fomit-frame-pointer}
-    CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
-
-    cd ${S}
-    kde_src_compile configure
-    cd kchart/kdchart
-    emake || die
-
-    cd ${S}
-    CFLAGS="$CFLAGS2"
-    CXXFLAGS="$CXXFLAGS2"
-    kde_src_compile configure
-    emake || die
-
-}
-
-