summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/wxSQLite3/ChangeLog5
-rw-r--r--dev-db/wxSQLite3/Manifest4
-rw-r--r--dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild13
3 files changed, 10 insertions, 12 deletions
diff --git a/dev-db/wxSQLite3/ChangeLog b/dev-db/wxSQLite3/ChangeLog
index d7c21e7a1..e4cb9d96f 100644
--- a/dev-db/wxSQLite3/ChangeLog
+++ b/dev-db/wxSQLite3/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-db/wxSQLite3
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Jan 2008; Jakub Moc <jakub@gentoo.org> wxSQLite3-1.6.0.ebuild:
+ Fix wxGTK handling
+
25 Aug 2006; Cedric Krier <ced@ced.homedns.org> wxSQLite3-1.6.0.ebuild:
use WX_CONFIG
diff --git a/dev-db/wxSQLite3/Manifest b/dev-db/wxSQLite3/Manifest
index 7bb906a3c..959afe913 100644
--- a/dev-db/wxSQLite3/Manifest
+++ b/dev-db/wxSQLite3/Manifest
@@ -1,5 +1,5 @@
AUX wxSQLite3-1.6.0-makefile_in.patch 747 RMD160 0d61684d94d3daa03177ee44448ac4854728aae5 SHA1 88a62d7ebda0286749e1115b0da308e940b10f5f SHA256 6b31e948112dbbd13e7a5ef6ed97d8d2ba1355bddd458def8315b408df0acd68
DIST wxsqlite3-1.6.0.tar.gz 237112 RMD160 4d28df1d5d63682fc1a9abf8ba7da667b04191a8 SHA1 87526d8e1419e93e6b505748a125a71f3aca9700 SHA256 400c47c41404de220fa3465fbf02e4a099758e45faa249fa8d7b1e20381f0a18
-EBUILD wxSQLite3-1.6.0.ebuild 1093 RMD160 e370e81658ea25d3b518300d0e55d23c8478f5d3 SHA1 f78faee0dbdba8d0976560da653ca2c81f02ac98 SHA256 0e9a5bd37281951c182606f1923d4c2a77b0192b009fb0a441930a825e0b6d05
-MISC ChangeLog 371 RMD160 d531fd6bd05d37c925a6faabc86b49a3c2c78eb7 SHA1 7a7f00c96faf8d6844636fa935df3be80c809ef4 SHA256 8b263619502290c8e3766b499e862b5b03216ddedbdfc5facd2a95229da59f1d
+EBUILD wxSQLite3-1.6.0.ebuild 1032 RMD160 ab054e61838f345fb9e498df3cd0394619de52de SHA1 6468413b74d9dbe00f2067cd61cdb025ff5ed149 SHA256 350890c828fb8608271a5d15edeb2486ea3cc16065550fffa971370f3930e60c
+MISC ChangeLog 461 RMD160 c7ed80e2ac5bc7b5d19abff2fd0a65f4a184ad54 SHA1 e1296373cbc87d69af436578257cd3efa50ef2e6 SHA256 e1c6f115a19c989b2f1dd598080ea1e05c2f556a88a10580b38bfed6dd78b0e1
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild b/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild
index 99afff1ca..e856e4788 100644
--- a/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild
+++ b/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+WX_GTK_VER="2.6"
inherit eutils wxwidgets
DESCRIPTION="a C++ wrapper around the public domain SQLite 3.x database"
@@ -13,7 +14,7 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="unicode"
-DEPEND=">=x11-libs/wxGTK-2.6
+DEPEND="=x11-libs/wxGTK-2.6*
=dev-db/sqlite-3*"
RDEPEND="${DEPEND}"
@@ -26,12 +27,7 @@ src_unpack() {
}
src_compile() {
- export WX_GTK_VER=2.6
- if use unicode; then
- need-wxwidgets unicode || die
- else
- need-wxwidgets gtk2 || die
- fi
+ use unicode && need-wxwidgets unicode || need-wxwidgets gtk2
econf \
$(use_enable unicode) \
@@ -40,7 +36,6 @@ src_compile() {
--with-gtk \
--with-wxshared \
--with-sqlite3-prefix=/usr \
- || die "econf failed"
emake || die "emake failed"
}