New ooo-build-release (2.0.4.11) also get rid of the -system-tarball (and save 27 MByte of download)

(Portage version: 2.1.2_rc4)

4 files changed, 24 insertions, 11 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 80e2300bf03f..51e0d46041e6 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.279 2006/12/11 20:48:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.280 2006/12/24 09:18:16 suka Exp $
+
+  24 Dec 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.4/gentoo-2.0.4.diff, openoffice-2.0.4.ebuild:
+  Another release of the patchset - ooo-build.2.0.4.11. Also some minor fixes
+  so that we can get rid of the system -system-tarball. Which is: Yeah - some
+  27 MB of Download saved.
 
   11 Dec 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4.ebuild:
diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
index a64755cbb2d1..259ed71a81dd 100644
--- a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -20,3 +20,13 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
+--- distro-configs/Gentoo.conf.in 
++++ distro-configs/Gentoo.conf.in 
+@@ -11,7 +11,6 @@
+ --with-system-libxslt
+ --with-system-stdlibs
+ --with-system-xrender-headers
+---without-system-jpeg
+ --without-nas
+ --without-myspell-dicts
+ --with-vendor=\"Gentoo Foundation\"
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4 b/app-office/openoffice/files/digest-openoffice-2.0.4
index cccdf6b91167..5f336756e241 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.4
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4
@@ -10,9 +10,6 @@ SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f OOO_2_0_
 MD5 b10a51b80287da2fe92267734ae073bf OOO_2_0_4-sdk_oo.tar.bz2 29295983
 RMD160 60ef50b4206d3424103289a53d1cd897729c85e7 OOO_2_0_4-sdk_oo.tar.bz2 29295983
 SHA256 fad5de27f827c31064fea1e222092079af98866680e4be57b610dd5015a7da0d OOO_2_0_4-sdk_oo.tar.bz2 29295983
-MD5 7d5aa9932eaf739bd63449d16cc6a6d0 OOO_2_0_4-system.tar.bz2 28794627
-RMD160 f47a7d516f79ac4734e04cf6cbbcb7424a573d59 OOO_2_0_4-system.tar.bz2 28794627
-SHA256 4601d6dd0483b1df1f975bc3ccae1f6c354a4e083ade94483e8a31842bd9da5c OOO_2_0_4-system.tar.bz2 28794627
 MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
@@ -25,9 +22,9 @@ SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 e7494d104e01420055a601b85d352be4 ooo-build-2.0.4.10.tar.gz 4666697
-RMD160 e53dbdda835d78e03e8c5a919d90d5b15fb90c94 ooo-build-2.0.4.10.tar.gz 4666697
-SHA256 c46dc56638fbec9bd633e5edf602eeaab67779680167c4182f3feaae4b92c0c9 ooo-build-2.0.4.10.tar.gz 4666697
+MD5 264ade045f9829ad45b1a5ae0cb6b368 ooo-build-2.0.4.11.tar.gz 4675395
+RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 ooo-build-2.0.4.11.tar.gz 4675395
+SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca ooo-build-2.0.4.11.tar.gz 4675395
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index a246062a9255..8b180cb4aef1 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -1,12 +1,12 @@
 # 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.4.ebuild,v 1.21 2006/12/11 20:48:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.22 2006/12/24 09:18:16 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
 IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
 
-MY_PV="${PV}.10"
+MY_PV="${PV}.11"
 PATCHLEVEL="OOD680"
 SRC="OOO_2_0_4"
 S="${WORKDIR}/ooo"
@@ -15,7 +15,6 @@ 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
@@ -68,12 +67,14 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.2.0
 	cups? ( net-print/cups )
+	media-libs/jpeg
 	media-libs/libpng
 	sys-devel/flex
 	sys-devel/bison
 	app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
+	>=app-admin/eselect-oodict-20060706
 	dev-libs/expat
 	>=dev-libs/icu-3.4
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
@@ -102,7 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
-	>=app-admin/eselect-oodict-20060706
 	java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
 		dev-java/ant-core )
 	dev-libs/libxslt