Change xml2 use-flag to xml for bug #116346, also clean out old version

Package-Manager: portage-2.1_pre7-r3

6 files changed, 22 insertions, 288 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 61b6c0e2986e..0c2a300309c1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.202 2006/04/01 12:14:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.203 2006/04/02 16:02:16 suka Exp $
+
+  02 Apr 2006; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-2.0.1.ebuild, openoffice-2.0.1-r1.ebuild,
+  openoffice-2.0.2.ebuild:
+  Change xml2 use-flag to xml for bug #116346, also clean out old version
 
   01 Apr 2006; Andreas Proschofsky <suka@gentoo.org>
   -files/2.0.2/pythonfix.diff, +files/2.0.2/gentoo-2.0.2.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 1c99c14e6742..9631867e625e 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,15 +1,12 @@
-MD5 d16cec018ec8f05f002dd156d5a2ec23 ChangeLog 43529
-RMD160 42b1c869d3393be21066c2d3877b19f38e0547bc ChangeLog 43529
-SHA256 f902fe1bb6eab275bf0404951a51aa4cf8760b65594820f9bf357dc7be58fb91 ChangeLog 43529
+MD5 665a021343d11d5832d227abc940507e ChangeLog 43739
+RMD160 34612bdb157803c185979384e8a78139f59555b3 ChangeLog 43739
+SHA256 f61ea9299ea37bd1c7a9e2760e322e165774bab4af98f0abaa198ad3f92aee05 ChangeLog 43739
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
 MD5 6bdcbcb4270ebd6863e30cc2bd0220d1 files/2.0.2/gentoo-2.0.2.diff 840
 RMD160 2375bbc2ee803d4e4195b3e0ddae93d767a8a552 files/2.0.2/gentoo-2.0.2.diff 840
 SHA256 c2da419a6d23ab7553a2809e7c64729dcd78a1726bad0c47b96b20fa0cce1512 files/2.0.2/gentoo-2.0.2.diff 840
-MD5 9017e3971f27ac77833ae962069feccf files/digest-openoffice-2.0.1 2024
-RMD160 94f476c151e7c42212f2d6dd05b48443ca784e1e files/digest-openoffice-2.0.1 2024
-SHA256 ac0d68a776f61080710f7f031ed79457a1f1a30bc24abcc85a563ce1df2d9d46 files/digest-openoffice-2.0.1 2024
 MD5 9017e3971f27ac77833ae962069feccf files/digest-openoffice-2.0.1-r1 2024
 RMD160 94f476c151e7c42212f2d6dd05b48443ca784e1e files/digest-openoffice-2.0.1-r1 2024
 SHA256 ac0d68a776f61080710f7f031ed79457a1f1a30bc24abcc85a563ce1df2d9d46 files/digest-openoffice-2.0.1-r1 2024
