public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/
@ 2012-02-24  0:24 Markos Chandras
  0 siblings, 0 replies; 5+ messages in thread
From: Markos Chandras @ 2012-02-24  0:24 UTC (permalink / raw
  To: gentoo-commits

commit:     446b4f499d0a10053576e9ad6e287e0324665572
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 00:24:41 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 00:24:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=446b4f49

x11-libs/qt-sql: Sync with portage ebuild

---
 x11-libs/qt-sql/metadata.xml           |    2 -
 x11-libs/qt-sql/qt-sql-4.8.9999.ebuild |   62 ++++++++++++++++----------------
 x11-libs/qt-sql/qt-sql-4.9999.ebuild   |   62 ++++++++++++++++----------------
 3 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 0604a2d..753c3c2 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -6,7 +6,5 @@
 		<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='stable-branch'>Use the stable git branch - it is slightly
-		behind master  but guaranteed by Nokia to compile</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index d581165..6f5dca6 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -3,7 +3,11 @@
 # $Header: $
 
 EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+	QT_ECLASS="-edge"
+fi
+
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
@@ -12,31 +16,31 @@ if [[ ${PV} != 4*9999 ]]; then
 else
 	KEYWORDS=""
 fi
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
+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 )
+	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_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
 
 	if [[ ${PV} != 4*9999 ]]; then
 		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"
+		src/tools/tools.pro"
 	fi
 
 	if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then
@@ -45,33 +49,29 @@ pkg_setup() {
 		die "Enable at least one SQL driver."
 	fi
 
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	qt4-build-edge_src_prepare
-
-	sed -e '/pg_config --libs/d' -i "${S}"/configure \
-		|| die "sed to fix postgresql usage in ./configure failed"
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 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)
+	myconf+="
 		$(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"
+		$(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-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 }

diff --git a/x11-libs/qt-sql/qt-sql-4.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.9999.ebuild
index d581165..6f5dca6 100644
--- a/x11-libs/qt-sql/qt-sql-4.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.9999.ebuild
@@ -3,7 +3,11 @@
 # $Header: $
 
 EAPI="4"
-inherit qt4-build-edge
+if [[ ${PV} == 4*9999 ]]; then
+	QT_ECLASS="-edge"
+fi
+
+inherit qt4-build${QT_ECLASS}
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
@@ -12,31 +16,31 @@ if [[ ${PV} != 4*9999 ]]; then
 else
 	KEYWORDS=""
 fi
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
+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 )
+	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_TARGET_DIRECTORIES="
+	src/sql
+	src/plugins/sqldrivers"
 
 	if [[ ${PV} != 4*9999 ]]; then
 		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"
+		src/tools/tools.pro"
 	fi
 
 	if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then
@@ -45,33 +49,29 @@ pkg_setup() {
 		die "Enable at least one SQL driver."
 	fi
 
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	qt4-build-edge_src_prepare
-
-	sed -e '/pg_config --libs/d' -i "${S}"/configure \
-		|| die "sed to fix postgresql usage in ./configure failed"
+	qt4-build${QT_ECLASS}_pkg_setup
 }
 
 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)
+	myconf+="
 		$(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"
+		$(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-edge_src_configure
+	qt4-build${QT_ECLASS}_src_configure
 }



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/
@ 2012-03-17 16:57 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2012-03-17 16:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f77dc3fef00a75804fffa7e5bd049349d057b01a
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 17 16:53:28 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 17 16:53:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f77dc3fe

[x11-libs/qt-sql] Sync metadata with portage.

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-sql/metadata.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 753c3c2..a1edbdb 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -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>



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/
@ 2012-05-14 17:06 Davide Pesavento
  0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2012-05-14 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b78c84938bdf7778e09a2d312c5b6236d0158298
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 14 17:06:07 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 14 17:06:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b78c8493

[x11-libs/qt-sql] Sync with portage wrt Oracle db support.

(Portage version: 2.2.0_alpha104/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-sql/qt-sql-4.8.9999.ebuild |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index d783419..a992e42 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit qt4-build
+inherit multilib qt4-build
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
@@ -13,10 +13,10 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
+IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
 
 REQUIRED_USE="
-	|| ( firebird freetds mysql odbc postgres sqlite )
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 "
 
 DEPEND="
@@ -24,6 +24,7 @@ DEPEND="
 	firebird? ( dev-db/firebird )
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
 	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
 	postgres? ( dev-db/postgresql-base )
 	sqlite? ( dev-db/sqlite:3 )
@@ -49,14 +50,14 @@ 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)
+		$(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 oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(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)



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/
@ 2012-06-10 23:21 Davide Pesavento
  0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2012-06-10 23:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a53e59cfafffa4226bbd0ef8f0eb694d00fe94
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 10 23:21:43 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 23:21:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d5a53e59

[x11-libs/qt-sql] QtSql live ebuild for Qt5.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-sql/metadata.xml         |    9 +++--
 x11-libs/qt-sql/qt-sql-5.9999.ebuild |   62 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index a1edbdb..43757d1 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -3,10 +3,11 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
-		<flag name='exceptions'>Add support for exceptions - like catching them
+		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="c++11">Build Qt using the C++11 standard</flag>
+		<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>
+		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-libs/qt-sql/qt-sql-5.9999.ebuild b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
new file mode 100644
index 0000000..67052c7
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="firebird freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[debug=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-sqlite2
+		-no-accessibility -no-gui -no-cups -no-dbus
+		-no-xcb -no-eglfs -no-directfb -no-opengl
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/
@ 2012-08-31  8:23 Davide Pesavento
  0 siblings, 0 replies; 5+ messages in thread
From: Davide Pesavento @ 2012-08-31  8:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e3b254f2cf7354c4bd22dc81b787b490c7abc35f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 08:22:53 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 08:22:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3b254f2

[x11-libs/qt-sql:5] Inherit multilib eclass.

---
 x11-libs/qt-sql/qt-sql-5.0.0_beta1.ebuild |    2 +-
 x11-libs/qt-sql/qt-sql-5.9999.ebuild      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qt-sql/qt-sql-5.0.0_beta1.ebuild b/x11-libs/qt-sql/qt-sql-5.0.0_beta1.ebuild
index 0a16a47..a4e98d4 100644
--- a/x11-libs/qt-sql/qt-sql-5.0.0_beta1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-5.0.0_beta1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit qt5-build
+inherit multilib qt5-build
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 

diff --git a/x11-libs/qt-sql/qt-sql-5.9999.ebuild b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
index 0a16a47..a4e98d4 100644
--- a/x11-libs/qt-sql/qt-sql-5.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-5.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit qt5-build
+inherit multilib qt5-build
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-08-31  8:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-17 16:57 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-sql/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2012-08-31  8:23 Davide Pesavento
2012-06-10 23:21 Davide Pesavento
2012-05-14 17:06 Davide Pesavento
2012-02-24  0:24 Markos Chandras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox