From 22ff3f7bd3d1a9687e1fbe83acdc56a2a71aa0d8 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 8 Oct 2004 06:26:58 +0000 Subject: [PATCH] optionally builds without java now --- app-office/openoffice-ximian/Manifest | 34 ++--- app-office/openoffice/ChangeLog | 6 +- app-office/openoffice/Manifest | 6 +- .../openoffice/files/digest-openoffice-1.1.3 | 1 - app-office/openoffice/openoffice-1.1.3.ebuild | 122 +++++++++--------- 5 files changed, 89 insertions(+), 80 deletions(-) diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 8a4dbf1cce5e..cc9ad94cb28d 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,29 +1,29 @@ -MD5 89c29b94d2e04292ba827e388d58e369 ChangeLog 19217 -MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 +MD5 e7d7fb25d47b831be4c439a2a255066c openoffice-ximian-1.3.5.ebuild 16369 MD5 84a7b7cc8a310ca581074341880fa8ee openoffice-ximian-1.1.55.ebuild 15343 MD5 fed70b3c3fd076cb0a5d2b9c84478c2f openoffice-ximian-1.1.61.ebuild 16286 -MD5 b490535b03dcfed5f5d7ace9bdde4325 openoffice-ximian-1.3.5.ebuild 16376 MD5 3d7e2487ddd4805e3ff7b5362e94d695 openoffice-ximian-1.3.4.ebuild 16376 -MD5 4448ae80f966581ae798bf217b10567d files/digest-openoffice-ximian-1.1.61 290 -MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215 -MD5 2eda0016f8f36321491d0ac056ce799b files/digest-openoffice-ximian-1.3.5 435 +MD5 89c29b94d2e04292ba827e388d58e369 ChangeLog 19217 +MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 09dc4da36dcc534fe45759d3a40d1262 files/digest-openoffice-ximian-1.3.4 435 -MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035 -MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362 -MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 -MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 -MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400 +MD5 2eda0016f8f36321491d0ac056ce799b files/digest-openoffice-ximian-1.3.5 435 +MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215 +MD5 4448ae80f966581ae798bf217b10567d files/digest-openoffice-ximian-1.1.61 290 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980 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 6fd623d53d17e17f953232da5b04447f files/1.1.2/fixscale.patch 1035 -MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5.patch 597 -MD5 5230f0537c695e54b5475d203d213ef6 files/1.1.2/curlfix.patch 1367 -MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362 +MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 +MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 +MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362 +MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035 +MD5 b653592913b5ef15d3599a97d7e8a25f files/1.1.2/gentoo-1.1.61.patch 680 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980 +MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298 MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336 -MD5 b653592913b5ef15d3599a97d7e8a25f files/1.1.2/gentoo-1.1.61.patch 680 MD5 0165c3a11c99e85ee1fde1c59d580e21 files/1.1.2/rm-nonexistant.diff 334 -MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890 MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.4.patch 597 +MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362 +MD5 6fd623d53d17e17f953232da5b04447f files/1.1.2/fixscale.patch 1035 +MD5 5230f0537c695e54b5475d203d213ef6 files/1.1.2/curlfix.patch 1367 +MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5.patch 597 diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 7b2d865870ab..f6d4a644153b 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.82 2004/10/07 06:26:30 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.83 2004/10/08 06:26:57 suka Exp $ + + 08 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild: + Builds now also without java, use libart instead of gpc, system zlib and + freetype: Other than that: cleanups *openoffice-1.1.3 (07 Oct 2004) diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 44f1dd270f19..5e03e4094952 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -2,12 +2,12 @@ MD5 7225e010bbc593b8e01d482ef8818875 openoffice-1.1.0-r5.ebuild 15938 MD5 28d3297e6fc089384cd28d18a2499265 openoffice-1.0.3-r2.ebuild 21279 MD5 05a5b4255da4c9aff8bdeffea8704978 openoffice-1.1.1-r1.ebuild 16285 MD5 69b88c47b0426b1c2815c75ff4afb888 openoffice-1.1.0-r4.ebuild 20322 -MD5 8a498120bcfc8af14b28130db6b726b6 openoffice-1.1.3.ebuild 15868 -MD5 cac8a7c8b1ff42d8e00166e429a877dd ChangeLog 18739 +MD5 37a3ad17a8a5642ab30a565e4690ce5f openoffice-1.1.3.ebuild 15866 +MD5 4eb34a3ae1d313aa7d00528acfac3881 ChangeLog 18909 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 39bc49277cbae980b301dcaa6d3a16af openoffice-1.1.2.ebuild 15928 MD5 2e1cecfeaa8a5134d03b75149ca35ef4 files/digest-openoffice-1.1.2 127 -MD5 61ab014178173964f678a654962b7590 files/digest-openoffice-1.1.3 129 +MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195 MD5 601e987d3fa97d8dfc4cdd052b0e9832 files/digest-openoffice-1.1.0-r5 128 diff --git a/app-office/openoffice/files/digest-openoffice-1.1.3 b/app-office/openoffice/files/digest-openoffice-1.1.3 index 576a2f02788f..56ac506a5402 100644 --- a/app-office/openoffice/files/digest-openoffice-1.1.3 +++ b/app-office/openoffice/files/digest-openoffice-1.1.3 @@ -1,2 +1 @@ MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913 -MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917 diff --git a/app-office/openoffice/openoffice-1.1.3.ebuild b/app-office/openoffice/openoffice-1.1.3.ebuild index 037b2d0dfafc..d0c430324132 100644 --- a/app-office/openoffice/openoffice-1.1.3.ebuild +++ b/app-office/openoffice/openoffice-1.1.3.ebuild @@ -1,8 +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/openoffice-1.1.3.ebuild,v 1.1 2004/10/07 06:26:30 suka Exp $ - -# IMPORTANT: This is extremely alpha!!! +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3.ebuild,v 1.2 2004/10/08 06:26:58 suka Exp $ # Notes: # @@ -28,41 +26,45 @@ inherit flag-o-matic eutils gcc -IUSE="gnome kde" +IUSE="gnome kde java" LOC="/opt" INSTDIR="${LOC}/OpenOffice.org" S="${WORKDIR}/OOo_${PV}_src" DESCRIPTION="OpenOffice.org, a full office productivity suite." -SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}-1_source.tar.gz - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z" +SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}-1_source.tar.gz" HOMEPAGE="http://www.openoffice.org/" LICENSE="LGPL-2 | SISSL-1.1" SLOT="0" KEYWORDS="~x86" -RDEPEND=">=sys-libs/glibc-2.1 +RDEPEND="!app-office/openoffice-bin + >=sys-libs/glibc-2.1 !=sys-libs/glibc-2.3.1* >=dev-lang/perl-5.0 - x11-libs/startup-notification + >=media-libs/libart_lgpl-2.3.13 + >=x11-libs/startup-notification-0.5 + >=media-libs/freetype-2.1.4 virtual/x11 app-arch/zip app-arch/unzip dev-libs/expat - >=virtual/jre-1.4.1 + java? ( >=virtual/jre-1.4.1 ) virtual/lpr ppc? ( >=sys-libs/glibc-2.2.5-r7 - >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced + >=sys-devel/gcc-3.2.1 )" DEPEND="${RDEPEND} + >=sys-apps/findutils-4.1.20-r1 app-shells/tcsh - !app-office/openoffice-bin - >=virtual/jdk-1.4.1 - sys-apps/findutils dev-util/pkgconfig + net-misc/curl sys-libs/pam - !dev-util/dmake" + sys-libs/zlib + !dev-util/dmake + java? ( >=virtual/jdk-1.4.1 ) + !java? ( dev-libs/libxslt )" pkg_setup() { @@ -81,28 +83,31 @@ pkg_setup() { die fi - if [ -z "$(/usr/bin/java-config -O | grep "blackdown-jdk")" ] && [ "${FORCE_JAVA}" != "yes" ] + if use java then - eerror - eerror "This ebuild has only been tested with the blackdown port of" - eerror "java. If you use another java implementation, it could fail" - eerror "horribly, so please merge the blackdown-jdk and set it as" - eerror "system VM before proceeding:" - eerror - eerror " # emerge blackdown-jdk" - eerror " # java-config --set-system-vm=blackdown-jdk-" - eerror " # env-update" - eerror " # source /etc/profile" - eerror - eerror "Please adjust according to the version installed in" - eerror "/opt." - eerror - eerror "If you however want to test another JDK (not officially supported)," - eerror "you could do the following:" - eerror - eerror " # export FORCE_JAVA=yes" - eerror - die + if [ -z "$(/usr/bin/java-config -O | grep "blackdown-jdk")" ] && [ "${FORCE_JAVA}" != "yes" ] + then + eerror + eerror "This ebuild has only been tested with the blackdown port of" + eerror "java. If you use another java implementation, it could fail" + eerror "horribly, so please merge the blackdown-jdk and set it as" + eerror "system VM before proceeding:" + eerror + eerror " # emerge blackdown-jdk" + eerror " # java-config --set-system-vm=blackdown-jdk-" + eerror " # env-update" + eerror " # source /etc/profile" + eerror + eerror "Please adjust according to the version installed in" + eerror "/opt." + eerror + eerror "If you however want to test another JDK (not officially supported)," + eerror "you could do the following:" + eerror + eerror " # export FORCE_JAVA=yes" + eerror + die + fi fi ewarn "****************************************************************" @@ -229,8 +234,6 @@ oo_setup() { fi fi fi - - export JAVA_BINARY="`which java`" } src_unpack() { @@ -240,10 +243,7 @@ src_unpack() { cd ${WORKDIR} unpack ${A} - # Install gpc - cd ${WORKDIR}/gpc231 - cp gpc.* ${S}/external/gpc || die - + #Still needed: The STLport patch cd ${S} rm stlport/STLport-4.5.3.patch || die epatch ${FILESDIR}/${PV}/newstlportfix.patch @@ -257,13 +257,11 @@ src_unpack() { filter-flags "-fomit-frame-pointer" filter-flags "-fprefetch-loop-arrays" filter-flags "-fno-default-inline" + filter-flags "-fstack-protector" append-flags "-fno-strict-aliasing" replace-flags "-O3" "-O2" replace-flags "-Os" "-O2" - # Enable Bytecode Interpreter for freetype ... - append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER" - if [ "$(gcc-version)" == "3.2" ]; then einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3" replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4" @@ -298,6 +296,14 @@ src_compile() { addpredict /bin addpredict /root/.gconfd local buildcmd="" + export MYCONF="" + + if use java + then + MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}" + else + MYCONF="${MYCONF} --disable-java" + fi # Do NOT compile with a external STLport, as gcc-2.95.3 users will # get linker errors due to the ABI being different (STLport will be @@ -305,15 +311,20 @@ src_compile() { einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..." cd ${S}/config_office rm -f config.cache + if [ "LANGNAME" != "ENUS" ]; then LANGNAME="${LANGNAME},ENUS" fi - ./configure --enable-gcc3 \ - --with-jdk-home=${JAVA_HOME} \ + + MYCONF="${MYCONF} --enable-libart \ --with-lang=${LANGNAME} \ --enable-libsn \ --without-fonts \ - --with-x || die + --with-system-zlib \ + --with-system-freetype \ + --with-system-curl" + + ./configure ${MYCONF} || die cd ${S} get_EnvSet @@ -336,15 +347,15 @@ src_compile() { if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ] then # Set CCCOMP and CXXCOMP. This is still needed for STLport - export CCCOMP=${CC} - export CXXCOMP=${CXX} + export CCCOMP="$(gcc-getCC)" + export CXXCOMP="$(gcc-getCXX)" fi einfo "Bootstrapping OpenOffice.org..." # Get things ready for bootstrap (Az) chmod 0755 ${S}/solenv/bin/*.pl # Bootstrap ... - ./bootstrap + ./bootstrap || die einfo "Building OpenOffice.org..." echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.sh @@ -400,7 +411,7 @@ src_install() { # Fixing install location in response file sed -e "s||${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse + ${T}/rsfile-global > ${T}/autoresponse || die einfo "Installing OpenOffice.org into build root..." dodir ${INSTDIR} @@ -410,7 +421,7 @@ src_install() { echo einfo "Removing build root from registry..." # Remove totally useless stuff. - rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} + rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die # Remove build root from registry and co egrep -rl "${D}" ${D}${INSTDIR}/* | \ xargs -i perl -pi -e "s|${D}||g" {} || : @@ -503,9 +514,7 @@ src_install() { rm -rf ${D}${INSTDIR}/share/cde # Make sure these do not get nuked. - keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} - keepdir ${INSTDIR}/user/psprint/{driver,fontmetric} - keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} + keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} } pkg_postinst() { @@ -519,9 +528,6 @@ pkg_postinst() { einfo einfo " oocalc, oodraw, ooimpress, oomath, ooweb or oowriter" einfo - einfo " If the fonts appear garbled in the user interface refer to " - einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8" - einfo einfo "******************************************************************" } -- 2.26.2