summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-28 10:43:23 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-28 10:43:23 +0000
commit0c1bebbdc51b3e325058a0dba5d22f5341d74eeb (patch)
tree1f432f03eab9cf9a444b0b6e7429ba15b6c80005 /app-office
parentMark stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian "i... (diff)
downloadgentoo-2-0c1bebbdc51b3e325058a0dba5d22f5341d74eeb.tar.gz
gentoo-2-0c1bebbdc51b3e325058a0dba5d22f5341d74eeb.tar.bz2
gentoo-2-0c1bebbdc51b3e325058a0dba5d22f5341d74eeb.zip
Alter uri calculations to sattisfy even old tarballs. Fixes bug #376683 for future.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog7
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.3.ebuild15
2 files changed, 17 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 908129cacecc..dc5ef9713a66 100644
--- 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/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 446b7aa4acb7..e009b432cbb2 100644
--- 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