public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.2.ebuild ChangeLog
@ 2013-01-23 20:33 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-23 20:33 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/01/23 20:33:26

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild
                        libreoffice-4.0.0.2.ebuild ChangeLog
  Log:
  Use subslots for icu.
  
  (Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.155                app-office/libreoffice/libreoffice-9999-r2.ebuild

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

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- libreoffice-9999-r2.ebuild	23 Jan 2013 15:27:24 -0000	1.154
+++ libreoffice-9999-r2.ebuild	23 Jan 2013 20:33:25 -0000	1.155
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.154 2013/01/23 15:27:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.155 2013/01/23 20:33:25 scarabeus Exp $
 
 EAPI=5
 
@@ -109,7 +109,7 @@
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
+	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/liborcus-0.3
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9



1.17                 app-office/libreoffice/libreoffice-4.0.9999.ebuild

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

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libreoffice-4.0.9999.ebuild	23 Jan 2013 15:27:24 -0000	1.16
+++ libreoffice-4.0.9999.ebuild	23 Jan 2013 20:33:25 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.16 2013/01/23 15:27:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.17 2013/01/23 20:33:25 scarabeus Exp $
 
 EAPI=5
 
@@ -110,7 +110,7 @@
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
+	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/liborcus-0.3
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9



1.2                  app-office/libreoffice/libreoffice-4.0.0.2.ebuild

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

Index: libreoffice-4.0.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-4.0.0.2.ebuild	23 Jan 2013 15:27:24 -0000	1.1
+++ libreoffice-4.0.0.2.ebuild	23 Jan 2013 20:33:25 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.1 2013/01/23 15:27:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.2 2013/01/23 20:33:25 scarabeus Exp $
 
 EAPI=5
 
@@ -110,7 +110,7 @@
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
+	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/liborcus-0.3
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9



1.436                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- ChangeLog	23 Jan 2013 15:27:24 -0000	1.435
+++ ChangeLog	23 Jan 2013 20:33:25 -0000	1.436
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.435 2013/01/23 15:27:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.436 2013/01/23 20:33:25 scarabeus Exp $
+
+  23 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.2.ebuild,
+  libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Use subslots for icu.
 
 *libreoffice-4.0.0.2 (23 Jan 2013)
 





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.2.ebuild ChangeLog
@ 2013-01-27  8:23 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-27  8:23 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/01/27 08:23:22

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild
                        libreoffice-4.0.0.2.ebuild ChangeLog
  Log:
  Require gtk when building with telepathy. Wrt bug#451658.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.156                app-office/libreoffice/libreoffice-9999-r2.ebuild

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

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- libreoffice-9999-r2.ebuild	23 Jan 2013 20:33:25 -0000	1.155
+++ libreoffice-9999-r2.ebuild	27 Jan 2013 08:23:22 -0000	1.156
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.155 2013/01/23 20:33:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.156 2013/01/27 08:23:22 scarabeus Exp $
 
 EAPI=5
 
@@ -228,6 +228,7 @@
 REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
+	telepathy? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )



1.18                 app-office/libreoffice/libreoffice-4.0.9999.ebuild

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

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libreoffice-4.0.9999.ebuild	23 Jan 2013 20:33:25 -0000	1.17
+++ libreoffice-4.0.9999.ebuild	27 Jan 2013 08:23:22 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.17 2013/01/23 20:33:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.18 2013/01/27 08:23:22 scarabeus Exp $
 
 EAPI=5
 
@@ -230,6 +230,7 @@
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )



1.3                  app-office/libreoffice/libreoffice-4.0.0.2.ebuild

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

Index: libreoffice-4.0.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-4.0.0.2.ebuild	23 Jan 2013 20:33:25 -0000	1.2
+++ libreoffice-4.0.0.2.ebuild	27 Jan 2013 08:23:22 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.2 2013/01/23 20:33:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.3 2013/01/27 08:23:22 scarabeus Exp $
 
 EAPI=5
 
@@ -229,6 +229,7 @@
 REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
+	telepathy? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )



1.437                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- ChangeLog	23 Jan 2013 20:33:25 -0000	1.436
+++ ChangeLog	27 Jan 2013 08:23:22 -0000	1.437
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.436 2013/01/23 20:33:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.437 2013/01/27 08:23:22 scarabeus Exp $
+
+  27 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.2.ebuild,
+  libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Require gtk when building with telepathy. Wrt bug#451658.
 
   23 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.2.ebuild,
   libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.2.ebuild ChangeLog
@ 2013-01-31 13:58 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-31 13:58 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/01/31 13:58:21

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild
                        libreoffice-4.0.0.2.ebuild ChangeLog
  Log:
  Enforce dependency over same version translation. It should fix bug#454332.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.158                app-office/libreoffice/libreoffice-9999-r2.ebuild

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

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- libreoffice-9999-r2.ebuild	28 Jan 2013 18:04:28 -0000	1.157
+++ libreoffice-9999-r2.ebuild	31 Jan 2013 13:58:21 -0000	1.158
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.157 2013/01/28 18:04:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.158 2013/01/31 13:58:21 scarabeus Exp $
 
 EAPI=5
 
@@ -180,9 +180,13 @@
 	java? ( >=virtual/jre-1.6 )
 "
 
-PDEPEND="
-	=app-office/libreoffice-l10n-4.0*
-"
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
 
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild



1.20                 app-office/libreoffice/libreoffice-4.0.9999.ebuild

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

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libreoffice-4.0.9999.ebuild	28 Jan 2013 18:04:28 -0000	1.19
+++ libreoffice-4.0.9999.ebuild	31 Jan 2013 13:58:21 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.19 2013/01/28 18:04:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.20 2013/01/31 13:58:21 scarabeus Exp $
 
 EAPI=5
 
@@ -181,9 +181,13 @@
 	java? ( >=virtual/jre-1.6 )
 "
 
-PDEPEND="
-	=app-office/libreoffice-l10n-4.0*
-"
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
 
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild



1.4                  app-office/libreoffice/libreoffice-4.0.0.2.ebuild

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

Index: libreoffice-4.0.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-4.0.0.2.ebuild	27 Jan 2013 08:23:22 -0000	1.3
+++ libreoffice-4.0.0.2.ebuild	31 Jan 2013 13:58:21 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.3 2013/01/27 08:23:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.4 2013/01/31 13:58:21 scarabeus Exp $
 
 EAPI=5
 
@@ -180,9 +180,13 @@
 	java? ( >=virtual/jre-1.6 )
 "
 
-PDEPEND="
-	=app-office/libreoffice-l10n-4.0*
-"
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
 
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild



1.439                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- ChangeLog	28 Jan 2013 18:04:28 -0000	1.438
+++ ChangeLog	31 Jan 2013 13:58:21 -0000	1.439
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.438 2013/01/28 18:04:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.439 2013/01/31 13:58:21 scarabeus Exp $
+
+  31 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.2.ebuild,
+  libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Enforce dependency over same version translation. It should fix bug#454332.
 
   28 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
   libreoffice-9999-r2.ebuild:





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-01-31 13:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-27  8:23 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.2.ebuild ChangeLog Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2013-01-31 13:58 Tomas Chvatal (scarabeus)
2013-01-23 20:33 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox