[gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.4.2.3.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    11/07/28 10:43:23

  Modified:             ChangeLog libreoffice-3.4.2.3.ebuild
  Log:
  Alter uri calculations to sattisfy even old tarballs. Fixes bug #376683 for future.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.71                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.70&r2=1.71

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	28 Jul 2011 10:31:15 -0000	1.70
+++ ChangeLog	28 Jul 2011 10:43:23 -0000	1.71
@@ -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@g.o>
+  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@g.o>
   libreoffice-3.4.2.3.ebuild:



1.7                  app-office/libreoffice/libreoffice-3.4.2.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.6&r2=1.7

Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-3.4.2.3.ebuild	28 Jul 2011 10:31:15 -0000	1.6
+++ libreoffice-3.4.2.3.ebuild	28 Jul 2011 10:43:23 -0000	1.7
@@ -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 @@
 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 @@
 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 @@
 	unset mod
 done
 unset i
+unset DEV_URI
 
 # addons
 # FIXME: actually review which one of these are used