summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDror Levin <spatz@gentoo.org>2010-01-10 21:35:25 +0000
committerDror Levin <spatz@gentoo.org>2010-01-10 21:35:25 +0000
commit815e754ded9bd67e3826261e8641546277ec208d (patch)
tree133c1b1f78153ce943f1510d19d206c6e2db015c /app-admin
parentAutomated update of use.local.desc (diff)
downloadhistorical-815e754ded9bd67e3826261e8641546277ec208d.tar.gz
historical-815e754ded9bd67e3826261e8641546277ec208d.tar.bz2
historical-815e754ded9bd67e3826261e8641546277ec208d.zip
Fix dep on xextproto/libXtst, bug 300373.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/keepassx/ChangeLog5
-rw-r--r--app-admin/keepassx/Manifest18
-rw-r--r--app-admin/keepassx/keepassx-0.4.1.ebuild5
3 files changed, 18 insertions, 10 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/Manifest b/app-admin/keepassx/Manifest
index 8e756ca2a778..c204a2d6455f 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,17 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX keepassx-0.4.1-compile-with-qt-4.6.patch 330 RMD160 d720d1e12095a29b75e95d12aa129db5f77b366c SHA1 e61b31ebe406e6a0e99d82068ae6a5838f42a364 SHA256 4328fe461fde8d98f1187d787818a01396f8023623055e7725677d1525cc4cbb
DIST KeePassX-0.3.4.tar.gz 535822 RMD160 3f7f364d62e3cc54f54e12f74d7d88cfcf23f231 SHA1 d9204396a0878c3acbce875b42df2899561c5206 SHA256 41dc39f675f812d81e413f7d9684a458fbd4ac9819c91ccc31b504cef8de71ee
DIST keepassx-0.4.1.tar.gz 1050175 RMD160 9fca65157428454fa755a4ab9c56f7beb07cf7e5 SHA1 f30ba9775965018aea8b7b149e6d0c9d4c617e69 SHA256 f9c1b17505430f68524ecc2be11930afa5d454097536c7a286355e1764b31429
EBUILD keepassx-0.3.4.ebuild 1305 RMD160 ba86a8361d7de54405fc65631fe370191804b4c0 SHA1 5b4d27f657dc0551eb3979176efc170bd9bc9509 SHA256 3cfb82d83f82d9d8774250ac3e6f4d34b929a4192a883f291186eebd2b4e7405
-EBUILD keepassx-0.4.1.ebuild 1086 RMD160 be43f14f3a8d2aef4747d88caaa0f073eddba177 SHA1 76181441daaff6b55fdb76f5a5b019cfd2f10442 SHA256 c884df8a1e0dbd072d0a47a9a10c0c5d21c09249a25cf765c85734ec9afc3ff7
-MISC ChangeLog 7923 RMD160 bd0be456893f69f398924cef60beb4a14695dea8 SHA1 a9226c78a1fe3667e38f2c8bbddd4f3a06c71a18 SHA256 5c12bbba184745d7bd4d616f67901667977445922e24184b2776c1475b290f31
+EBUILD keepassx-0.4.1.ebuild 1145 RMD160 7df7b545d3df0908fe400db4308c97e94fdff8e1 SHA1 3da8ecb4a081328444d13f369c2f5930a5a71fae SHA256 699fb428bc19d00d374d1b6ca97adfc53ca9a3e5d313100190fc3074449fac28
+MISC ChangeLog 8035 RMD160 7adb614b4cbbca9ceed58af108563ed950b437d5 SHA1 c6cb869525364988045c568ef843627a79c5701a SHA256 933927789d4bea1af25f6f9e4e68314aef5882fe7aa0001585abbfccb9c33d1e
MISC metadata.xml 585 RMD160 f2bcf8b777ee678affc418b011b52a5b9c6b9dc5 SHA1 f777322e1b94fa0e5f8b4ba525f0ca37d8ebe1fa SHA256 da01ff6f54242bbf7c3a592cb9fe3565465103456d26eed1a77f01e533c05cca
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAktGWo4ACgkQcsIHjyDViGSlYACfTK1t5MWydf4EyvA7ndTn8Lex
-czcAn2dw2VNfirWHgHKuM1dmbR8PpBam
-=3kT0
+iQEcBAEBCgAGBQJLSkgmAAoJEAWF714uGAc6WV0H/3+qiia1OoKL83fKdheDTot1
+ch8gi01GOg0RWf4fVU8T+W/6xiOWYd4VMX3LpBtZnMvNL3av0Aq/jaoIax8eSOPF
+xlP8vJ0RSYd01Y8ij6E3kd+opcFpWyAj+538UbtL4gi33/7IYxquYaZy+WwaY2pB
+TQ4s0sciQ73tvxkEDQURZtElm+boVwkVOpwMBDobz+j6vNOF6q0QCkrUYK+ja5B4
+pj0X2YZ8kV3DbJ1wJ3TK9Raueos+fRUvb+4dVTI5t5is/gNNr73UTwak5z8tFrIM
+bFJqGGQrfSCSxYv0bKu0M5kcbgvxg5Tah1IDX4uVFywvilRBIWVxjUYOYp/AKiA=
+=TyZ7
-----END PGP SIGNATURE-----
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" )