Alter uri calculations to sattisfy even old tarballs. Fixes bug #376683 for future.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 908129cacecc9f0b0ff17159ad0313007e7d7d0b..dc5ef9713a66981e90a9519adb7c188ad0b561a8 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.70 2011/07/28 10:31:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.71 2011/07/28 10:43:23 scarabeus Exp $
+
+  28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild:
+  Alter uri calculations to sattisfy even old tarballs. Fixes bug #376683 for
+  future.
 
   28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ab5c028fe91f1090775cd97e50b8a3f46c8d462d..4f3ef181998fcb9456254e51246200a02f8e2e6c 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -165,13 +165,13 @@ 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 18151 RMD160 fa2b192d9c390800b35905c6ad73fb086d65a808 SHA1 11b0040c738bfe6450cc0c804cea93b69e7f30bc SHA256 1503991e6cf7ee0303c7603c80d91d939fab41f9279f5b39ead4dbdc4106e981
-MISC ChangeLog 14284 RMD160 d884d68ab4771bb6947a5e7c2e53f72e66ecdd42 SHA1 43f4be9bb362a00ab4d571835d2593bd2ecf172a SHA256 9fe4e0e2dd40717f9307c774e35b026419375565eeb17f2474010e7061b273a2
+EBUILD libreoffice-3.4.2.3.ebuild 18309 RMD160 8d6941cbb44b8d41c92e1b971a28eaa5cd9770f6 SHA1 a2a4647c71263f1aaab857ba7f0ceb6ab923b4e4 SHA256 c6248a61b975a58f9d50b35f7a69dc11e725160a37e51914ef6024b6300a6a5f
+MISC ChangeLog 14458 RMD160 50be394e5edb098da0e2847621ba10fd362a3f9f SHA1 7174f0bb41ebd027d36c421a90acf31983a60d29 SHA256 49b805a1209e990b35bc6ecf811557ecf70a5702f618312ca386a566b1b18620
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4xOmoACgkQHB6c3gNBRYecpgCfXnlZN9zkQ/7OtzrWxM5ny9vq
-HCsAoLbuDuZCe1pnezblvq90tA89nquM
-=b2IO
+iEYEARECAAYFAk4xPUAACgkQHB6c3gNBRYc8IwCeOMeK1j0nNyyL6UluS0LMv/kM
+tBIAmwZqoEvlWmIrI/IICxpqp9ed5PP0
+=9Mal
 -----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 446b7aa4acb792e49d74cf3b5f6037477b1ad6dc..e009b432cbb2915aa765a9968f725f18da9bdb42 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.6 2011/07/28 10:31:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.7 2011/07/28 10:43:23 scarabeus Exp $
 
 EAPI=3
 
@@ -10,8 +10,14 @@ CMAKE_REQUIRED="never"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads,xml"
 
-DEV_URI="http://download.documentfoundation.org/libreoffice/src"
-DEV_EXP_URI="http://dev-builds.libreoffice.org/pre-releases/src"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+       http://dev-builds.libreoffice.org/pre-releases/src 
+       http://download.documentfoundation.org/libreoffice/src
+       http://download.documentfoundation.org/libreoffice/old/src
+"
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
@@ -27,7 +33,7 @@ SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
 MODULES="artwork base calc components extensions extras filters help
 impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
 ure writer translations"
-for i in ${DEV_URI} ${DEV_EXP_URI}; do
+for i in ${DEV_URI}; do
        # split out as bootstrap is required to be done first
        SRC_URI+=" ${i}/${PN}-bootstrap-${PV}.tar.bz2"
        for mod in ${MODULES}; do
@@ -36,6 +42,7 @@ for i in ${DEV_URI} ${DEV_EXP_URI}; do
        unset mod
 done
 unset i
+unset DEV_URI
 
 # addons
 # FIXME: actually review which one of these are used