@@ -19,12 +16,9 @@ SHA256 133d9271e6775bc7c0e29946edef421d00c49385db65df8f9b4d7d772425e088 files/di
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461
-MD5 5e0f9545f909234f6455bf40b6a0c99f openoffice-2.0.1-r1.ebuild 7262
-RMD160 91f8f963ce3558c5caf6e108358db0d21c596ed1 openoffice-2.0.1-r1.ebuild 7262
-SHA256 322dc237af1e22aeff84b44a38d7e49c268633cc6aa93ccf8b64cc34f381b3ea openoffice-2.0.1-r1.ebuild 7262
-MD5 d1a03bec2bd379dacd92fed8500f7dae openoffice-2.0.1.ebuild 7260
-RMD160 f0bdf5718b268e2dc0dd5974404f96e8c72a7db8 openoffice-2.0.1.ebuild 7260
-SHA256 6f23195aa0463a323d96728f88765e61f857c16e7969848acea2164733f6dc04 openoffice-2.0.1.ebuild 7260
-MD5 e61965c40e927f955b0447f562a6e040 openoffice-2.0.2.ebuild 7787
-RMD160 4345b8b069d5c36cbb91be95f6d403a7cf6e9e64 openoffice-2.0.2.ebuild 7787
-SHA256 eeeca8ffa74004e7e30f4b50ad5072efd59e3268916a4c956497e8f8dda604a3 openoffice-2.0.2.ebuild 7787
+MD5 c73fad8c51c44b06321665fd0dfb89c4 openoffice-2.0.1-r1.ebuild 7337
+RMD160 4aaafe79b1b728b8eba1ea8381d0b9c5a181a06f openoffice-2.0.1-r1.ebuild 7337
+SHA256 f38b01bfb5954b89bc38e02e7645bcce742a96a7de74fc35fb88b9a7c8d871d1 openoffice-2.0.1-r1.ebuild 7337
+MD5 1ebf65036212f3cbde4c0fcf67680108 openoffice-2.0.2.ebuild 7785
+RMD160 34585547a47a6372b39f9cf841daeb5e19588643 openoffice-2.0.2.ebuild 7785
+SHA256 a93d78ed2f8032415382e207bd6e5012818fc505b4f3ce55555d730ba15c8e4a openoffice-2.0.2.ebuild 7785
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.1 b/app-office/openoffice/files/digest-openoffice-2.0.1
deleted file mode 100644
index 5cc6218cb96d..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.1
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 4e50fd0fb02155edc410e9fea01e5c59 OOO_2_0_1-binfilter.tar.bz2 18062219
-RMD160 2ff50011435543209c3d7956e43c239ac4551450 OOO_2_0_1-binfilter.tar.bz2 18062219
-SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8 OOO_2_0_1-binfilter.tar.bz2 18062219
-MD5 fc0a44c3344c2274b4ea2ee1a8501df5 OOO_2_0_1-core.tar.bz2 109793621
-RMD160 39af65ae67c6db30b39327da5821064af390a205 OOO_2_0_1-core.tar.bz2 109793621
-SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3 OOO_2_0_1-core.tar.bz2 109793621
-MD5 694a196fbcc4f9eb0bdd84656b6b6b2d OOO_2_0_1-lang.tar.bz2 55193297
-RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a OOO_2_0_1-lang.tar.bz2 55193297
-SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705 OOO_2_0_1-lang.tar.bz2 55193297
-MD5 642eaffe89f652358de8261618b3d016 OOO_2_0_1-system.tar.bz2 22499081
-RMD160 c234eb650b0ac66177a1182cea8048b65574f2ce OOO_2_0_1-system.tar.bz2 22499081
-SHA256 ba828b1e3fa7b0bc010e51e0927167ce2fb4dad00bc305d552b0e0403f651007 OOO_2_0_1-system.tar.bz2 22499081
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
-SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
-MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
-SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
-MD5 a80519e90879edd2f476dc9c46fdc05d ooo-build-2.0.1.3.tar.gz 4458527
-RMD160 e433e25d58ecb837a7730abf78869c1c27ce687c ooo-build-2.0.1.3.tar.gz 4458527
-SHA256 d56698ca4440b3bee2d144b93e742a3beeae045e303dcd6d02d49a696f9ddd28 ooo-build-2.0.1.3.tar.gz 4458527
-MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
-RMD160 4daa3f2139d479cdeb89f829c6d7089fadb59506 ooo_crystal_images-6.tar.bz2 1308872
-SHA256 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-2.0.1-r1.ebuild b/app-office/openoffice/openoffice-2.0.1-r1.ebuild
index 9ea8dc81c40c..54c756c1e4ba 100644
--- a/app-office/openoffice/openoffice-2.0.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1-r1.ebuild,v 1.2 2006/04/01 12:14:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1-r1.ebuild,v 1.3 2006/04/02 16:02:16 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="binfilter eds gnome gtk java kde ldap mozilla xml2"
+IUSE="binfilter eds gnome gtk java kde ldap mozilla xml"
 
 MY_PV="${PV}.3"
 PATCHLEVEL="OOA680"
