Version bump. Remove old. Fixes bugs #255755 and #261495.

Package-Manager: portage-2.2_rc24/cvs/Linux x86_64

3 files changed, 21 insertions, 11 deletions

diff --git a/dev-db/sqliteman/ChangeLog b/dev-db/sqliteman/ChangeLog
index 98ed0205bfcb..09dd9e4d9c69 100644
--- a/dev-db/sqliteman/ChangeLog
+++ b/dev-db/sqliteman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/sqliteman
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteman/ChangeLog,v 1.1 2008/12/31 14:56:55 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteman/ChangeLog,v 1.2 2009/03/14 12:09:22 scarabeus Exp $
+
+*sqliteman-1.2.1 (14 Mar 2009)
+
+  14 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> -sqliteman-1.2.0.ebuild,
+  +sqliteman-1.2.1.ebuild:
+  Version bump. Remove old. Fixes bugs #255755 and #261495.
 
 *sqliteman-1.2.0 (31 Dec 2008)
 
diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest
index 714aec359afe..79a7c8cc1d0b 100644
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@@ -1,4 +1,4 @@
-DIST sqliteman-1.2.0.tar.gz 1519236 RMD160 9069b6444541c1ecc6e99eacf69427f702fe7c6a SHA1 dc5202708f7611a8900699d1a85adcae3915d55d SHA256 c75e5029d2066f3b78437012cd31b14a47514b9f44096cc1d5352c765c307ce3
-EBUILD sqliteman-1.2.0.ebuild 649 RMD160 6311f247f33be0b99eb8f53a5efa935e74af6c26 SHA1 3026f9aa18ea5c305694f43c6d53dc9bb78d3b78 SHA256 dca96b0621308193ffad8313a8b1ab361699a099ef9400ae2b93b455656556dd
-MISC ChangeLog 420 RMD160 7c46248d271aa26c0bff0a0a29520c570bc99eb4 SHA1 d706faf608ffd30a2b12b71beae1ce43bb8c042b SHA256 4a65ced3ef2c04c44f63c7e4e9fe39a58383dbb1e31b8cea2e2bf3aca401012d
+DIST sqliteman-1.2.1.tar.gz 1579900 RMD160 f2aedd5d83f82ee12b21d7521d0578f472f4a1db SHA1 758b59b2ddf736c4592b3dcc09f2b2531cbf9c26 SHA256 1c784dd6f87987e4dd4f9de1c0e899d25cd65094776229f209cb96793ac581ab
+EBUILD sqliteman-1.2.1.ebuild 680 RMD160 c18b83394f7d3735cf642cbb37b3ece2f5123ee9 SHA1 bae4bca09b82270ae11912d3acb02ac5b6b776e1 SHA256 44a4b6f898d2be88f7a346a1c453d78fcd07dcdb95cb5606528b130ea4c209cd
+MISC ChangeLog 620 RMD160 849d346f03aed8e31028300aee682949ab77026f SHA1 5a0e1847de959158c5992286a141ed94a3522aa2 SHA256 b950cce79622baa0631c995151ee8757b52e2e5d8ca511e996dfbc2c048b6ea4
 MISC metadata.xml 221 RMD160 751930ca3ccaae39b6812a3d815205868a849159 SHA1 82e9a3c59185254f589ecf5821acf0d5e2706020 SHA256 536a67c6ff2cfa07af754114369e9780ad66d24c739644d107e0ec707a4147b0
diff --git a/dev-db/sqliteman/sqliteman-1.2.0.ebuild b/dev-db/sqliteman/sqliteman-1.2.1.ebuild
index 3df195e2297a..d1c155a200a9 100644
--- a/dev-db/sqliteman/sqliteman-1.2.0.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteman/sqliteman-1.2.0.ebuild,v 1.1 2008/12/31 14:56:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteman/sqliteman-1.2.1.ebuild,v 1.1 2009/03/14 12:09:22 scarabeus Exp $
 
 EAPI=2
 
@@ -15,10 +15,14 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/qt-gui:4
-				x11-libs/qt-sql:4[sqlite] )
-			  ( =x11-libs/qt-4.3*[sqlite3] ) )
-		>=x11-libs/qscintilla-2.1-r1"
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[sqlite]
+	>=x11-libs/qscintilla-2.1-r1[qt4]"
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS README"
+
+src_prepare() {
+	# remove bundled lib
+	rm -rf "${S}"/${PN}/qscintilla2
+}