Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-sql: ChangeLog qt-sql-4.6.0-r1.ebuild qt-sql-4.6.0.ebuild
Date: Fri, 25 Dec 2009 15:44:13
Message-Id: E1NOCKp-00046C-KK@stork.gentoo.org
1 abcd 09/12/25 15:44:11
2
3 Modified: ChangeLog
4 Added: qt-sql-4.6.0-r1.ebuild
5 Removed: qt-sql-4.6.0.ebuild
6 Log:
7 Add prefix support, revbump due to otherwise unresolvable USE deps
8 (Portage version: -svn/cvs/Linux i686)
9
10 Revision Changes Path
11 1.67 x11-libs/qt-sql/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.67&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-sql/ChangeLog?rev=1.67&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-sql/ChangeLog?r1=1.66&r2=1.67
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v
20 retrieving revision 1.66
21 retrieving revision 1.67
22 diff -u -r1.66 -r1.67
23 --- ChangeLog 3 Dec 2009 17:23:59 -0000 1.66
24 +++ ChangeLog 25 Dec 2009 15:44:11 -0000 1.67
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-libs/qt-sql
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.66 2009/12/03 17:23:59 wired Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.67 2009/12/25 15:44:11 abcd Exp $
30 +
31 +*qt-sql-4.6.0-r1 (25 Dec 2009)
32 +
33 + 25 Dec 2009; Jonathan Callen <abcd@g.o> -qt-sql-4.6.0.ebuild,
34 + +qt-sql-4.6.0-r1.ebuild:
35 + Add prefix support, revbump due to otherwise unresolvable USE deps
36
37 03 Dec 2009; Alex Alexander <wired@g.o>
38 +files/qt-4.6-nolibx11.diff, qt-sql-4.6.0.ebuild:
39
40
41
42 1.1 x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: qt-sql-4.6.0-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:44:11 abcd Exp $
52
53 EAPI="2"
54 inherit qt4-build
55
56 DESCRIPTION="The SQL module for the Qt toolkit"
57 SLOT="4"
58 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
59 IUSE="firebird iconv mysql odbc postgres qt3support +sqlite"
60
61 DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
62 firebird? ( dev-db/firebird )
63 mysql? ( virtual/mysql )
64 odbc? ( dev-db/unixODBC )
65 postgres? ( virtual/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/sql
79 src/3rdparty
80 src/tools"
81
82 PATCHES=(
83 "${FILESDIR}/qt-4.6-nolibx11.diff"
84 )
85
86 pkg_setup() {
87 if ! (use firebird || use mysql || use odbc || use postgres || use sqlite); then
88 ewarn "You need to enable at least one SQL driver. Enable at least"
89 ewarn "one of these USE flags: \"firebird mysql odbc postgres sqlite\""
90 die "Enable at least one SQL driver."
91 fi
92
93 qt4-build_pkg_setup
94 }
95
96 src_prepare() {
97 qt4-build_src_prepare
98
99 sed -e '/pg_config --libs/d' -i "${S}"/configure \
100 || die "sed to fix postgresql usage in ./configure failed"
101 }
102
103 src_configure() {
104 # Don't support sqlite2 anymore
105 myconf="${myconf} -no-sql-sqlite2
106 $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ")
107 $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ")
108 $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
109 $(qt_use odbc sql-odbc plugin)
110 $(qt_use qt3support)"
111
112 myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender -no-xrandr
113 -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
114 -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
115 -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
116 -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility -no-fontconfig
117 -no-glib -no-opengl -no-svg -no-gtkstyle"
118
119 qt4-build_src_configure
120 }