dilfridge    12/06/23 22:44:01

  Modified:             ChangeLog calligra-2.4.2.ebuild
                        calligra-2.4.49.9999.ebuild
  Removed:              calligra-2.4.90.ebuild
  Log:
  Fix build with marble shape, remove old
  
  (Portage version: 2.2.0_alpha111/cvs/Linux x86_64)

Revision  Changes    Path
1.50                 app-office/calligra/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	16 Jun 2012 13:50:05 -0000	1.49
+++ ChangeLog	23 Jun 2012 22:44:01 -0000	1.50
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.49 2012/06/16 13:50:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.50 2012/06/23 22:44:01 dilfridge Exp $
+
+  23 Jun 2012; Andreas K. Huettel <dilfridge@g.o> calligra-2.4.2.ebuild,
+  +files/calligra-2.4.2-marble.patch, calligra-2.4.49.9999.ebuild,
+  -calligra-2.4.90.ebuild:
+  Fix build with marble shape, remove old
 
 *calligra-2.4.91 (16 Jun 2012)
 



1.5                  app-office/calligra/calligra-2.4.2.ebuild

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

Index: calligra-2.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- calligra-2.4.2.ebuild	6 Jun 2012 13:39:04 -0000	1.4
+++ calligra-2.4.2.ebuild	23 Jun 2012 22:44:01 -0000	1.5
@@ -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/calligra/calligra-2.4.2.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.5 2012/06/23 22:44:01 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -121,6 +121,8 @@
 RESTRICT=test
 # bug 394273
 
+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft
 



1.5                  app-office/calligra/calligra-2.4.49.9999.ebuild

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

Index: calligra-2.4.49.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- calligra-2.4.49.9999.ebuild	6 Jun 2012 13:39:04 -0000	1.4
+++ calligra-2.4.49.9999.ebuild	23 Jun 2012 22:44:01 -0000	1.5
@@ -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/calligra/calligra-2.4.49.9999.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.5 2012/06/23 22:44:01 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -121,6 +121,8 @@
 RESTRICT=test
 # bug 394273
 
+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft