[gentoo-commits] gentoo-x86 commit in x11-libs/qt-sql: metadata.xml ChangeLog qt-sql-4.8.0.ebuild

[Alex Alexander (wired)]

wired       12/01/29 17:08:13

  Modified:             metadata.xml ChangeLog
  Added:                qt-sql-4.8.0.ebuild
  Log:
  version bump
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  x11-libs/qt-sql/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	13 Jun 2010 17:18:44 -0000	1.5
+++ metadata.xml	29 Jan 2012 17:08:12 -0000	1.6
@@ -6,5 +6,7 @@
 		<flag name='exceptions'>Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>



1.118                x11-libs/qt-sql/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	27 Dec 2011 21:28:46 -0000	1.117
+++ ChangeLog	29 Jan 2012 17:08:13 -0000	1.118
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-sql
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.117 2011/12/27 21:28:46 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.118 2012/01/29 17:08:13 wired Exp $
+
+*qt-sql-4.8.0 (29 Jan 2012)
+
+  29 Jan 2012; Alex Alexander <wired@g.o> +qt-sql-4.8.0.ebuild,
+  metadata.xml:
+  version bump
 
   27 Dec 2011; Markus Meier <maekke@g.o> qt-sql-4.7.4.ebuild:
   x86 stable, bug #390963



1.1                  x11-libs/qt-sql/qt-sql-4.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.0.ebuild?rev=1.1&content-type=text/plain

Index: qt-sql-4.8.0.ebuild
===================================================================
# 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
}