Allow using libiodbc instead of unixODBC (bug #295342 by Rafał Mużyło), remove useless iconv USE flag, delete obsolete sed, don't extract more directories than necessary, cleanup src_configure.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 93 insertions, 79 deletions

diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index c07075f31a8b..5656c5a8b042 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.119 2012/01/29 23:33:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.120 2012/02/23 23:49:46 pesa Exp $
+
+*qt-sql-4.8.0-r1 (23 Feb 2012)
+
+  23 Feb 2012; Davide Pesavento <pesa@gentoo.org> +qt-sql-4.8.0-r1.ebuild,
+  -qt-sql-4.8.0.ebuild:
+  Allow using libiodbc instead of unixODBC (bug #295342 by Rafał Mużyło), remove
+  useless iconv USE flag, delete obsolete sed, don't extract more directories
+  than necessary, cleanup src_configure.
 
   29 Jan 2012; Joseph Jezak <josejx@gentoo.org> qt-sql-4.7.4.ebuild:
   Marked ppc ppc64 stable for bug #390963.
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 8c6b25ef362d..d6e96371a42d 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
@@ -13,13 +13,23 @@ EBUILD qt-sql-4.6.3-r2.ebuild 2549 RMD160 c6e9ca04c5bec92a68c28869a26bf4f1ae0839
 EBUILD qt-sql-4.6.3.ebuild 2393 RMD160 1a233d924cd168b8cac082e2bcdb68d9791bdddd SHA1 6351c5ee720bbf835ef4f40b62e2d27e3eaf8634 SHA256 60b89e87fc6bc17eb52216d7f10bbf9c8c904520631d0bc63bb8ba846057c48a
 EBUILD qt-sql-4.7.2.ebuild 2494 RMD160 71fb2e974ab1a4238b34e3914d58dd4d5f4109d0 SHA1 1624d536ece5b4ed405fe7fbc5742a6c9e654c94 SHA256 172bfa2b001660d6de2b64393d583d1319949fe47de3d55589adf6ccb772480a
 EBUILD qt-sql-4.7.4.ebuild 2491 RMD160 c5646e465c0f555e290756cae95809915758f012 SHA1 ed194421e16ad9d2ad798930f2aa72c621298986 SHA256 23f45b8dbd47ee8a051877e5aeba0be14ba06dfcd26ecccdeb75a7618ee2a5c1
-EBUILD qt-sql-4.8.0.ebuild 2506 RMD160 f4c45257b1ac5e23b5b6950b90db02921773f9b9 SHA1 13215e1e6c78f1ecdbd05f96f2173cd94d9140f1 SHA256 85456beabca307fd2f17cd5512e10496e17190587068ac16f0828c463c670283
-MISC ChangeLog 14615 RMD160 5d32658130e2c5197f63ce704c8ad5198d065e63 SHA1 f3fed6d93cefc7149f03d0aa19b4a01c24133c5b SHA256 5223b70654fa525c52aa172d6cce339a295f1270b38e7bfe34654017d7fcf705
+EBUILD qt-sql-4.8.0-r1.ebuild 2467 RMD160 722ddf362a611dcad3d374c72722be6fcdbcff8a SHA1 609cd1c97e98a3ab3715a30f2738792aa7a2904b SHA256 f3e4f03d17c553ab51b8946c51ec10b94a82f73328b366b33c72ebdf46d05b02
+MISC ChangeLog 14948 RMD160 67e303f67001a86e06ee6e5c829b249343d4718e SHA1 2284c020708d8c3d78cc95187526017f1286e35d SHA256 ead0440efe1ef79e4158726291a2326a9c49cdfa8e5b5793d00080885766fa6f
 MISC metadata.xml 514 RMD160 21860c4993ebefb7dcf2c0647054d5718aada3a7 SHA1 060a099d9d9f9b57a2822e60a833647e89490104 SHA256 cae6405dee9b4378cc6971c67f8dc284a5b64a732ad94b6e8b9410f1cd6e21e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8l12QACgkQcsIHjyDViGTy4ACeId+MONKANt03JFhkEME4Xzr0
-pDUAnA+xlH9rDr/KKUgQ5RMF40g3viIT
-=Skui
+iQIcBAEBCgAGBQJPRtCgAAoJENXLsxwXqFxyyRcP/1OtrFgHM1Z7znMvxuRKZnNZ
+JWhsPZwdCHIkUhu8aVviBi9B2fCIdHIqH4y3dAk4L8FXqozqJvpj4Ql/SY420DEp
+dmg44q6NXE9hxvFe9qiF4/Y8URA5dKgLatU3X8tdO/H9YVckH3RWv9XHC3ZTIr/v
+1rcrsYvSAEnd2cxjFY2KhQwmlhUMS0pppVJWQbNJbP6SqaqnlLsXQpFJw9CFfFhR
+LYuiIrk5uVzVcmSNibJENKkTKMntHFj3k+KVrr30I7rIKohMGh0AeUu6ttiirobL
+7c/TiKTaiuOEjT9uJVq0hOaKwwepPsLjL838njTqdp8pjY1IsPsi13n8mo4Qxmw2
+47JwuoRMyRv1AYtXWTnq+U8u6dklaYAEH8HYF/ynUtx1hSerZ2kR7PDyzknVedYq
+S4AK9uhn5SDBxHUwtWB20m5imPx6Rq2SDZWQGx5qQ+PoZAcRHVkpdTSDaHTdb4Gi
+axgzo2wLVEiikFGVDiRmYlzgF6NWDxSu81+1s3DYeKCzE39/4cDz/LJda2jS6Q2s
+dd+Yv7D5m6SWLxfvH7VlPC7i/RQ3SfMDaRNqqH/N8WLe8hO0KzZL/Ol4Ew91HGLL
+B84C7VF9Q+jBAdb+iNSNtY3y/ZHS7FG+2VvRoUVFzoIaZap7QlzbBv0piEHiM/xj
+m+IHjrGEAM9keoVWa2Qc
+=LD/1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild b/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..d829f8e66eac
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild,v 1.1 2012/02/23 23:49:46 pesa Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/sql
+		src/plugins/sqldrivers"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtSql
+		src/src.pro
+		src/corelib
+		src/plugins
+		src/tools/tools.pro"
+
+	if ! { use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite; }; then
+		ewarn "You need to enable at least one SQL driver. Enable at least one"
+		ewarn "of these USE flags: \"firebird freetds mysql odbc postgres sqlite\"."
+		die "Enable at least one SQL driver."
+	fi
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use firebird sql-ibase plugin)
+		$(qt_use freetds sql-tds plugin)
+		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-oci
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-sql/qt-sql-4.8.0.ebuild b/x11-libs/qt-sql/qt-sql-4.8.0.ebuild
deleted file mode 100644
index da95ab0a0bb8..000000000000
--- a/x11-libs/qt-sql/qt-sql-4.8.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.0.ebuild,v 1.1 2012/01/29 17:08:13 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	firebird? ( dev-db/firebird )
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtSql/
-		include/QtScript/
-		src/src.pro
-		src/corelib/
-		src/plugins
-		src/3rdparty
-		src/tools"
-
-	if ! ( use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite );
-	then
-		ewarn "You need to enable at least one SQL driver. Enable at least"
-		ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite tds\"."
-		die "Enable at least one SQL driver."
-	fi
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	sed -e '/pg_config --libs/d' -i "${S}"/configure \
-		|| die "sed to fix postgresql usage in ./configure failed"
-}
-
-src_configure() {
-	# Don't support sqlite2 anymore
-	myconf="${myconf} -no-sql-sqlite2
-		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ")
-		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ")
-		$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
-		$(qt_use odbc sql-odbc plugin)
-		$(qt_use freetds sql-tds plugin)
-		$(qt_use firebird sql-ibase plugin)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} $(qt_use iconv) -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 -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle"
-
-	qt4-build_src_configure
-}