Added iconv use flag ( bug #260145 )

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 17 insertions, 184 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 881a5bee9fc9..0631a1a9fb82 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.33 2009/02/21 19:23:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.34 2009/02/25 09:17:26 hwoarang Exp $
+
+  25 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
+  -qt-core-4.4.2-r1.ebuild, qt-core-4.4.2-r2.ebuild,
+  qt-core-4.5.0_rc1.ebuild:
+  Dropping qt-core-4.4.2-r1 ebuild, added iconv use flag ( bug #260145 )
 
   21 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
   qt-core-4.5.0_rc1.ebuild:
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index ba155e809aee..8c919e40d468 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -7,9 +7,8 @@ AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff3725
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f55863543fcd4dd3a8105864ec1 SHA1 1dffebc52543ee8dd486ec69fc51d02e216323bd SHA256 94aa6268662a24cec1a20e2fb88fcac418101719c0e1ab2729289fd8b7d475d7
-EBUILD qt-core-4.4.2-r1.ebuild 5160 RMD160 732d16ac205d8003a041028c934d9870b7a892af SHA1 a944163c2c8d3ca75f0b1bc8a05fc4c313033259 SHA256 84d79be7f9f1d59d0e0d6f43516b17ece448d735a43885d2305eb067cae319da
-EBUILD qt-core-4.4.2-r2.ebuild 5409 RMD160 e1224d128462c5c023273402833f729f24e9c605 SHA1 aa71585f73114995addfb1c56f0ab55fa64daacf SHA256 762799e3d5f8e4f563831f9a8d254bf2b3bf9439cda6f4932f8dea7bbd4aced4
+EBUILD qt-core-4.4.2-r2.ebuild 5427 RMD160 74232e3ae7fc3cdceb3c01be39b70bd32c05833b SHA1 4efce459962109983254aae4d60df70b0e5e2345 SHA256 2d0e9160464ca8d3c1d70edba89618dbe2316c7046d45c157ca7fa766bd46e84
 EBUILD qt-core-4.4.2.ebuild 5145 RMD160 f2717b2c4566239f5b47ff564df86b5313c42ce5 SHA1 9c0086c24e4bf13185aec6ec642c93e5df57529b SHA256 adea55093263608cf0c38bee1c0476e046b0ac8223ad47038addc1da49b5a525
-EBUILD qt-core-4.5.0_rc1.ebuild 6007 RMD160 f523a57cbdfcb7f8cf9397fbc4e2132f23cef911 SHA1 b21659e27a3b5e413732cbcef6b26ccb1c1d925a SHA256 e7aa92a38ff934cf17cb86d2bdf26811eb88ed0e9fbfd637b656a8bfb4b9e3cd
-MISC ChangeLog 4765 RMD160 547fff7df433ddcf942c33cebb4ddc396183bf55 SHA1 ebfceda90f75717b261f4e51a8036022a637639f SHA256 59271a9165c898833b6f2cc03cb872e86efa19c8331edbad120e9bc266fa95e0
+EBUILD qt-core-4.5.0_rc1.ebuild 6025 RMD160 6977af859a2eeeede595538af3049320a0c1cf25 SHA1 6f22c3a77b667e8fd830f39690c1cc58a02f88cf SHA256 c86a161fa1be5a81813b0a1e1bcfbd293ae07c34809332c20314065b96d8099b
+MISC ChangeLog 4973 RMD160 676a87b5820cea33688b68e0722c94af8f0d5610 SHA1 7c8d480d82ddaff3b782438f02d35fe715012179 SHA256 4128ded5a7b00692e9d896fcabf9183cde9d43005f0ed2cea74c3f43bb03b530
 MISC metadata.xml 405 RMD160 7ad4cec9a392e8164062dae2935e2c59ba52b503 SHA1 104a2a88f1cf174e9e4827b639a73d79bd0fba2d SHA256 cce5d387ade0a1412bf70c58c7b0ab28fd488cc60e458ac66296ee632d893bf8
diff --git a/x11-libs/qt-core/qt-core-4.4.2-r1.ebuild b/x11-libs/qt-core/qt-core-4.4.2-r1.ebuild
deleted file mode 100644
index 9b6129d2723d..000000000000
--- a/x11-libs/qt-core/qt-core-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.2-r1.ebuild,v 1.2 2009/02/04 11:41:13 alexxy Exp $
-
-EAPI="1"
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +glib +qt3support +ssl"
-
-RDEPEND="sys-libs/zlib
-	glib? ( dev-libs/glib )
-	ssl? ( dev-libs/openssl )
-	!<=x11-libs/qt-4.4.0_alpha:${SLOT}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV} )"
-
-QT4_TARGET_DIRECTORIES="
-src/tools/moc/
-src/tools/rcc/
-src/tools/uic/
-src/corelib/
-src/xml/
-src/network/
-src/plugins/codecs/"
-QT4_EXTRACT_DIRECTORIES="
-include/Qt/
-include/QtCore/
-include/QtNetwork/
-include/QtScript/
-include/QtXml/
-src/plugins/plugins.pro
-src/plugins/qpluginbase.pri
-src/src.pro
-src/3rdparty/des/
-src/3rdparty/harfbuzz/
-src/3rdparty/md4/
-src/3rdparty/md5/
-src/3rdparty/sha1/
-src/script/
-translations/"
-
-pkg_setup() {
-	qt4-build_pkg_setup
-
-	if has_version x11-libs/qt-core; then
-		# Check to see if they've changed the glib flag since the last time installing this package.
-
-		if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
-			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
-			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
-		elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
-			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
-			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
-		fi
-
-		# Check to see if they've changed the qt3support flag since the last time installing this package.
-		# If so, give a list of packages they need to uninstall first.
-
-		if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then
-			local need_to_remove
-			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
-			for x in sql opengl gui qt3support; do
-				local pkg="x11-libs/qt-${x}"
-				if has_version $pkg; then
-					need_to_remove="${need_to_remove} ${pkg}"
-				fi
-			done
-			if [[ -n ${need_to_remove} ]]; then
-				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
-			fi
-		elif ! use qt3support && built_with_use x11-libs/qt-core qt3support; then
-			local need_to_remove
-			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
-			for x in sql opengl gui qt3support; do
-				local pkg="x11-libs/qt-${x}"
-				if has_version $pkg; then
-					need_to_remove="${need_to_remove} ${pkg}"
-				fi
-			done
-			if [[ -n ${need_to_remove} ]]; then
-				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	use doc && QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
-		doc/
-		tools/qdoc3/"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_src_unpack
-
-	# Don't pre-strip, bug 235026
-	for i in kr jp cn tw ; do
-		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
-	done
-}
-
-src_compile() {
-	unset QMAKESPEC
-	local myconf
-
-	myconf="${myconf}
-		$(qt_use glib)
-		$(qt_use ssl openssl)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
-		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
-		-no-svg"
-
-	if ! use doc; then
-		myconf="${myconf} -nomake docs"
-	fi
-
-	qt4-build_src_compile
-}
-
-src_install() {
-	dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed."
-	fi
-
-	emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"
-
-	fix_library_files
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat <<-EOF > "${T}/44qt4"
-	LDPATH=${libdirs:1}
-	EOF
-	doenvd "${T}/44qt4"
-
-	dodir /${QTDATADIR}/mkspecs/gentoo
-	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo || \
-		die "Failed to move qconfig.pri"
-
-	sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-		"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-		"${D}${QTHEADERDIR}"/Qt/qconfig.h || die "sed for qconfig.h failed."
-
-	if use glib; then
-		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
-		$(use ssl && echo QT_OPENSSL)"
-		install_qconfigs
-	fi
-
-	keepdir "${QTSYSCONFDIR}"
-}
diff --git a/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild b/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild
index 37c3643250f9..dd6154d24582 100644
--- a/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild,v 1.1 2009/02/14 15:09:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild,v 1.2 2009/02/25 09:17:26 hwoarang Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.trolltech.com/"
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +glib +qt3support +ssl"
+IUSE="doc +glib +iconv +qt3support +ssl"
 
 RDEPEND="sys-libs/zlib
 	glib? ( dev-libs/glib )
@@ -120,12 +120,13 @@ src_compile() {
 
 	myconf="${myconf}
 		$(qt_use glib)
+		$(qt_use iconv)
 		$(qt_use ssl openssl)
 		$(qt_use qt3support)"
 
 	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
+		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
 		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
 		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
 		-no-svg"
diff --git a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
index 6bf9fb5dc2e3..bed0c6c03841 100644
--- a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.7 2009/02/21 19:23:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.8 2009/02/25 09:17:26 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -9,7 +9,7 @@ DESCRIPTION="The Qt toolkit is a comprehensive C++ application development frame
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +glib +qt3support +ssl"
+IUSE="doc +glib +iconv +qt3support +ssl"
 
 RDEPEND="sys-libs/zlib
 	glib? ( dev-libs/glib )
@@ -125,12 +125,13 @@ src_configure() {
 
 	myconf="${myconf}
 		$(qt_use glib)
+		$(qt_use iconv)
 		$(qt_use ssl openssl)
 		$(qt_use qt3support)"
 
 	myconf="${myconf} -no-xkb  -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-gif -no-libpng
+		-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
 		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
 		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
 		-no-svg -no-gtkstyle"