force make-3.82 for 3.4.*, see: http://lists.freedesktop.org/archives/libreoffice...

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index dc30662ba3b71ec85f2fb3f29cd2838ea9e081a6..49cee001d0f05900b62b7d64cb2216f057cf190b 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.89 2011/08/07 11:36:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.90 2011/08/07 14:37:55 lxnay Exp $
+
+  07 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> libreoffice-3.4.2.3.ebuild,
+  libreoffice-3.4.9999.ebuild, libreoffice-9999.ebuild:
+  force make-3.82 for 3.4.*, see:
+  http://lists.freedesktop.org/archives/libreoffice/2011-May/012523.html
 
 *libreoffice-9999 (07 Aug 2011)
 

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fe21d23cab2db8d3ee2f8c112c5766414c1b0d34..22a77244bd94035a839e0a51970f5be60bd236fa 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -170,15 +167,8 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 19238 RMD160 951ef8a754c3c861510be41efda560fc95d3e2fa SHA1 fb489942b0c35f4f1dad4082d152df01dbfffa6e SHA256 89f564402b41550814d39397c6dc0e06ffd5bbd6a4b40ff44998a0aa5e73bb08
-EBUILD libreoffice-3.4.9999.ebuild 19038 RMD160 b14818fe4b0cac4df64a8b1331afe908af91f674 SHA1 28904afcf5fe446fd9a4930c8d3cdcd81f81ff09 SHA256 b902651dab5d87819b7236f7c12715129bf6b351dd128001bed79042c32e9318
-EBUILD libreoffice-9999.ebuild 18871 RMD160 9ba53953e2c5f54f6b3271b684e3162c1e3731ef SHA1 c477d5df1c7cb98fae9dacb60430477ca8cbc942 SHA256 2697fd07e362736c91976b8ef2c31e68936056d957c1daf78d04ae21fcf6c9fb
-MISC ChangeLog 17807 RMD160 e6866521d1e63c9e2274ff5505c87aa675350e78 SHA1 f0220a86b8eb8afdbb1726e21c4a16a134c8740c SHA256 56fc1ee1d8a134ccd3148f76691be3a8ba58d68bd2ba400511c9c0384d4ce240
+EBUILD libreoffice-3.4.2.3.ebuild 19258 RMD160 98feedaa6e9f65d571ee7599f8da3afef748cac3 SHA1 3c8d81230332dd40654373231c36e15f8d38f08f SHA256 77fd3a15d8151762dd4b154b76ce2ffe103a797e50f331e8c525c41af29f8b03
+EBUILD libreoffice-3.4.9999.ebuild 19057 RMD160 ceab97957b9b6ff220e9da29ec39fb1c93193a5c SHA1 a15017b25c282c5158bc6a5694230f1a38ec7a3d SHA256 17be51424faf891baba2db353aabe48293f84bfc5b7da5e6541a13341b1d3061
+EBUILD libreoffice-9999.ebuild 18890 RMD160 32ce87d9c338f67e3e037bd507e5673a7d349731 SHA1 f59eed0422b2d48b1efeab3df63841f7c5f20309 SHA256 62e01b9b969c0b94b00cab6746a463f940f2fa178596f4e7e863982e5f8555a1
+MISC ChangeLog 18045 RMD160 6b93b37f0bcf29eeda8771d39c7aed8a01563469 SHA1 0ed8de32589f1cc9f84963f2699570a070db9969 SHA256 0b378ed09328e2e37f38777c8f4be524ba69e82522349d7c7a55587908807f82
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk4+eK4ACgkQHB6c3gNBRYe4cQCgxGRLdLVqjgOSGglHPMstpZ8J
-rW0AoIk+BwnzgsdvsG3HDGGEy6UGpWAt
-=AKEo
------END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 04401f2a48cc1be0dba6d4c3292544e8a8430555..6b300f447389cc2b8b3604d269d61fee63b48ae8 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.21 2011/08/06 16:48:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.22 2011/08/07 14:37:55 lxnay Exp $
 
 EAPI=3
 
@@ -210,6 +210,7 @@ DEPEND="${COMMON_DEPEND}
        sys-devel/bison
        sys-apps/coreutils
        sys-devel/flex
+       >=sys-devel/make-3.82
        sys-libs/zlib
        x11-libs/libXtst
        x11-proto/randrproto

diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index 5b7de7cb4e713b167256d0d44d9bf1a837fb50d7..74ed4df75110ddec9ad1a4f389687e3394914024 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.8 2011/08/07 11:36:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.9 2011/08/07 14:37:55 lxnay Exp $
 
 EAPI=3
 
@@ -209,6 +209,7 @@ DEPEND="${COMMON_DEPEND}
        sys-devel/bison
        sys-apps/coreutils
        sys-devel/flex
+       >=sys-devel/make-3.82
        sys-libs/zlib
        x11-libs/libXtst
        x11-proto/randrproto

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4c75b5af5cd7afc2cea15edf0b9f08df73d8bbb1..b67137337bd2bbd51a9d101817f2ef660efa4e0a 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.1 2011/08/07 11:36:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.2 2011/08/07 14:37:55 lxnay Exp $
 
 EAPI=3
 
@@ -212,6 +212,7 @@ DEPEND="${COMMON_DEPEND}
        sys-apps/coreutils
        sys-devel/flex
        sys-devel/gettext
+       >=sys-devel/make-3.82
        sys-libs/zlib
        x11-libs/libXtst
        x11-proto/randrproto