summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/keepassx/ChangeLog5
-rw-r--r--app-admin/keepassx/keepassx-0.4.1.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index a6e4275d9077..9334ccd1fa18 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/keepassx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.46 2010/01/07 22:06:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.47 2010/01/10 21:35:25 spatz Exp $
+
+ 10 Jan 2010; Dror Levin <spatz@gentoo.org> keepassx-0.4.1.ebuild:
+ Fix dep on xextproto/libXtst, bug 300373.
07 Jan 2010; Joseph Jezak <josejx@gentoo.org> keepassx-0.4.1.ebuild:
Marked ppc stable for bug #294490.
diff --git a/app-admin/keepassx/keepassx-0.4.1.ebuild b/app-admin/keepassx/keepassx-0.4.1.ebuild
index 18f707b33351..b87ce2974564 100644
--- a/app-admin/keepassx/keepassx-0.4.1.ebuild
+++ b/app-admin/keepassx/keepassx-0.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.7 2010/01/07 22:06:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.8 2010/01/10 21:35:25 spatz Exp $
EAPI="2"
@@ -17,7 +17,8 @@ IUSE="debug pch"
DEPEND="x11-libs/qt-core:4
x11-libs/qt-gui:4
- x11-libs/qt-xmlpatterns:4"
+ x11-libs/qt-xmlpatterns:4
+ || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 )"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-compile-with-qt-4.6.patch" )