Do not use cairo-font patches for systems without gtk and gnome, otherwise the build breaks, see bug #285084

Package-Manager: portage-2.2_rc52/cvs/Linux i686

6 files changed, 34 insertions, 23 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e4c91829d38a..60153dc19f07 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.502 2009/11/28 20:17:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.503 2009/11/28 20:25:32 suka Exp $
+
+  28 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.1.ebuild, files/gentoo-3.1.1.diff,
+  +files/nocairofonts.diff, -files/ooo-build-patchver.diff:
+  Do not use cairo-font patches for systems without gtk and gnome, otherwise
+  the build breaks, see bug #285084
 
   28 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6e5d586e2dad..706c4f7ae89f 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,9 +1,9 @@
 AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d SHA1 58ebb2cb06e03a2db56e798769e3f2d9b95dd823 SHA256 9ca280d88594658c214b21075e1a0f504106b29afe1b9b68915ca4c93b4fd1c2
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
-AUX gentoo-3.1.1.diff 2023 RMD160 2c103e493e27b5da24f90accdeda0bb4828dfdce SHA1 e6ef9b79b01b4fdf69c5b7c78df305709debe235 SHA256 3646859d41c3c70081bd4a1159399adcf1dbb0d8e2282faf97a9bbe09385693a
+AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1 65602b7388e8754d6c33ea641d7622f5ede80e1b SHA256 93b4f41a59a3b79880db4c5aa6eb937c9a34f4a0de94ef28f1ea24534ca2ad4b
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
-AUX ooo-build-patchver.diff 802 RMD160 9014d086a1b63b4124d1bb5b3d6a7dafc35fe2e1 SHA1 4066bd8ed0e17c15c81c299f9767c006c41987bd SHA256 566eaa6d3e1a6cb09d6e7d7b81c7c8556077d6cd82a7e87d065377f330a40526
+AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
@@ -39,6 +39,6 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.1.1.ebuild 13475 RMD160 f78c712492043ed8d13c992e0bc3d2e53b795915 SHA1 415e3638b8296d7d77dfc8d955f6bc0d69a5aa7a SHA256 c689e93a23234c020bb743bb30649d4dec3260c2f2341f75a85adb5c02a631ce
-MISC ChangeLog 103916 RMD160 00517a0fdc0af795d79d1b005be29abce0067e01 SHA1 9a698c09b8afe99554cb62870fec1cc2e87d3ef9 SHA256 448d94bb0d068f956b547a286ce836647b8f8b7d03652dae2037d3d5efa11d5d
+EBUILD openoffice-3.1.1.ebuild 13541 RMD160 bbecfc8b4be1ef64cb34c0c8830a0cc2b66673c3 SHA1 222c6745c832b3cf86b7a163697f1c7410c47477 SHA256 64157126f7271af11e13174247d2cecba0cfe8f949fb8cf9c71ff01385c526eb
+MISC ChangeLog 104195 RMD160 14da82e41990d69ba3121377e22ee2272ca78753 SHA1 ac33bea78a5d63ec7ed285543a6a75838369833d SHA256 e6041a4d907f99ee11054ad779aae10ebd3179b77cd618e4040e6036dfebda74
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
index ff7b99091222..68e8f6a1de65 100644
--- a/app-office/openoffice/files/gentoo-3.1.1.diff
+++ b/app-office/openoffice/files/gentoo-3.1.1.diff
@@ -11,6 +11,15 @@
  
  [ LinuxOnly ]
  # fix that allows OOo to work with a standard (unpatched) libjpeg,
+@@ -1528,6 +1528,8 @@
+ gentoo-sandbox.diff
+ # specific JVM search path
+ jvm-search-path.diff
++# build against xulrunner 1.9.1+
++xulrunner-1.9.1.diff, ccheney
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
 --- patches/dev300/kde4-configure2.diff
 +++ patches/dev300/kde4-configure2.diff
 @@ -7,7 +7,7 @@
diff --git a/app-office/openoffice/files/nocairofonts.diff b/app-office/openoffice/files/nocairofonts.diff
new file mode 100644
index 000000000000..a1f6f913eea4
--- /dev/null
+++ b/app-office/openoffice/files/nocairofonts.diff
@@ -0,0 +1,12 @@
+--- patches/dev300/apply 
++++ patches/dev300/apply 
+@@ -101,7 +101,7 @@
+ # openmamba
+ openmamba: LinuxCommon, GlobalDesktopFiles
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, IntegrateExtensions
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, BerkeleyDB43, IntegrateExtensions
+ GentooUnstable: GentooBase, GentooExperimental, MySQL
+ Gentoo : GentooBase
+ Gentoo64: GentooBase
+
diff --git a/app-office/openoffice/files/ooo-build-patchver.diff b/app-office/openoffice/files/ooo-build-patchver.diff
deleted file mode 100644
index 946df53eda3a..000000000000
--- a/app-office/openoffice/files/ooo-build-patchver.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nrup ooo-build-3.1.1.4.old/patches/apply.pl.in ooo-build-3.1.1.4/patches/apply.pl.in
---- ooo-build-3.1.1.4.old/patches/apply.pl.in	2009-08-05 12:20:53.000000000 +0000
-+++ ooo-build-3.1.1.4/patches/apply.pl.in	2009-11-21 19:55:48.000000000 +0000
-@@ -920,8 +920,11 @@ sub is_old_patch_version()
- 
-     open ($Patch, "@GNUPATCH@ --version|") || die "Can't run patch: $!";
-     $ver_line = <$Patch>;
--    $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
--    if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
-+    $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ ||
-+            $ver_line =~ m/\s+(\d+)\.(\d+)/ ||
-+            $ver_line =~ m/\s+(\d+)/ ||
-+            die "Can't get patch version\n";
-+    if ($1 > 2 || ($1 == 2 && ($2 > 5 || ($2 == 5 && $3 >= 9)))) {
- 	$is_old = 0;
-     }
-     
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 79de45c014b6..49c914ac43c1 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.23 2009/11/28 20:17:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.24 2009/11/28 20:25:32 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -236,6 +236,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	epatch "${FILESDIR}/Gentoo_ODK_install.patch"
+	use !gtk && use !gnome && epatch "${FILESDIR}/nocairofonts.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die