first shot at kde integration work

3 files changed, 44 insertions, 16 deletions

diff --git a/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch b/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch
new file mode 100644
index 000000000000..e8bbf90a6c71
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch
@@ -0,0 +1,10 @@
+--- ooo-build-1.1.54/patches/OOO_1_1_1/apply 2004-04-30 22:21:18.000000000 -0500
++++ ooo-build-1.1.54/patches/OOO_1_1_1/apply.new 2004-04-30 22:08:04.000000000 -0500
+@@ -21,7 +21,7 @@ RHFedora : RedHatBase, RHFedoraOnly
+ RHTaroon : RedHatBase, RHTaroonOnly, OldLibArt
+ RHShrike : RedHatBase, RHShrikeOnly, OldLibArt
+ KDE : LinuxCommon, NativeWidgets, StartupNotification, ODKFixes
+-SuSE : SuSEOnly, LinuxCommon, KDE, GlobalDesktopFiles, VBABits
++SuSE : SuSEOnly, LinuxCommon, NativeWidgets, StartupNotification ODKFixes, GlobalDesktopFiles, VBABits
+ # somewhat odder:
+ Win32 : Common, ODKFixes, VBABits, Win32Only
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
index 9bd483e253cb..f6f4e3bcf329 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
@@ -1,3 +1,4 @@
 MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
 MD5 22a459b68c2534c2213805d1445d947d ooo-build-1.1.54.tar.gz 1865464
+MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
 MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
index e09fd625c6c2..0fd40a136ee0 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.2 2004/05/05 10:44:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.3 2004/05/05 15:57:51 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -49,31 +49,42 @@ export WANT_GCC_3="yes"
 OO_VER=1.1.1
 PATCHLEVEL=OOO_1_1_1
 ICON_VER=OOO_1_1-9
+KDE_ICON_VER=OOO_1_1-0.1
+KDE_ICON_PATH=documents/159/1785
+if [ `use ooo-kde` ]; then
+	ICON=ooo-KDE_icons-${KDE_ICON_VER}
+	DISTRO=KDE
+else
+	ICON=ooo-icons-${ICON_VER}
+	DISTRO=Ximian
+fi
+
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
-ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
+ICONDIR=${WORKDIR}/${ICON}
 S="${WORKDIR}/oo_${OO_VER}_src"
 DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
 SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2
 	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
+	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/${ICON}.tar.gz )
+	!ooo-kde? ( http://ooo.ximian.com/packages/${ICON}.tar.gz )"
 
 HOMEPAGE="http://ooo.ximian.com"
 
 LICENSE="LGPL-2 | SISSL-1.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="gnome kde"
+IUSE="gnome kde ooo-kde"
 
 RDEPEND=">=sys-libs/glibc-2.1
 	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/gnome-vfs-2.0
-	>=net-print/libgnomecups-0.1.4
-	>=net-print/gnome-cups-manager-0.16
-	>=dev-libs/libxml2-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
+		>=net-print/gnome-cups-manager-0.16
+		>=dev-libs/libxml2-2.0 )
 	>=media-libs/libart_lgpl-2.3.13
 	>=x11-libs/startup-notification-0.5
 	media-fonts/ttf-bitstream-vera
@@ -90,7 +101,8 @@ RDEPEND=">=sys-libs/glibc-2.1
 	!app-office/openoffice-ximian-bin
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2.1 )
-	>=media-libs/freetype-2.1.4"
+	>=media-libs/freetype-2.1.4
+	ooo-kde? ( kde-base/kdelibs )"
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh
@@ -230,7 +242,10 @@ src_unpack() {
 	oo_setup
 
 	cd ${WORKDIR}
-	unpack OOo_${OO_VER}p1_source.tar.bz2 ooo-build-${PV}.tar.gz ooo-icons-${ICON_VER}.tar.gz
+	unpack OOo_${OO_VER}p1_source.tar.bz2 ooo-build-${PV}.tar.gz ${ICON}.tar.gz
+
+	#Fix KDE as terminal node of distro
+	epatch ${FILESDIR}/${OO_VER}/distro_kde.patch
 
 	#Still needed: The STLport patch
 	cd ${S}
@@ -251,7 +266,7 @@ src_unpack() {
 	fi
 
 	einfo "Applying Ximian OO.org Patches"
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
+	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S}
@@ -312,8 +327,8 @@ src_compile() {
 	cd ${S}/config_office
 	rm -f config.cache
 	autoconf
-	./configure \
-		--enable-libart \
+	local myconf
+	myconf="--enable-libart \
 		--enable-libsn \
 		--enable-crashdump=no \
 		--with-lang=ENUS,${LANGNAME} \
@@ -323,7 +338,9 @@ src_compile() {
 		--with-system-zlib \
 		--with-system-freetype \
 		--with-system-curl \
-		--disable-java || die
+		--disable-java"
+	use ooo-kde && myconf="${myconf} --with-widgetset=kde"
+	./configure ${myconf} || die
 
 	cd ${S}
 	get_EnvSet