put everything back to old behaviour (ooo-kde) as the new logic has some problems and needs some more work :(

3 files changed, 24 insertions, 34 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 07da3e724daf..9163aef639dc 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.71 2004/09/04 14:32:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.72 2004/09/04 15:17:44 suka Exp $
 
 *openoffice-ximian-1.3.3 (04 Sep 2004)
 
@@ -10,17 +10,6 @@
   New version of the ooo-build patchset, fixing a few problems, most notably bug
   #62611 (does not print).
   
-  Also this marks the deprecation of the ooo-kde use-flag, but don't fear, kde
-  support is staying, the logic works now like this (according to your USE flag
-  settings):
-  
-  +gnome -kde: gnome interface + ximian iconset +gnome +kde: gnome AND KDE
-  interface (right interface will displayed according to which desktop
-  environment you use + ximian iconset -gnome +kde: kde interface + kde icons
-  
-  So if you want to have the same result as ooo-kde before, be sure to have
-  -gnome in your use-flags.
-
   Also remove the quite broken 1.3.0 version
 
   04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 3f2678e4ba28..3d3d364bcb1a 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,8 +1,8 @@
-MD5 b58bfe40bee2b6de0f040008434b570b openoffice-ximian-1.3.3.ebuild 15886
+MD5 5b2f09bb7d220c1e7031645107269373 openoffice-ximian-1.3.3.ebuild 16002
 MD5 84a7b7cc8a310ca581074341880fa8ee openoffice-ximian-1.1.55.ebuild 15343
 MD5 501916073d51ed198116feb3b9610baa openoffice-ximian-1.3.2.ebuild 16013
 MD5 53a519045a2417084987708004a2d020 openoffice-ximian-1.1.61.ebuild 16287
-MD5 eea1dd9fcba5cf1759d0b0effa7e5f81 ChangeLog 17860
+MD5 8be0e9ad282b7d31a716d22fe6049514 ChangeLog 17353
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 869a3cbdb85561e3282937db95719796 files/digest-openoffice-ximian-1.3.2 435
 MD5 af19ccb09648f0e94c2945b1da20ed9d files/digest-openoffice-ximian-1.3.3 435
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild
index 299260100940..efb8dcf38b04 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild,v 1.1 2004/09/04 14:32:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild,v 1.2 2004/09/04 15:17:44 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -28,7 +28,7 @@
 
 inherit flag-o-matic eutils gcc
 
-IUSE="gnome kde"
+IUSE="gnome kde ooo-kde"
 
 OO_VER=1.1.2
 PATCHLEVEL=OOO_1_1_2
@@ -43,8 +43,8 @@ SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_source.tar.gz
 	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
 	http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz
 	mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2
-	gnome? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )
-	!gnome? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )"
+	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )
+	!ooo-kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )"
 
 HOMEPAGE="http://ooo.ximian.com"
 
@@ -55,7 +55,7 @@ KEYWORDS="~x86 ~ppc"
 RDEPEND="virtual/libc
 	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
-	gnome? ( >=x11-libs/gtk+-2.0
+	!ooo-kde? ( >=x11-libs/gtk+-2.0
 		>=gnome-base/libgnome-2.2
 		>=gnome-base/gnome-vfs-2.0
 		>=net-print/libgnomecups-0.1.4
@@ -78,7 +78,7 @@ RDEPEND="virtual/libc
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2.1 )
 	>=media-libs/freetype-2.1.4
-	kde? ( kde-base/kdelibs )"
+	ooo-kde? ( kde-base/kdelibs )"
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh
@@ -92,6 +92,10 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 
 	ewarn "****************************************************************"
+	ewarn " This ebuild now also includes optional support for kde "
+	ewarn " integration. If you want to use it you will have to put "
+	ewarn " 'ooo-kde' into your USE FLAGS. "
+	ewarn
 	ewarn " It is important to note that OpenOffice.org is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
@@ -236,18 +240,14 @@ src_unpack() {
 	#Add our own splash screen
 	epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff
 
-	export DISTRO="Gentoo"
-	export EXTRACONF="--enable-gtk"
-	export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-
-	if use kde; then
-		export EXTRACONF="${EXTRACONF} --enable-kde"
-	fi
-
-	if use !gnome; then
-		export DISTRO="GentooKDE"
-		export EXTRACONF="--enable-kde"
-		export ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
+	if use ooo-kde; then
+		DISTRO=GentooKDE
+		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
+		WIDGETSET=kde
+	else
+		DISTRO=Gentoo
+		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
+		WIDGETSET=gtk
 	fi
 
 	einfo "Applying Ximian OO.org Patches"
@@ -318,6 +318,7 @@ src_compile() {
 	# get linker errors due to the ABI being different (STLport will be
 	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
 	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
+	einfo "Using Native widgest set for ${WIDGETSET}"
 	cd ${S}/config_office
 	rm -f config.cache
 	autoconf
@@ -334,8 +335,8 @@ src_compile() {
 		--with-system-curl \
 		--with-system-xrender \
 		--disable-java \
-		--disable-mozilla"
-	myconf="${myconf} ${EXTRACONF}"
+		--disable-mozilla \
+		--enable-${WIDGETSET}"
 	./configure ${myconf} || die
 
 	cd ${S}