dev-db/wxSQLite3: Fixed usage of wxwidgets.eclass

svn path=/sunrise/; revision=12019

diff --git a/dev-db/wxSQLite3/ChangeLog b/dev-db/wxSQLite3/ChangeLog
index e4cb9d96f6dea6fc24255cecf3447a5521b41fd0..c49e142d7880bc128dd0d52b440792070baa2af8 100644 (file)
--- a/dev-db/wxSQLite3/ChangeLog
+++ b/dev-db/wxSQLite3/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-db/wxSQLite3
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -wxSQLite3-1.6.0.ebuild,
+  +wxSQLite3-2.1.1.ebuild:
+  Fixed usage of wxwidgets.eclass
+
   13 Jan 2008; Jakub Moc <jakub@gentoo.org> wxSQLite3-1.6.0.ebuild:
   Fix wxGTK handling
 

diff --git a/dev-db/wxSQLite3/Manifest b/dev-db/wxSQLite3/Manifest
index fef4420d193894a29b26e7a63a3c35b905ed8559..a5d471943af121a3cf0c05ebc9fe39db8321ed1e 100644 (file)
--- 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 1007 RMD160 039dcbeb45451891ad5078d5bb2c7f7c965050f1 SHA1 d26c6ecc8404d51e74bc6df0453c2b063c5cda86 SHA256 d2e11f6c51ceb95e77f0f836ed80a75f4ef6b846866a89c3aa233f879f59d710
-MISC ChangeLog 461 RMD160 c7ed80e2ac5bc7b5d19abff2fd0a65f4a184ad54 SHA1 e1296373cbc87d69af436578257cd3efa50ef2e6 SHA256 e1c6f115a19c989b2f1dd598080ea1e05c2f556a88a10580b38bfed6dd78b0e1
+DIST wxsqlite3-2.1.1.tar.gz 2314832 RMD160 df562b6bbab6bab348e4cb906480f324039022f8 SHA1 6ff7f60abddb26cb79ce1f287509180ebac881ef SHA256 7bbda293167e5c3855387ad3911d48cccb9bdf25f38efd9586016be341ed06d8
+EBUILD wxSQLite3-2.1.1.ebuild 802 RMD160 0bceec9bd1b5815110ce20714984060e6698ed9e SHA1 ffb8738ad57e2873c74784bb23f0e0d4570d1655 SHA256 ba7ec0c368588a385b98273eb110dbf72e36c3db62049ee72d017bab7d9778cd
+MISC ChangeLog 595 RMD160 bec7381d7e334eebdcfa652fd8c428d2fc401f3d SHA1 1bfa5540c1f626f53c4563fc600cb7cf032d97b6 SHA256 d097c28f1bff98fe583524685375da7f154b5a26730305e3dea9ce9cc2bc6f00
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild b/dev-db/wxSQLite3/wxSQLite3-2.1.1.ebuild
similarity index 62%
rename from dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild
rename to dev-db/wxSQLite3/wxSQLite3-2.1.1.ebuild
index bde8998c209ccfe1ace45e5ef0442a350a1f6a1c..fee1aa8e512461a334725be3e550b891aa3402eb 100644 (file)
--- a/dev-db/wxSQLite3/wxSQLite3-1.6.0.ebuild
+++ b/dev-db/wxSQLite3/wxSQLite3-2.1.1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-WX_GTK_VER="2.6"
+EAPI=4
+
+WX_GTK_VER="2.8"
+
 inherit eutils wxwidgets
 
 DESCRIPTION="a C++ wrapper around the public domain SQLite 3.x database"
@@ -14,34 +17,24 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="unicode"
 
-DEPEND="=x11-libs/wxGTK-2.6*
-       =dev-db/sqlite-3*"
+DEPEND="
+       x11-libs/wxGTK:2.8[X]
+       dev-db/sqlite:3"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/wxsqlite3"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${P}-makefile_in.patch"
-}
-
-src_compile() {
-       use unicode && need-wxwidgets unicode
+S="${WORKDIR}/wxsqlite3-${PV}"
 
+src_configure() {
        econf \
                $(use_enable unicode) \
                --enable-shared \
                --with-wx-config="${WX_CONFIG}" \
-               --with-gtk \
                --with-wxshared \
                --with-sqlite3-prefix=/usr
-
-       emake || die "emake failed"
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       default
 
        dodoc Readme.txt
        dohtml -r docs/html/*