summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-14 12:09:22 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-14 12:09:22 +0000
commit0435d60ca3d95de5e4414faa8a98a9378222a7ca (patch)
tree89a6cda4144e93ecc6a3ff47e3c54c407b20e3e4 /dev-db/sqliteman
parentNow install headers used for internal suitesparse packages (diff)
downloadgentoo-2-0435d60ca3d95de5e4414faa8a98a9378222a7ca.tar.gz
gentoo-2-0435d60ca3d95de5e4414faa8a98a9378222a7ca.tar.bz2
gentoo-2-0435d60ca3d95de5e4414faa8a98a9378222a7ca.zip
Version bump. Remove old. Fixes bugs #255755 and #261495.
(Portage version: 2.2_rc24/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/sqliteman')
-rw-r--r--dev-db/sqliteman/ChangeLog10
-rw-r--r--dev-db/sqliteman/sqliteman-1.2.1.ebuild (renamed from dev-db/sqliteman/sqliteman-1.2.0.ebuild)16
2 files changed, 18 insertions, 8 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/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
+}