@@ -224,6 +224,9 @@ src_install() {
 	insinto /usr/share/fonts/TTF/
 	doins fonts/*.ttf
 
+	# Fix the permissions for security reasons
+	chown -R root:root ${D} || die
+
 }
 
 pkg_postinst() {
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
deleted file mode 100644
index d777cabe7801..000000000000
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.26 2006/04/01 12:14:53 blubb Exp $
-
-inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
-
-IUSE="binfilter eds gnome gtk java kde ldap mozilla xml2"
-
-MY_PV="${PV}.3"
-PATCHLEVEL="OOA680"
-SRC="OOO_2_0_1"
-S="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/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
-	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.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
-	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="-amd64 ppc sparc x86"
-
-RDEPEND="!app-office/openoffice-bin
-	|| ( (
-			x11-libs/libXaw
-			x11-libs/libXinerama
-		)
-		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 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	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}
-	|| ( (
-			x11-libs/libXrender
-			x11-proto/printproto
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11 )
-	net-print/cups
-	>=sys-apps/findutils-4.1.20-r1
-	app-shells/tcsh
-	dev-perl/Archive-Zip
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=net-misc/curl-7.9.8
-	sys-libs/zlib
-	sys-libs/pam
-	!dev-util/dmake
-	>=dev-lang/python-2.3.4
-	java? ( >=virtual/jdk-1.4
-		dev-java/ant-core
-		>=dev-java/java-config-1.2.11-r1 )
-	!java? ( dev-libs/libxslt
-		>=dev-libs/libxml2-2.0 )
-	ldap? ( net-nds/openldap )
-	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 bs ca cs cy da de el en en_GB en_US en_ZA es et fa fi fr ga gu_IN he hi_IN hr hu it ja km ko lo lt lv mk nb ne nl nn nr ns pa_IN pl pt_BR ru rw sh_YU sk sl sr_CS st sv sw_TZ 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//en/en_US}"
-		export LINGUAS_OOO="${LINGUAS_OOO//en_US_GB/en_GB}"
-		export LINGUAS_OOO="${LINGUAS_OOO//en_US_US/en_US}"
-		export LINGUAS_OOO="${LINGUAS_OOO//_/-}"
-	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
-	elif use sparc; then
-		ewarn " Java support on sparc is very flaky, we don't recommend "
-		ewarn " building openoffice this way."
-		ebeep 5
-		epause 10
-	fi
-
-	#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"
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	#Some fixes for our patchset
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/alwayscrystal.diff
-
-	#Use flag checks
-	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-	echo "`use_with xml2 system-libxml`" >> ${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}
-
-	echo "--with-system-curl"  >> ${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
-	export JOBS="1"
-	if [ "${WANT_DISTCC}" == "true" ]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	fi
-
-	# Make sure gnome-users get gtk-support
-	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
-
-	cd ${S}
-	autoconf || die
-	./configure ${MYCONF} \
-		--with-distro="${DISTRO}" \
-		--with-vendor="Gentoo" \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--with-binsuffix="2" \
-		--with-installed-ooo-dirname="openoffice" \
-		"${GTKFLAG}" \
-		`use_enable kde` \
-		--disable-access \
-		--disable-mono \
-		--disable-cairo \
-		--disable-post-install-scripts \
-		--mandir=/usr/share/man \
-		|| 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"
-	append-flags "-fno-strict-aliasing"
-	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"
-	make DESTDIR=${D} install || die "Installation failed!"
-
-	# Install corrected Symbol Font
-	insinto /usr/share/fonts/TTF/
-	doins fonts/*.ttf
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	[ -x /sbin/chpax ] && [ -e /usr/lib/openoffice/program/soffice.bin ] && chpax -zm /usr/lib/openoffice/program/soffice.bin
-
-	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"
-}
diff --git a/app-office/openoffice/openoffice-2.0.2.ebuild b/app-office/openoffice/openoffice-2.0.2.ebuild
index a0ae565d6cc7..04f5c5bd7d76 100644
--- a/app-office/openoffice/openoffice-2.0.2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.7 2006/04/01 12:14:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.8 2006/04/02 16:02:16 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions mono toolchain-funcs
 
-IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono mozilla xml2"
+IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono mozilla xml"
 
 MY_PV="${PV}.4"
 PATCHLEVEL="OOB680"