| 1 |
hwoarang 10/07/01 21:11:53 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qt-sql-4.6.3-r2.ebuild |
| 5 |
Log: |
| 6 |
Revbump to fix firebird linking wrt bug #326473 |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.85 x11-libs/qt-sql/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.85&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.85&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/ChangeLog?r1=1.84&r2=1.85 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v |
| 19 |
retrieving revision 1.84 |
| 20 |
retrieving revision 1.85 |
| 21 |
diff -u -r1.84 -r1.85 |
| 22 |
--- ChangeLog 24 Jun 2010 17:37:18 -0000 1.84 |
| 23 |
+++ ChangeLog 1 Jul 2010 21:11:52 -0000 1.85 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for x11-libs/qt-sql |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.84 2010/06/24 17:37:18 hwoarang Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.85 2010/07/01 21:11:52 hwoarang Exp $ |
| 29 |
+ |
| 30 |
+*qt-sql-4.6.3-r2 (01 Jul 2010) |
| 31 |
+ |
| 32 |
+ 01 Jul 2010; Markos Chandras <hwoarang@g.o> |
| 33 |
+ +qt-sql-4.6.3-r2.ebuild: |
| 34 |
+ Revbump to fix firebird linking wrt bug #326473 |
| 35 |
|
| 36 |
24 Jun 2010; Markos Chandras <hwoarang@g.o> -qt-sql-4.6.1.ebuild: |
| 37 |
Drop Qt-4.6.1 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: qt-sql-4.6.3-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2010 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.3-r2.ebuild,v 1.1 2010/07/01 21:11:52 hwoarang Exp $ |
| 51 |
|
| 52 |
EAPI="2" |
| 53 |
inherit qt4-build |
| 54 |
|
| 55 |
DESCRIPTION="The SQL module for the Qt toolkit" |
| 56 |
SLOT="4" |
| 57 |
KEYWORDS="~alpha ~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" |
| 58 |
IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite" |
| 59 |
|
| 60 |
DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] |
| 61 |
firebird? ( dev-db/firebird ) |
| 62 |
freetds? ( dev-db/freetds ) |
| 63 |
mysql? ( virtual/mysql ) |
| 64 |
odbc? ( dev-db/unixODBC ) |
| 65 |
postgres? ( dev-db/postgresql-base ) |
| 66 |
sqlite? ( dev-db/sqlite:3 )" |
| 67 |
RDEPEND="${DEPEND}" |
| 68 |
|
| 69 |
QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers" |
| 70 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 71 |
include/Qt/ |
| 72 |
include/QtCore/ |
| 73 |
include/QtSql/ |
| 74 |
include/QtScript/ |
| 75 |
src/src.pro |
| 76 |
src/corelib/ |
| 77 |
src/plugins |
| 78 |
src/3rdparty |
| 79 |
src/tools" |
| 80 |
|
| 81 |
PATCHES=( |
| 82 |
"${FILESDIR}/qt-4.6-nolibx11.patch" |
| 83 |
) |
| 84 |
|
| 85 |
pkg_setup() { |
| 86 |
if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then |
| 87 |
ewarn "You need to enable at least one SQL driver. Enable at least" |
| 88 |
ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite \"" |
| 89 |
die "Enable at least one SQL driver." |
| 90 |
fi |
| 91 |
|
| 92 |
qt4-build_pkg_setup |
| 93 |
} |
| 94 |
|
| 95 |
src_prepare() { |
| 96 |
qt4-build_src_prepare |
| 97 |
|
| 98 |
sed -e '/pg_config --libs/d' -i "${S}"/configure \ |
| 99 |
|| die "sed to fix postgresql usage in ./configure failed" |
| 100 |
} |
| 101 |
|
| 102 |
src_configure() { |
| 103 |
# Don't support sqlite2 anymore |
| 104 |
myconf="${myconf} -no-sql-sqlite2 |
| 105 |
$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ") |
| 106 |
$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ") |
| 107 |
$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite') |
| 108 |
$(qt_use odbc sql-odbc plugin) |
| 109 |
$(qt_use freetds sql-tds plugin) |
| 110 |
$(qt_use firebird sql-ibase plugin) |
| 111 |
$(qt_use qt3support)" |
| 112 |
|
| 113 |
myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender -no-xrandr |
| 114 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
| 115 |
-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
| 116 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 117 |
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility -no-fontconfig |
| 118 |
-no-glib -no-opengl -no-svg -no-gtkstyle" |
| 119 |
|
| 120 |
qt4-build_src_configure |
| 121 |
} |
Archives