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 ChangeLog
@ 2012-12-05 13:48 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-12-05 13:48 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/12/05 13:48:34

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Require new 1.0 gstreamer and disable 0.10.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.138                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.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.137&r2=1.138

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- libreoffice-9999-r2.ebuild	30 Nov 2012 20:53:25 -0000	1.137
+++ libreoffice-9999-r2.ebuild	5 Dec 2012 13:48:34 -0000	1.138
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.137 2012/11/30 20:53:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.138 2012/12/05 13:48:34 scarabeus Exp $
 
 EAPI=4
 
@@ -137,8 +137,8 @@
 	)
 	gtk3? ( >=x11-libs/gtk+-3.2:3 )
 	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
@@ -414,7 +414,6 @@
 	# --enable-release-build: build the libreoffice as release
 	# --disable-fetch-external: prevent dowloading during compile phase
 	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
 	# --disable-mozilla: mozilla internal is for contact integration, never
@@ -449,7 +448,7 @@
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gnome-vfs \
-		--disable-gstreamer \
+		--disable-gstreamer-0-10 \
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
@@ -488,7 +487,6 @@
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer gstreamer-0-10) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
 		$(use_enable kde kde4) \



1.2                  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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.1&r2=1.2

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-4.0.9999.ebuild	4 Dec 2012 17:34:45 -0000	1.1
+++ libreoffice-4.0.9999.ebuild	5 Dec 2012 13:48:34 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/12/04 17:34:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.2 2012/12/05 13:48:34 scarabeus Exp $
 
 EAPI=4
 
@@ -137,8 +137,8 @@
 	)
 	gtk3? ( >=x11-libs/gtk+-3.2:3 )
 	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
@@ -414,7 +414,6 @@
 	# --enable-release-build: build the libreoffice as release
 	# --disable-fetch-external: prevent dowloading during compile phase
 	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
 	# --disable-mozilla: mozilla internal is for contact integration, never
@@ -449,7 +448,7 @@
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gnome-vfs \
-		--disable-gstreamer \
+		--disable-gstreamer-0-10 \
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
@@ -488,7 +487,6 @@
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer gstreamer-0-10) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
 		$(use_enable kde kde4) \



1.412                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- ChangeLog	4 Dec 2012 17:34:45 -0000	1.411
+++ ChangeLog	5 Dec 2012 13:48:34 -0000	1.412
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.411 2012/12/04 17:34:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.412 2012/12/05 13:48:34 scarabeus Exp $
+
+  05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Require new 1.0 gstreamer and disable 0.10.
 
 *libreoffice-3.6.4.3 (04 Dec 2012)
 *libreoffice-4.0.9999 (04 Dec 2012)





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

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog
@ 2012-12-09  9:59 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-12-09  9:59 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/12/09 09:59:01

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Npapi sdk is always required for the mork driver.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.141                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.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.140&r2=1.141

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- libreoffice-9999-r2.ebuild	9 Dec 2012 09:38:03 -0000	1.140
+++ libreoffice-9999-r2.ebuild	9 Dec 2012 09:59:01 -0000	1.141
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.140 2012/12/09 09:38:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.141 2012/12/09 09:59:01 scarabeus Exp $
 
 EAPI=4
 
