Force on iconv use, fixes bug 430570

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

5 files changed, 22 insertions, 17 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index dd0662f76c32..43a86d42076b 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -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.63 2012/08/19 19:36:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.64 2012/08/20 21:01:45 dilfridge Exp $
+
+  20 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.4.3-r1.ebuild, calligra-2.4.49.9999.ebuild, calligra-2.5.0.ebuild,
+  calligra-9999.ebuild:
+  Force on iconv use, fixes bug 430570
 
   19 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> calligra-2.5.0.ebuild,
   calligra-9999.ebuild:
diff --git a/app-office/calligra/calligra-2.4.3-r1.ebuild b/app-office/calligra/calligra-2.4.3-r1.ebuild
index dd1d6e93580c..477ab6a7eeb9 100644
--- a/app-office/calligra/calligra-2.4.3-r1.ebuild
+++ b/app-office/calligra/calligra-2.4.3-r1.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.4.3-r1.ebuild,v 1.3 2012/08/09 13:45:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.3-r1.ebuild,v 1.4 2012/08/20 21:01:45 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 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 openctl openexr
+gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -67,6 +67,7 @@ RDEPEND="
 	media-libs/libpng
 	sys-libs/zlib
 	>=x11-libs/qt-gui-4.8.1-r1:4
+	virtual/libiconv
 	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
@@ -79,7 +80,6 @@ RDEPEND="
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -139,6 +139,7 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
+		"-DWITH_Iconv=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -169,7 +170,6 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
diff --git a/app-office/calligra/calligra-2.4.49.9999.ebuild b/app-office/calligra/calligra-2.4.49.9999.ebuild
index 389faa1b727e..9c44f192a44b 100644
--- a/app-office/calligra/calligra-2.4.49.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.49.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-2.4.49.9999.ebuild,v 1.6 2012/07/19 16:18:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.7 2012/08/20 21:01:45 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 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 openctl openexr
+gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -67,6 +67,7 @@ RDEPEND="
 	media-libs/libpng
 	sys-libs/zlib
 	>=x11-libs/qt-gui-4.8.1-r1:4
+	virtual/libiconv
 	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
@@ -79,7 +80,6 @@ RDEPEND="
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -136,6 +136,7 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
+		"-DWITH_Iconv=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -166,7 +167,6 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
diff --git a/app-office/calligra/calligra-2.5.0.ebuild b/app-office/calligra/calligra-2.5.0.ebuild
index 7b2135ea07c6..9cb1bfd52c35 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.2 2012/08/19 19:36:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.3 2012/08/20 21:01:45 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 +okular opengtl openexr
+gsl +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"
 
@@ -81,6 +81,7 @@ RDEPEND="
 	media-libs/libpng
 	sys-libs/zlib
 	>=x11-libs/qt-gui-4.8.1-r1:4
+	virtual/libiconv
 	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
@@ -93,7 +94,6 @@ RDEPEND="
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -151,6 +151,7 @@ src_configure() {
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
 		"-DBUILD_libmsooxml=ON"
+		"-DWITH_Iconv=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -181,7 +182,6 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 26ade3b960fe..2625f3114474 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.26 2012/08/19 19:36:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.27 2012/08/20 21:01:45 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 +okular opengtl openexr
+gsl +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"
 
@@ -81,6 +81,7 @@ RDEPEND="
 	media-libs/libpng
 	sys-libs/zlib
 	>=x11-libs/qt-gui-4.8.1-r1:4
+	virtual/libiconv
 	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
@@ -93,7 +94,6 @@ RDEPEND="
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -151,6 +151,7 @@ src_configure() {
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
 		"-DBUILD_libmsooxml=ON"
+		"-DWITH_Iconv=ON"
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)
 
@@ -181,7 +182,6 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)