remove old rc
authorAndreas Proschofsky <suka@gentoo.org>
Tue, 18 Oct 2005 20:27:49 +0000 (20:27 +0000)
committerAndreas Proschofsky <suka@gentoo.org>
Tue, 18 Oct 2005 20:27:49 +0000 (20:27 +0000)
Package-Manager: portage-2.0.53_rc5

app-office/openoffice/Manifest
app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff [deleted file]
app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff [deleted file]
app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff [deleted file]
app-office/openoffice/files/digest-openoffice-2.0.0_rc2 [deleted file]
app-office/openoffice/openoffice-2.0.0_rc2.ebuild [deleted file]

index 413d136e98247522bdae504dfbcd6e2b222f8c36..72027c539266a0a4191bb9fd1a65602593332ddd 100644 (file)
@@ -31,17 +31,12 @@ 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 4821a498748cc2b42dd3d32b27c95da9 files/2.0.0/config_office-openldap-fix.diff 484
-MD5 9fcafd818f3e84a8adda72501784243e files/2.0.0/gentoo-2.0.0_rc2.diff 1105
 MD5 39239f7e09e3fdd536498728404bfbef files/2.0.0/gentoo-2.0.0_rc3.diff 957
-MD5 078172057d5be938e24273c359b42435 files/2.0.0/no-ldap-mozilla.diff 1292
 MD5 705ccd454942401009fad47768eb3595 files/2.0.0/stlport-vector-ppc-buildfix.diff 1675
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
-MD5 cd8007c1f613acc2ee85255b0d20b711 files/digest-openoffice-2.0.0_rc2 416
 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 69cc79438c5fd1c142f647e49769815b openoffice-2.0.0_rc2.ebuild 7083
 MD5 94c7530a7b2b51223c1087fdf108db76 openoffice-2.0.0_rc3.ebuild 7083
diff --git a/app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff b/app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff
deleted file mode 100644 (file)
index 0c3f859..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- config_office/configure.in 
-+++ config_office/configure.in
-@@ -2885,7 +2885,7 @@
-    dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
-    dnl ===================================================================
-    AC_MSG_CHECKING([which LDAP SDK to use])
--   if test -n "$enable_openldap"; then
-+   if test -n "$enable_openldap" && test "$enable_openldap" != "no"; then
-          AC_MSG_RESULT([OpenLDAP])
-          WITH_OPENLDAP=YES
-          AC_CHECK_HEADERS(ldap.h, [],
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
deleted file mode 100644 (file)
index 527746f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
---- patches/OOO_2_0/apply 
-+++ patches/OOO_2_0/apply
-@@ -356,9 +356,6 @@
- [ NotDebian ]
- # Fix the system default fpicker
- default-system-fpicker.diff
--# don't display File->Wizards-> install dictionaries/fonts -
--# makes no sense on Linux n#74249
--default-no-install-wizards.diff
- 
- [ DebianBaseOnly ]
- odk-remove-non-free.diff
-@@ -496,6 +496,8 @@
- config_office-system-db-4.3.diff
- # fix the configure check for system mozilla and python, thanks to suka
- config_office-system-mozila-python-fix.diff
-+# fix the configure check for openldap
-+config_office-openldap-fix.diff
- 
- # Don't fail when building --without-stlport4
- buildfix-ucb-without-stlport4.diff
-@@ -732,6 +734,8 @@
- [ GentooOnly ]
- version-2-0-sysuserconfig.diff
- gentoo-splash.diff
-+no-fontooo-wizard.diff
-+no-ldap-mozilla.diff
- 
- #
- # NOTE: 64 bit OOo is work in progress!
---- distro-configs/Gentoo.conf.in       2005-08-26 11:48:38.000000000 +0200
-+++ distro-configs/Gentoo.conf.in.new   2005-10-11 23:32:25.000000000 +0200
-@@ -4,3 +4,4 @@
- --with-system-expat
- --with-system-stdlibs
- --with-system-xrender-headers
-+--without-system-jpeg
diff --git a/app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff b/app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff
deleted file mode 100644 (file)
index da503de..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- config_office/configure.in.orig    2005-08-11 16:07:16.000000000 +0200
-+++ config_office/configure.in 2005-08-13 12:39:17.000000000 +0200
-@@ -2784,7 +2784,7 @@
- fi
- 
- AC_MSG_CHECKING([whether to build LDAP configuration backend])
--if test "$enable_mozilla" = "no" && test "$enable_openldap" != "yes"; then
-+if test "$enable_openldap" != "yes"; then
-    AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed.])
-    WITH_LDAP=NO
- elif test "$with_system_mozilla" = "yes" || test "$enable_openldap" = "yes"; then
---- extensions/source/config/ldap/makefile.mk.orig     2005-06-19 02:53:37.725788224 +0200
-+++ extensions/source/config/ldap/makefile.mk  2005-06-19 02:54:17.068807176 +0200
-@@ -75,7 +75,7 @@
- .INCLUDE : settings.mk
- DLLPRE =
- 
--.IF "$(WITH_MOZILLA)" == "NO" && "$(WITH_OPENLDAP)" != "YES"
-+.IF "$(WITH_OPENLDAP)" != "YES"
- @all:
-       @echo "Mozilla disabled and no OpenLDAP wanted -> LDAP disabled."
- .ENDIF
---- scp2/source/ooo/file_library_ooo.scp.orig  2005-08-18 14:53:05.000000000 +0200
-+++ scp2/source/ooo/file_library_ooo.scp       2005-08-18 14:53:11.000000000 +0200
-@@ -185,7 +185,7 @@
- End
- 
- #ifndef WITHOUT_LDAP
--#if !defined WITHOUT_MOZILLA || defined WITH_OPENLDAP
-+#if defined WITH_OPENLDAP
- File gid_File_Lib_Ldapbe2
-     TXT_FILE_BODY;
-     Styles = (PACKED,UNO_COMPONENT,PATCH);
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0_rc2 b/app-office/openoffice/files/digest-openoffice-2.0.0_rc2
deleted file mode 100644 (file)
index a52f57f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-MD5 9359995ab8e140e0eaab7c6f571b6d46 ooo-build-2.0.rc2-2.tar.gz 4130987
-MD5 953371e1907b03e14895bababd019443 ooo680-m2-core.tar.bz2 156979138
-MD5 793c55bcf17e52b7d888729f55d984b6 ooo680-m2-lang.tar.bz2 33104453
-MD5 e5ec50d3c1b78d6880037d88036657e5 ooo680-m2-system.tar.bz2 19325507
-MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
deleted file mode 100644 (file)
index b9410ed..0000000
+++ /dev/null
@@ -1,231 +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_rc2.ebuild,v 1.7 2005/10/12 13:41:51 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/_rc2}"
-MY_PV="2.0.rc2-2"
-PATCHLEVEL="OOO680"
-PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}"
-SRC="ooo680-m2"
-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
-       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}/config_office-openldap-fix.diff ${PATCHDIR}/patches/src680 || die
-       cp -pPRf ${FILESDIR}/${OO_VER}/no-ldap-mozilla.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,1}\([0-9]\+\).*/\1/"`
-       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"
-}