Fix build with sys-devel/patch-2.6, thanks to Anthony Low <shinji@pikopiko.org> for the fix. Closes bug #293385

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

4 files changed, 28 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6acfd4150ad7..0a329818b22c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.496 2009/10/29 11:43:23 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.497 2009/11/25 09:43:12 suka Exp $
+
+  25 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.1.ebuild, +files/ooo-build-patchver.diff:
+  Fix build with sys-devel/patch-2.6, thanks to Anthony Low
+  <shinji@pikopiko.org> for the fix. Closes bug #293385
 
   29 Oct 2009; Andreas Proschofsky <suka@gentoo.org>
   files/gentoo-3.1.1.diff:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 7602718247af..c215cf4a3eda 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,6 +2,7 @@ AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9
 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-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
+AUX ooo-build-patchver.diff 802 RMD160 9014d086a1b63b4124d1bb5b3d6a7dafc35fe2e1 SHA1 4066bd8ed0e17c15c81c299f9767c006c41987bd SHA256 566eaa6d3e1a6cb09d6e7d7b81c7c8556077d6cd82a7e87d065377f330a40526
 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
@@ -37,6 +38,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 13685 RMD160 1a9be69653f6acf607f1a12aa9f6b25d3bd92898 SHA1 c57a9c51a102051b89ecb210846b58224b80b1b4 SHA256 d82f20e1bb865aacc11f0905715520029a0ad2084c7ddacf0fd351e5c3669866
-MISC ChangeLog 102842 RMD160 691ee74569436e17af8aa7bdb8aad97e2e88b17e SHA1 3dc5eb37584289eec4b5fb89a47ded9b90fcfe6f SHA256 26ea6e52fc24336d4fd7f18ad6e786d44e443a9a1b31ec47d50b5bc56e878f1b
+EBUILD openoffice-3.1.1.ebuild 13726 RMD160 d509c68cbffe7fe092fe3253609949c9eea63f4d SHA1 b01a30a1d965f5ced6b101dd1ccc9485ff53f4b4 SHA256 d4630a87f9253536bbe353cd22de9698da69d946357c78eb5c3e2a7d84f2bb4f
+MISC ChangeLog 103071 RMD160 55979b5be80776a326a55855f3881267021db0a5 SHA1 e69272cd4121af2e335cdc2a620037d179970cc0 SHA256 551afcd2daa098464b4707b90db9aa788a956ad6afc1d7c817ca2c5ef26fe6e3
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/ooo-build-patchver.diff b/app-office/openoffice/files/ooo-build-patchver.diff
new file mode 100644
index 000000000000..946df53eda3a
--- /dev/null
+++ b/app-office/openoffice/files/ooo-build-patchver.diff
@@ -0,0 +1,17 @@
+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 2ff30ce7d45e..050196d6e73d 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.17 2009/10/28 15:53:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.18 2009/11/25 09:43:12 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -240,6 +240,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
+	epatch "${FILESDIR}/ooo-build-patchver.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die