bunch of new stuff for our build, most notably cairo-magic for your presentations

Package-Manager: portage-2.1_pre5-r1

5 files changed, 61 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 667cdc0d5f4e..f911ad391d2e 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.186 2006/02/27 07:09:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.187 2006/03/01 17:56:59 suka Exp $
+
+*openoffice-2.0.2_rc3-r1 (01 Mar 2006)
+
+  01 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.2/gentoo-2.0.2.diff, -openoffice-2.0.2_rc3.ebuild,
+  +openoffice-2.0.2_rc3-r1.ebuild:
+  Revision bump with a bunch of new stuff for the Gentoo-build, most notably
+  cairo-magic for your presentations.
 
 *openoffice-2.0.2_rc3 (27 Feb 2006)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 5e0c61906e54..40d5c83bf5fb 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,24 +1,27 @@
-MD5 d702b735bf9f860080e6be4f55e9d148 ChangeLog 40378
-RMD160 593188ea768d30c5dfb1cd5fdff01b8d3e43c181 ChangeLog 40378
-SHA256 3715062a2358245fb32bcd622f71926fbb7a5d8408e66f459ae50c7a8640c7a5 ChangeLog 40378
+MD5 934977cfe0f04c6fbe6528c3b38a6357 ChangeLog 40686
+RMD160 b3b63248326bc9d50d2b2451964f6a361080f8ae ChangeLog 40686
+SHA256 3eab92bff3db037c9e1888bd2deda3281afd1745eba99d6061912c6ec157ef8d ChangeLog 40686
 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 69fc998d18a15e4b491365f12ec9a5a3 files/2.0.2/gentoo-2.0.2.diff 1105
+RMD160 0c7614994d1e6b7a2acbe66203d0a5bcb47f4f69 files/2.0.2/gentoo-2.0.2.diff 1105
+SHA256 6951db658c231b927ba68b5cb07ce498c36e601f4a24cf5f2a561d1e9bef5c38 files/2.0.2/gentoo-2.0.2.diff 1105
 MD5 d741869e1665d1423c2086f1723b93d7 files/2.0.2/removecrystalcheck.diff 572
 RMD160 5e7b6c92506bd7d3f4e09e3ee43656a6f4f8c30d files/2.0.2/removecrystalcheck.diff 572
 SHA256 06a05ee5a27ce6a1de1c9eeebe4e22b860d0a6292f778ec6c81aa2c28c1daa08 files/2.0.2/removecrystalcheck.diff 572
 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 e405bc820dc249661bdfdeff5e855453 files/digest-openoffice-2.0.2_rc3 2265
-RMD160 b8695e9f025231a3f95ce167fd660da2fdc38c29 files/digest-openoffice-2.0.2_rc3 2265
-SHA256 3803458ff33981f774b9ba5f9f4871ac894baede2ef2666ca8e32f5cde325d48 files/digest-openoffice-2.0.2_rc3 2265
+MD5 e405bc820dc249661bdfdeff5e855453 files/digest-openoffice-2.0.2_rc3-r1 2265
+RMD160 b8695e9f025231a3f95ce167fd660da2fdc38c29 files/digest-openoffice-2.0.2_rc3-r1 2265
+SHA256 3803458ff33981f774b9ba5f9f4871ac894baede2ef2666ca8e32f5cde325d48 files/digest-openoffice-2.0.2_rc3-r1 2265
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461
 MD5 e00605b0acc60de47e6eee98a5f32894 openoffice-2.0.1.ebuild 7274
 RMD160 ed88f0dc45b87c259271f83fa9d4fd8bb55fab93 openoffice-2.0.1.ebuild 7274
 SHA256 56a67a1cd040cd120cb5227ed0fa926fbf378c5ba46e267bc43a9b0218f87fa7 openoffice-2.0.1.ebuild 7274
