Remove mso useflag, makes no sense; this fixes bug 431390

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

3 files changed, 11 insertions, 7 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 62c07f57a970..dd0662f76c32 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # 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.62 2012/08/13 16:39:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.63 2012/08/19 19:36:19 dilfridge Exp $
+
+  19 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> calligra-2.5.0.ebuild,
+  calligra-9999.ebuild:
+  Remove mso useflag, makes no sense; this fixes bug 431390
 
 *calligra-2.5.0 (13 Aug 2012)
 
diff --git a/app-office/calligra/calligra-2.5.0.ebuild b/app-office/calligra/calligra-2.5.0.ebuild
index b1ce5bc07050..7b2135ea07c6 100644
--- a/app-office/calligra/calligra-2.5.0.ebuild
+++ b/app-office/calligra/calligra-2.5.0.ebuild
@@ -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.5.0.ebuild,v 1.1 2012/08/13 16:39:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.2 2012/08/19 19:36:19 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -150,6 +150,7 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -206,7 +207,6 @@ src_configure() {
 		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
 	)
 
 	# applications
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a08f215d81db..26ade3b960fe 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -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-9999.ebuild,v 1.25 2012/07/19 16:18:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.26 2012/08/19 19:36:19 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -150,6 +150,7 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -206,7 +207,6 @@ src_configure() {
 		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
 	)
 
 	# applications