@@ -119,6 +119,7 @@
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
+	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg
@@ -151,7 +152,6 @@
 		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	nsplugin? ( net-misc/npapi-sdk )
 	opengl? (
 		virtual/glu
 		virtual/opengl



1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.3&r2=1.4

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-4.0.9999.ebuild	8 Dec 2012 19:47:23 -0000	1.3
+++ libreoffice-4.0.9999.ebuild	9 Dec 2012 09:59:01 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3 2012/12/08 19:47:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.4 2012/12/09 09:59:01 scarabeus Exp $
 
 EAPI=4
 
@@ -119,6 +119,7 @@
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
+	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg
@@ -151,7 +152,6 @@
 		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	nsplugin? ( net-misc/npapi-sdk )
 	opengl? (
 		virtual/glu
 		virtual/opengl



1.416                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- ChangeLog	9 Dec 2012 09:38:03 -0000	1.415
+++ ChangeLog	9 Dec 2012 09:59:01 -0000	1.416
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.415 2012/12/09 09:38:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.416 2012/12/09 09:59:01 scarabeus Exp $
+
+  09 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Npapi sdk is always required for the mork driver.
 
   09 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
   Drop one more deprecated switch.





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

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog
@ 2012-12-18 16:11 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-12-18 16:11 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/12/18 16:11:42

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Fixed mysqlcppcon on lo side.
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.144                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.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.143&r2=1.144

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- libreoffice-9999-r2.ebuild	18 Dec 2012 15:28:45 -0000	1.143
+++ libreoffice-9999-r2.ebuild	18 Dec 2012 16:11:42 -0000	1.144
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.143 2012/12/18 15:28:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.144 2012/12/18 16:11:42 scarabeus Exp $
 
 EAPI=4
 
@@ -336,11 +336,6 @@
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
-	# mysql dmake build is MESSY at minimal
-	sed -i \
-		-e "s:/usr/lib/:${EPREFIX}/usr/$(get_libdir):g" \
-		mysqlc/source/makefile.mk || die
-
 	# system pyuno mess
 	sed \
 		-e "s:%eprefix%:${EPREFIX}:g" \



1.7                  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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.6&r2=1.7

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-4.0.9999.ebuild	18 Dec 2012 15:28:45 -0000	1.6
+++ libreoffice-4.0.9999.ebuild	18 Dec 2012 16:11:42 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.6 2012/12/18 15:28:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.7 2012/12/18 16:11:42 scarabeus Exp $
 
 EAPI=4
 
@@ -336,11 +336,6 @@
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
-	# mysql dmake build is MESSY at minimal
-	sed -i \
-		-e "s:/usr/lib/:${EPREFIX}/usr/$(get_libdir):g" \
-		mysqlc/source/makefile.mk || die
-
 	# system pyuno mess
 	sed \
 		-e "s:%eprefix%:${EPREFIX}:g" \



1.422                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- ChangeLog	18 Dec 2012 15:28:45 -0000	1.421
+++ ChangeLog	18 Dec 2012 16:11:42 -0000	1.422
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.421 2012/12/18 15:28:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.422 2012/12/18 16:11:42 scarabeus Exp $
+
+  18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Fixed mysqlcppcon on lo side.
 
   18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.4.3.ebuild,
   libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:





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

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog
@ 2012-12-18 21:52 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-12-18 21:52 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/12/18 21:52:42

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Drop presenter-screen as ext, it was turned into plain code.
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.145                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.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.144&r2=1.145

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- libreoffice-9999-r2.ebuild	18 Dec 2012 16:11:42 -0000	1.144
+++ libreoffice-9999-r2.ebuild	18 Dec 2012 21:52:42 -0000	1.145
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.144 2012/12/18 16:11:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.145 2012/12/18 21:52:42 scarabeus Exp $
 
 EAPI=4
 
@@ -71,7 +71,7 @@
 gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
 telepathy test +vba +webdav"
 
-LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
 # diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
 # hunart: only on ooo extensions -> fubared download path somewhere on sf



1.8                  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.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.7&r2=1.8

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-4.0.9999.ebuild	18 Dec 2012 16:11:42 -0000	1.7
+++ libreoffice-4.0.9999.ebuild	18 Dec 2012 21:52:42 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.7 2012/12/18 16:11:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.8 2012/12/18 21:52:42 scarabeus Exp $
 
 EAPI=4
 
@@ -71,7 +71,7 @@
 gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
 telepathy test +vba +webdav"
 
-LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
 # diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
 # hunart: only on ooo extensions -> fubared download path somewhere on sf



1.423                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- ChangeLog	18 Dec 2012 16:11:42 -0000	1.422
+++ ChangeLog	18 Dec 2012 21:52:42 -0000	1.423
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.422 2012/12/18 16:11:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.423 2012/12/18 21:52:42 scarabeus Exp $
+
+  18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Drop presenter-screen as ext, it was turned into plain code.
 
   18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
   libreoffice-9999-r2.ebuild:





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

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

scarabeus    13/01/13 10:52:53

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Fix configure dropped options. Wrt bug#451576.
  
  (Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.150                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.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.149&r2=1.150

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- libreoffice-9999-r2.ebuild	12 Jan 2013 10:52:05 -0000	1.149
+++ libreoffice-9999-r2.ebuild	13 Jan 2013 10:52:53 -0000	1.150
@@ -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.149 2013/01/12 10:52:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.150 2013/01/13 10:52:53 scarabeus Exp $
 
 EAPI=5
 
@@ -72,8 +72,7 @@
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
-+webdav"
+gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -235,7 +234,6 @@
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	nsplugin? ( gtk )
 "
 
 CHECKREQS_MEMORY="512M"
@@ -420,7 +418,6 @@
 	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
 	# --disable-ext-report-builder: too much java packages pulled in
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
@@ -468,7 +465,6 @@
 		--without-afms \
 		--without-fonts \
 		--without-myspell-dicts \
-		--without-stlport \
 		--without-help \
 		--with-helppack-integration \
 		--without-sun-templates \
@@ -484,7 +480,6 @@
 		$(use_enable gtk3) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
 		$(use_enable postgres postgresql-sdbc) \
@@ -541,7 +536,7 @@
 	fi
 
 	# symlink the nsplugin to proper location
-	use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
 	# It is broken because we send --without-help



1.12                 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.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.11&r2=1.12

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libreoffice-4.0.9999.ebuild	12 Jan 2013 10:52:05 -0000	1.11
+++ libreoffice-4.0.9999.ebuild	13 Jan 2013 10:52:53 -0000	1.12
@@ -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.11 2013/01/12 10:52:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.12 2013/01/13 10:52:53 scarabeus Exp $
 
 EAPI=5
 
@@ -73,8 +73,7 @@
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
-+webdav"
+gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
 
 LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -236,7 +235,6 @@
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	nsplugin? ( gtk )
 "
 
 CHECKREQS_MEMORY="512M"
@@ -415,8 +413,6 @@
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
-	# --disable-mozilla: mozilla internal is for contact integration, never
-	#   worked on linux
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
@@ -424,7 +420,6 @@
 	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
 	# --disable-ext-report-builder: too much java packages pulled in
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
@@ -452,7 +447,6 @@
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
-		--disable-mozilla \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -474,7 +468,6 @@
 		--without-afms \
 		--without-fonts \
 		--without-myspell-dicts \
-		--without-stlport \
 		--without-system-mozilla \
 		--without-help \
 		--with-helppack-integration \
@@ -491,7 +484,6 @@
 		$(use_enable gtk3) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nsplugin) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
 		$(use_enable postgres postgresql-sdbc) \
@@ -548,7 +540,7 @@
 	fi
 
 	# symlink the nsplugin to proper location
-	use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
 	# It is broken because we send --without-help



1.431                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- ChangeLog	12 Jan 2013 10:54:36 -0000	1.430
+++ ChangeLog	13 Jan 2013 10:52:53 -0000	1.431
@@ -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.430 2013/01/12 10:54:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.431 2013/01/13 10:52:53 scarabeus Exp $
+
+  13 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Fix configure dropped options. Wrt bug#451576.
 
   12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop unused desc.





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

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

scarabeus    13/01/14 13:05:23

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Fix git build as we moved the main folder.
  
  (Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.151                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.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.150&r2=1.151

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- libreoffice-9999-r2.ebuild	13 Jan 2013 10:52:53 -0000	1.150
+++ libreoffice-9999-r2.ebuild	14 Jan 2013 13:05:23 -0000	1.151
@@ -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.150 2013/01/13 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.151 2013/01/14 13:05:23 scarabeus Exp $
 
 EAPI=5
 
@@ -289,7 +289,8 @@
 			mypv=${PV/.9999}
 			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
 			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
 			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
 			EGIT_NOUNPACK="true"
 			git-2_src_unpack



1.13                 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.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.12&r2=1.13

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libreoffice-4.0.9999.ebuild	13 Jan 2013 10:52:53 -0000	1.12
+++ libreoffice-4.0.9999.ebuild	14 Jan 2013 13:05:23 -0000	1.13
@@ -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.12 2013/01/13 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.13 2013/01/14 13:05:23 scarabeus Exp $
 
 EAPI=5
 
@@ -290,7 +290,8 @@
 			mypv=${PV/.9999}
 			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
 			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
 			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
 			EGIT_NOUNPACK="true"
 			git-2_src_unpack



1.432                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- ChangeLog	13 Jan 2013 10:52:53 -0000	1.431
+++ ChangeLog	14 Jan 2013 13:05:23 -0000	1.432
@@ -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.431 2013/01/13 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.432 2013/01/14 13:05:23 scarabeus Exp $
+
+  14 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Fix git build as we moved the main folder.
 
   13 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
   libreoffice-9999-r2.ebuild:





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

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

scarabeus    13/01/14 13:24:37

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Remove rdepend on npapi-sdk, as it just provides headers during the build.
  
  (Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.152                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.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.151&r2=1.152

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- libreoffice-9999-r2.ebuild	14 Jan 2013 13:05:23 -0000	1.151
+++ libreoffice-9999-r2.ebuild	14 Jan 2013 13:24:37 -0000	1.152
@@ -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.151 2013/01/14 13:05:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.152 2013/01/14 13:24:37 scarabeus Exp $
 
 EAPI=5
 
@@ -124,7 +124,6 @@
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
-	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg



1.14                 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.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.13&r2=1.14

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libreoffice-4.0.9999.ebuild	14 Jan 2013 13:05:23 -0000	1.13
+++ libreoffice-4.0.9999.ebuild	14 Jan 2013 13:24:37 -0000	1.14
@@ -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.13 2013/01/14 13:05:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.14 2013/01/14 13:24:37 scarabeus Exp $
 
 EAPI=5
 
@@ -125,7 +125,6 @@
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
-	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg



1.433                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- ChangeLog	14 Jan 2013 13:05:23 -0000	1.432
+++ ChangeLog	14 Jan 2013 13:24:37 -0000	1.433
@@ -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.432 2013/01/14 13:05:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.433 2013/01/14 13:24:37 scarabeus Exp $
+
+  14 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Remove rdepend on npapi-sdk, as it just provides headers during the build.
 
   14 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
   libreoffice-9999-r2.ebuild:





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

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

scarabeus    13/01/28 18:04:29

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Sort out the telepathy-gtk deps better.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.157                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.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.156&r2=1.157

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- libreoffice-9999-r2.ebuild	27 Jan 2013 08:23:22 -0000	1.156
+++ libreoffice-9999-r2.ebuild	28 Jan 2013 18:04:28 -0000	1.157
@@ -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.156 2013/01/27 08:23:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.157 2013/01/28 18:04:28 scarabeus Exp $
 
 EAPI=5
 
@@ -164,6 +164,7 @@
 	telepathy? (
 		dev-libs/glib:2
 		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
 	)
 	webdav? ( net-libs/neon )
 "
@@ -228,7 +229,6 @@
 REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
-	telepathy? ( gtk )
 	eds? ( gnome )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )



1.19                 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.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.18&r2=1.19

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libreoffice-4.0.9999.ebuild	27 Jan 2013 08:23:22 -0000	1.18
+++ libreoffice-4.0.9999.ebuild	28 Jan 2013 18:04:28 -0000	1.19
@@ -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.18 2013/01/27 08:23:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.19 2013/01/28 18:04:28 scarabeus Exp $
 
 EAPI=5
 
@@ -165,6 +165,7 @@
 	telepathy? (
 		dev-libs/glib:2
 		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
 	)
 	webdav? ( net-libs/neon )
 "
@@ -230,7 +231,6 @@
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
-	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )



1.438                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- ChangeLog	27 Jan 2013 08:23:22 -0000	1.437
+++ ChangeLog	28 Jan 2013 18:04:28 -0000	1.438
@@ -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.437 2013/01/27 08:23:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.438 2013/01/28 18:04:28 scarabeus Exp $
+
+  28 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Sort out the telepathy-gtk deps better.
 
   27 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] 11+ messages in thread

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

scarabeus    13/01/31 15:36:23

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Raise dep over libcmis.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.159                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.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.158&r2=1.159

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- libreoffice-9999-r2.ebuild	31 Jan 2013 13:58:21 -0000	1.158
+++ libreoffice-9999-r2.ebuild	31 Jan 2013 15:36:23 -0000	1.159
@@ -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.158 2013/01/31 13:58:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.159 2013/01/31 15:36:23 scarabeus Exp $
 
 EAPI=5
 
@@ -105,7 +105,7 @@
 	>=app-text/libwps-0.2.2
 	>=app-text/poppler-0.16[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
-	dev-cpp/libcmis:0.3
+	>=dev-cpp/libcmis-0.3.1:0.3
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1



1.21                 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.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.20&r2=1.21

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libreoffice-4.0.9999.ebuild	31 Jan 2013 13:58:21 -0000	1.20
+++ libreoffice-4.0.9999.ebuild	31 Jan 2013 15:36:23 -0000	1.21
@@ -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.20 2013/01/31 13:58:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.21 2013/01/31 15:36:23 scarabeus Exp $
 
 EAPI=5
 
@@ -106,7 +106,7 @@
 	>=app-text/libwps-0.2.2
 	>=app-text/poppler-0.16[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
-	dev-cpp/libcmis:0.3
+	>=dev-cpp/libcmis-0.3.1:0.3
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1



1.440                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- ChangeLog	31 Jan 2013 13:58:21 -0000	1.439
+++ ChangeLog	31 Jan 2013 15:36:23 -0000	1.440
@@ -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.439 2013/01/31 13:58:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.440 2013/01/31 15:36:23 scarabeus Exp $
+
+  31 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Raise dep over libcmis.
 
   31 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] 11+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog
@ 2013-03-18  9:50 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-18  9:50 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/18 09:50:12

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Fix detecting python cflags and libs until there is nice eclass call for it. Force due to unsynced tree.
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.166                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.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.165&r2=1.166

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- libreoffice-9999-r2.ebuild	13 Mar 2013 14:03:57 -0000	1.165
+++ libreoffice-9999-r2.ebuild	18 Mar 2013 09:50:12 -0000	1.166
@@ -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.165 2013/03/13 14:03:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.166 2013/03/18 09:50:12 scarabeus Exp $
 
 EAPI=5
 
@@ -408,8 +408,8 @@
 	fi
 
 	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
-	export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+	export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
+	export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
 
 	# system headers/libs/...: enforce using system packages
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster



1.24                 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.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.23&r2=1.24

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libreoffice-4.0.9999.ebuild	12 Mar 2013 21:22:49 -0000	1.23
+++ libreoffice-4.0.9999.ebuild	18 Mar 2013 09:50:12 -0000	1.24
@@ -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.23 2013/03/12 21:22:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.24 2013/03/18 09:50:12 scarabeus Exp $
 
 EAPI=5
 
@@ -408,8 +408,8 @@
 
 	# System python 2.7 enablement:
 	export PYTHON="${PYTHON}"
-	export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
-	export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+	export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
+	export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
 
 	# system headers/libs/...: enforce using system packages
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster



1.452                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- ChangeLog	17 Mar 2013 21:02:54 -0000	1.451
+++ ChangeLog	18 Mar 2013 09:50:12 -0000	1.452
@@ -1,6 +1,11 @@
 # 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.451 2013/03/17 21:02:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.452 2013/03/18 09:50:12 scarabeus Exp $
+
+  18 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Fix detecting python cflags and libs until there is nice eclass call for it.
+  Force due to unsynced tree.
 
   17 Mar 2013; Mark Wright <gienah@gentoo.org>
   +files/libreoffice-4.0.1.2-boost-1.53.0.patch, libreoffice-4.0.1.2.ebuild:





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

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog
@ 2013-03-29  9:41 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 11+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-29  9:41 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/29 09:41:28

  Modified:             libreoffice-9999-r2.ebuild
                        libreoffice-4.0.9999.ebuild ChangeLog
  Log:
  Update the pythoncflags/libs detection with the eclass functions. Put the branding mv call to prepare phase.
  
  (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.168                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.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.167&r2=1.168

Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- libreoffice-9999-r2.ebuild	18 Mar 2013 18:59:00 -0000	1.167
+++ libreoffice-9999-r2.ebuild	29 Mar 2013 09:41:28 -0000	1.168
@@ -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.167 2013/03/18 18:59:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.168 2013/03/29 09:41:28 scarabeus Exp $
 
 EAPI=5
 
@@ -313,6 +313,9 @@
 src_prepare() {
 	# optimization flags
 	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
 
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
@@ -324,8 +327,7 @@
 
 	base_src_prepare
 
-	AT_M4DIR="m4"
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
@@ -343,6 +345,11 @@
 		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
 		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
 		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
 }
 
 src_configure() {
@@ -401,15 +408,6 @@
 		fi
 	fi
 
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
-	export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
-
 	# system headers/libs/...: enforce using system packages
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required



1.25                 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.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.24&r2=1.25

Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libreoffice-4.0.9999.ebuild	18 Mar 2013 09:50:12 -0000	1.24
+++ libreoffice-4.0.9999.ebuild	29 Mar 2013 09:41:28 -0000	1.25
@@ -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.24 2013/03/18 09:50:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.25 2013/03/29 09:41:28 scarabeus Exp $
 
 EAPI=5
 
@@ -320,6 +320,11 @@
 	export ARCH_FLAGS="${CXXFLAGS}"
 	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON="${PYTHON}"
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
 
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
@@ -342,6 +347,11 @@
 		-e "s:%libdir%:$(get_libdir):g" \
 		-i pyuno/source/module/uno.py \
 		-i scripting/source/pyprov/officehelper.py || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
 }
 
 src_configure() {
@@ -401,16 +411,6 @@
 		fi
 	fi
 
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# System python 2.7 enablement:
-	export PYTHON="${PYTHON}"
-	export PYTHON_CFLAGS=`pkg-config --cflags python-${EPYTHON#python}`
-	export PYTHON_LIBS=`pkg-config --libs python-${EPYTHON#python}`
-
 	# system headers/libs/...: enforce using system packages
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required



1.455                app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- ChangeLog	28 Mar 2013 16:49:05 -0000	1.454
+++ ChangeLog	29 Mar 2013 09:41:28 -0000	1.455
@@ -1,6 +1,11 @@
 # 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.454 2013/03/28 16:49:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.455 2013/03/29 09:41:28 scarabeus Exp $
+
+  29 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Update the pythoncflags/libs detection with the eclass functions. Put the
+  branding mv call to prepare phase.
 
   28 Mar 2013; Markus Meier <maekke@gentoo.org> libreoffice-4.0.1.2.ebuild:
   add ~arm, bug #451464





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

end of thread, other threads:[~2013-03-29  9:41 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-18  9:50 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild ChangeLog Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2013-03-29  9:41 Tomas Chvatal (scarabeus)
2013-01-31 15:36 Tomas Chvatal (scarabeus)
2013-01-28 18:04 Tomas Chvatal (scarabeus)
2013-01-14 13:24 Tomas Chvatal (scarabeus)
2013-01-14 13:05 Tomas Chvatal (scarabeus)
2013-01-13 10:52 Tomas Chvatal (scarabeus)
2012-12-18 21:52 Tomas Chvatal (scarabeus)
2012-12-18 16:11 Tomas Chvatal (scarabeus)
2012-12-09  9:59 Tomas Chvatal (scarabeus)
2012-12-05 13:48 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