diff options
4 files changed, 47 insertions, 18 deletions
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 10448e1c5610..16c4ee4e8a0e 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,11 +1,11 @@ MD5 4f1d4a2b6af18cfdec390bd2c655befc openoffice-ximian-1.1.53.ebuild 14931 MD5 250df02f3dd965be559fa30ca2949b44 openoffice-ximian-1.1.51-r1.ebuild 15072 -MD5 1a26924ea93cbd0ffa4b00881c8e4d95 openoffice-ximian-1.1.54.ebuild 14926 +MD5 bed521e5bca47444d6360a849c012c11 openoffice-ximian-1.1.54.ebuild 15393 MD5 33efaa578cd7bf45b94b8dd78c5878a8 ChangeLog 9039 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51-r1 213 MD5 304c8e86d82be8c1971b0b3f9102cd0e files/digest-openoffice-ximian-1.1.53 215 -MD5 20aeba3e9637ae6553b4fa6d41e1d0af files/digest-openoffice-ximian-1.1.54 215 +MD5 cf1c97179b23473f49ab1c768f65cdb3 files/digest-openoffice-ximian-1.1.54 293 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400 @@ -20,6 +20,7 @@ MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400 MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221 +MD5 4fcd797ef664b3baf0450637d26454f4 files/1.1.1/distro_kde.patch 614 MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 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 |