-MD5 41ed385685039c713138446cc8752edd openoffice-2.0.2_rc3.ebuild 7565
-RMD160 7c4000163a6240ddcb8b725cc61d58195958c939 openoffice-2.0.2_rc3.ebuild 7565
-SHA256 a3287e1e0a6df334520d60da417c555c91e2ff5ed7480b6c81736372d785b2f0 openoffice-2.0.2_rc3.ebuild 7565
+MD5 3be37a6a03f673911e567619ade9e3e8 openoffice-2.0.2_rc3-r1.ebuild 7803
+RMD160 9818e9a3d36c8947a27c06106bc4abc3aba20e7d openoffice-2.0.2_rc3-r1.ebuild 7803
+SHA256 4baa54e4ea7ae1f4480630498453f9b52d21e17351a9923b74e490fd92a3a4b4 openoffice-2.0.2_rc3-r1.ebuild 7803
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
new file mode 100644
index 000000000000..fabc0f390588
--- /dev/null
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -0,0 +1,31 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -64,8 +64,8 @@
+ Frugalware64: FrugalwareBase, 64bit, Frugalware64Only
+ QiLinux: QiLinuxOnly, LinuxCommon, GlobalDesktopFiles, FilePickers
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown
+-GentooUnstable: GentooBase, GentooExperimental, GCJExperimental, BerkeleyDB43, AtkBridge, SystemJavaBits
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, GCJExperimental, AtkBridge, CalcSolver, SystemJavaBits
++GentooUnstable: GentooBase, GentooExperimental, BerkeleyDB43
+ Gentoo : GentooBase
+ Gentoo64: GentooBase, 64bit
+ # Win32
+@@ -940,8 +940,6 @@
+ #xt-precompile.diff
+ # build with -fomit-frame-pointer
+ omit-fp-workaround.diff
+-# hack: drop gcc libs
+-store-drop-gcc-libs-on-linking.diff
+ # more system db >= 4.3
+ system-db-4.3-use-lpthread.diff
+ # iz#58474 - build this part with db 4.2/4.3/4.4
+@@ -969,6 +967,8 @@
+ gentoo-gcc-naming-and-versioning.diff
+ # searchpaths of nspr/nss libs
+ gentoo-xmlsecurity-system-nss.diff
++# hack: drop gcc libs
++store-drop-gcc-libs-on-linking.diff
+ 
+ #
+ # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2_rc3 b/app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1
index 2cd0df0758f4..2cd0df0758f4 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.2_rc3
+++ b/app-office/openoffice/files/digest-openoffice-2.0.2_rc3-r1
diff --git a/app-office/openoffice/openoffice-2.0.2_rc3.ebuild b/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild
index eee773d8a532..e36f3fbfe7ec 100644
--- a/app-office/openoffice/openoffice-2.0.2_rc3.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2_rc3-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.2_rc3.ebuild,v 1.2 2006/02/27 20:21:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild,v 1.1 2006/03/01 17:56:59 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="binfilter curl eds firefox gnome gtk java kde ldap mozilla xml2"
+IUSE="binfilter cairo curl eds firefox gnome gtk java kde ldap mozilla xml2"
 
 MY_PV="${PV/_rc3/}"
 MY_PV2="oob680.3.0"
@@ -42,6 +42,8 @@ RDEPEND="!app-office/openoffice-bin
 		>=gnome-base/gnome-vfs-2.6
 		>=gnome-base/gconf-2.0 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
+	cairo? ( >=x11-libs/cairo-1.0.2
+		>=x11-libs/gtk+-2.8 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( >=kde-base/kdelibs-3.2 )
 	mozilla? ( !firefox? ( >=www-client/mozilla-1.7.12 )
@@ -144,6 +146,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${MY_PV}/removecrystalcheck.diff
+	epatch ${FILESDIR}/${MY_PV}/gentoo-${MY_PV}.diff
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
@@ -160,6 +163,7 @@ src_unpack() {
 	echo "`use_enable eds evolution2`" >> ${CONFFILE}
 	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
 	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
+	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
 
 }
 
@@ -193,9 +197,11 @@ src_compile() {
 		--with-tag=${SRC} \
 		"${GTKFLAG}" \
 		`use_enable kde` \
+		`use_enable cairo` \
+		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
 		--disable-access \
 		--disable-mono \
-		--disable-cairo \
 		--disable-post-install-scripts \
 		--enable-hunspell \
 		--with-system-hunspell \
@@ -248,5 +254,4 @@ pkg_postinst() {
 	einfo
 	einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2,"
 	einfo " ooweb2 or oowriter2"
-
 }