From 7bbbc30d442e978644c8d9a65a444cabd441b879 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 21 Oct 2005 20:53:55 +0000 Subject: [PATCH] remove the obsolete release candidate Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/Manifest | 4 - .../files/2.0.0/gentoo-2.0.0_rc3.diff | 27 -- .../2.0.0/stlport-vector-ppc-buildfix.diff | 48 ---- .../files/digest-openoffice-2.0.0_rc3 | 7 - .../openoffice/openoffice-2.0.0_rc3.ebuild | 230 ------------------ 5 files changed, 316 deletions(-) delete mode 100644 app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff delete mode 100644 app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff delete mode 100644 app-office/openoffice/files/digest-openoffice-2.0.0_rc3 delete mode 100644 app-office/openoffice/openoffice-2.0.0_rc3.ebuild diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 5f7c8fb8ff6f..0805d4093830 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -31,14 +31,10 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 -MD5 39239f7e09e3fdd536498728404bfbef files/2.0.0/gentoo-2.0.0_rc3.diff 957 -MD5 10f9f087e0e267786691ea0909909504 files/2.0.0/stlport-vector-ppc-buildfix.diff 2213 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476 -MD5 c27522fd99b4d48dc035d2defbe57015 files/digest-openoffice-2.0.0_rc3 478 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 MD5 464fff747f1300df8ae63c7648a2db6d openoffice-2.0.0.ebuild 6817 -MD5 94c7530a7b2b51223c1087fdf108db76 openoffice-2.0.0_rc3.ebuild 7083 diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff deleted file mode 100644 index 009dc5eb186a..000000000000 --- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc3.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- patches/OOO_2_0/apply -+++ patches/OOO_2_0/apply -@@ -741,7 +741,12 @@ - gentoo-splash.diff - # Do not use mozilla-ldap, it breaks for us - no-ldap-mozilla.diff -- -+# We are not using this -+no-fontooo-wizard.diff -+# Fix the system default fpicker -+default-system-fpicker.diff -+# Fix for build breakage on PPC -+stlport-vector-ppc-buildfix.diff - # - # NOTE: 64 bit OOo is work in progress! - # ---- Makefile.in -+++ Makefile.in -@@ -691,7 +691,7 @@ - $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ - $(top_srcdir)/patches/*/*.diff \ - $(APPLY_DIR)/apply -- cp -f $(top_srcdir)/src/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd" -+ cp -f $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd" - if test "z$(BUILD_WIN32)" != "z"; then \ - cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \ - cp -af $(BUILDDIR)/*.dll $(OOBUILDDIR)/external/unicows || true; \ diff --git a/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff b/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff deleted file mode 100644 index 8c6922b8b384..000000000000 --- a/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- stlport/STLport-4.5.patch 2005-01-06 12:26:48.770546592 +1100 -+++ stlport/STLport-4.5.patch 2005-01-06 12:26:01.125789696 +1100 -@@ -269,6 +269,45 @@ - - CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g - CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+--- misc/build/STLport-4.5/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 -++++ misc/build/STLport-4.5/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 -+@@ -46,8 +46,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC -+ -+ include common_percent_rules.mak -+ include common_rules.mak -+--- misc/build/STLport-4.5/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 -++++ misc/build/STLport-4.5/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 -+@@ -44,8 +44,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -+ -+ include common_percent_rules.mak -+ include common_rules.mak -+--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig -++++ misc/build/STLport-4.5/src/gcc-3.0.mak -+@@ -43,8 +43,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -+ -+ include common_percent_rules.mak -+ include common_rules.mak - *** misc/STLport-4.5/stlport/config/stl_gcc.h 2001-09-04 19:10:16.000000000 +0200 - --- misc/build/STLport-4.5/stlport/config/stl_gcc.h 2005-04-26 15:06:27.000000000 +0200 - *************** diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0_rc3 b/app-office/openoffice/files/digest-openoffice-2.0.0_rc3 deleted file mode 100644 index 3b2649786950..000000000000 --- a/app-office/openoffice/files/digest-openoffice-2.0.0_rc3 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740 -MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757 -MD5 6f8bd358bda32f647098218e93649806 ooo-build-2.0.rc3.tar.gz 4148302 -MD5 6a6b1dfa8fd068b1c5f9b341b35ab99d ooo680-m3-core.tar.bz2 157108531 -MD5 8aa0c6463dc517723f9f4d4a3f0191a0 ooo680-m3-lang.tar.bz2 33103772 -MD5 a6f4b2ef7d1fae927cedbd45e6dd403d ooo680-m3-system.tar.bz2 19324775 -MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872 diff --git a/app-office/openoffice/openoffice-2.0.0_rc3.ebuild b/app-office/openoffice/openoffice-2.0.0_rc3.ebuild deleted file mode 100644 index 6b48449b38dc..000000000000 --- a/app-office/openoffice/openoffice-2.0.0_rc3.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc3.ebuild,v 1.2 2005/10/18 06:45:16 suka Exp $ - -inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs - -IUSE="curl eds gnome java kde ldap mozilla nas python zlib xml2" - -OO_VER="${PV/_rc3}" -MY_PV="2.0.rc3" -PATCHLEVEL="OOO680" -PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}" -SRC="ooo680-m3" -S="${WORKDIR}/${SRC}" -CONFFILE="${PATCHDIR}/distro-configs/Gentoo.conf.in" -DESCRIPTION="OpenOffice.org, a full office productivity suite." - -SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2 - http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2 - http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2 - http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz - http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz - kde? ( http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 ) - http://go-oo.org/packages/SRC680/extras-2.tar.bz2" - -HOMEPAGE="http://go-oo.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~x86" - -RDEPEND="!app-office/openoffice-bin - !app-office/openoffice-ximian-bin - !app-office/openoffice-ximian - virtual/x11 - virtual/libc - >=dev-lang/perl-5.0 - gnome? ( >=x11-libs/gtk+-2.4 - >=gnome-base/gnome-vfs-2.6 - >=gnome-base/gconf-2.0 ) - eds? ( >=gnome-extra/evolution-data-server-1.2 ) - kde? ( kde-base/kdelibs ) - mozilla? ( >=www-client/mozilla-1.7.10 ) - >=x11-libs/startup-notification-0.5 - >=media-libs/freetype-2.1.4 - >=media-libs/fontconfig-2.2.0 - media-libs/libpng - sys-devel/flex - sys-devel/bison - app-arch/zip - app-arch/unzip - dev-libs/expat - java? ( =virtual/jre-1.4* ) - >=sys-devel/gcc-3.2.1 - linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) - linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) - linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" - -DEPEND="${RDEPEND} - net-print/cups - >=sys-apps/findutils-4.1.20-r1 - app-shells/tcsh - dev-perl/Archive-Zip - dev-util/pkgconfig - dev-util/intltool - curl? ( >=net-misc/curl-7.9.8 ) - nas? ( >=media-libs/nas-1.6 ) - zlib? ( sys-libs/zlib ) - sys-libs/pam - !dev-util/dmake - java? ( =virtual/jdk-1.4* - dev-java/ant-core ) - !java? ( dev-libs/libxslt - >=dev-libs/libxml2-2.0 ) - ldap? ( net-nds/openldap ) - python? ( >=dev-lang/python-2.3.4 ) - xml2? ( >=dev-libs/libxml2-2.0 )" - -PROVIDE="virtual/ooo" - -pkg_setup() { - - 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 " - ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " - ewarn " merge again. Also note that building OOo takes a lot of time and " - ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are " - ewarn " the minimum requirements. If you have less, use openoffice-bin " - ewarn " instead. " - ewarn - - strip-linguas af ar be_BY bg bn br ca cs cy da de el en en_GB en_US es et fi fr ga gu_IN he hi_IN hr hu it ja km ko lt nb ne nl nn ns pa_IN pl pt pt_BR ru sh_YU sk sl sr_CS sv th tn tr vi xh zh_CN zh_TW zu - - if [ -z "${LINGUAS}" ]; then - export LINGUAS_OOO="en-US" - ewarn " To get a localized build, set the according LINGUAS variable(s). " - ewarn - else - export LINGUAS_OOO="${LINGUAS//_/-}" - export LINGUAS_OOO="${LINGUAS_OOO//en /en-US }" - fi - - if use !java; then - ewarn " You are building with java-support disabled, this results in some " - ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. " - ewarn " If something you need does not work for you, rebuild with " - ewarn " java in your USE-flags. Also the xml2 use-flag is disabled with " - ewarn " -java to prevent build breakage. " - ewarn - fi - -} - -src_unpack() { - - cd ${WORKDIR} - unpack ooo-build-${MY_PV}.tar.gz - - #Some fixes for our patchset - cd ${PATCHDIR} - epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.diff - - #Additional and new patches get here - cp -pPRf ${FILESDIR}/${OO_VER}/stlport-vector-ppc-buildfix.diff ${PATCHDIR}/patches/src680 || die - - #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only - use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo" - - #Use flag checks - use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE} - - echo "`use_with curl system-curl`" >> ${CONFFILE} - echo "`use_with nas system-nas`" >> ${CONFFILE} - echo "`use_with python system-python`" >> ${CONFFILE} - echo "`use_with xml2 system-libxml`" >> ${CONFFILE} - echo "`use_with zlib system-zlib`" >> ${CONFFILE} - - echo "`use_with mozilla system-mozilla`" >> ${CONFFILE} - echo "`use_enable mozilla`" >> ${CONFFILE} - - echo "`use_enable ldap openldap`" >> ${CONFFILE} - echo "`use_enable eds evolution2`" >> ${CONFFILE} - echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE} - echo "`use_enable gnome lockdown`" >> ${CONFFILE} - -} - -src_compile() { - - unset LIBC - addpredict "/bin" - addpredict "/root/.gconfd" - addpredict "/root/.gnome" - - # Should the build use multiprocessing? Not enabled by default, as it tends to break - if [ "${WANT_DISTCC}" == "true" ]; then - export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` && [ ${JOBS} -gt 10 ] && export JOBS="10" - fi - - cd ${PATCHDIR} - autoconf || die - ./configure ${MYCONF} \ - --with-distro="${DISTRO}" \ - --with-vendor="Gentoo" \ - --with-arch="${ARCH}" \ - --with-tag="${SRC}" \ - --with-srcdir="${DISTDIR}" \ - --with-lang="${LINGUAS_OOO}" \ - --with-num-cpus="${JOBS}" \ - --with-binsuffix="2" \ - --with-installed-ooo-dirname="openoffice" \ - `use_enable gnome gtk` \ - `use_enable kde` \ - --disable-access \ - --disable-mono \ - --disable-cairo \ - || die "Configuration failed!" - - # Compile problems with these ... - filter-flags "-funroll-loops" - filter-flags "-fomit-frame-pointer" - filter-flags "-fprefetch-loop-arrays" - filter-flags "-fno-default-inline" - filter-flags "-fstack-protector" - filter-flags "-ftracer" - replace-flags "-O3" "-O2" - replace-flags "-Os" "-O2" - - # Now for our optimization flags ... - export ARCH_FLAGS="${CFLAGS}" - - einfo "Building OpenOffice.org..." - use kde && set-kdedir 3 - make || die "Build failed" - -} - -src_install() { - - einfo "Preparing Installation" - cd ${PATCHDIR} - make DESTDIR=${D} install || die "Installation failed!" - - #Correcting location of menu entries, this should really be handled in ooo-build / setup.in - mkdir ${D}/usr/share/applications - mv ${D}/opt/gnome/share/applications/* ${D}/usr/share/applications/ - rmdir ${D}/opt/gnome/share/applications/ -p - - # Install corrected Symbol Font - insinto /usr/share/fonts/TTF/ - doins ${PATCHDIR}/fonts/*.ttf - -} - -pkg_postinst() { - - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - - einfo " To start OpenOffice.org, run:" - einfo - einfo " $ ooffice2" - einfo - einfo " Also, for individual components, you can use any of:" - einfo - einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2," - einfo " ooweb2 or oowriter2" -} -- 2.26.2