summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2007-06-06 17:26:06 +0000
committerWulf Krueger <philantrop@gentoo.org>2007-06-06 17:26:06 +0000
commit98b7d7ef4a5ba2248967c533f9d51c09f51f646f (patch)
tree731e6ba5800fabb3fb32d9277c0eec88102553ee /kde-misc/tork
parentDrop ~alpha keyword as nobody has this hardware (diff)
downloadhistorical-98b7d7ef4a5ba2248967c533f9d51c09f51f646f.tar.gz
historical-98b7d7ef4a5ba2248967c533f9d51c09f51f646f.tar.bz2
historical-98b7d7ef4a5ba2248967c533f9d51c09f51f646f.zip
Allow either libkonq OR kdebase to satisfy tork's dependencies, fixes bug 181072.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'kde-misc/tork')
-rw-r--r--kde-misc/tork/ChangeLog6
-rw-r--r--kde-misc/tork/Manifest22
-rw-r--r--kde-misc/tork/tork-0.17.ebuild4
3 files changed, 18 insertions, 14 deletions
diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index 07ce5e422a63..5b5ad3c47154 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-misc/tork
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.16 2007/06/02 21:10:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.17 2007/06/06 17:26:06 philantrop Exp $
+
+ 06 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> tork-0.17.ebuild:
+ Allow either libkonq OR kdebase to satisfy tork's dependencies, fixes bug
+ 181072.
*tork-0.17 (02 Jun 2007)
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index f6d9d085cc1f..d5ada2be7b82 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -12,14 +12,14 @@ EBUILD tork-0.13.ebuild 1090 RMD160 4a587612a71e9b357a4fe790facd2ce47b707612 SHA
MD5 7c38fedcb9b1e496c605224daadc1a05 tork-0.13.ebuild 1090
RMD160 4a587612a71e9b357a4fe790facd2ce47b707612 tork-0.13.ebuild 1090
SHA256 5d276f6a00826626eff3b831a09c80bcd7ffc9745166003f83f4ec47c2170dd4 tork-0.13.ebuild 1090
-EBUILD tork-0.17.ebuild 1145 RMD160 b6cd827ee9a9b87663a7a15910c210b88ae07e45 SHA1 9443a4008048fb812fbc265b007ac7607f54fe1b SHA256 f208b7fb116115cd0cecc39d1f170517b61806fe1d5cee89af24c2f134d87cde
-MD5 5c6b48baab940b5dc8effa866f3136e3 tork-0.17.ebuild 1145
-RMD160 b6cd827ee9a9b87663a7a15910c210b88ae07e45 tork-0.17.ebuild 1145
-SHA256 f208b7fb116115cd0cecc39d1f170517b61806fe1d5cee89af24c2f134d87cde tork-0.17.ebuild 1145
-MISC ChangeLog 3166 RMD160 0e0358d32959349ff18f8d2681687762f0e83ee0 SHA1 dbc512a540cca156217b10c09ce1d7238821494e SHA256 4373b2599f1b5428a5f521632182efecd80a97531b05463eb8e0775e1367ce41
-MD5 17ad42c70210e0e25666f05ec463f619 ChangeLog 3166
-RMD160 0e0358d32959349ff18f8d2681687762f0e83ee0 ChangeLog 3166
-SHA256 4373b2599f1b5428a5f521632182efecd80a97531b05463eb8e0775e1367ce41 ChangeLog 3166
+EBUILD tork-0.17.ebuild 1169 RMD160 95556688775ed71baa48aea2acc1c6164ec77be9 SHA1 40ea6e2d5aa0b0f5cb4ba8f6b3156dae180b8fd5 SHA256 58c2ccb7d3a77ef176780722fb0c71fa757a843cd0b505a05257cbfbf0fbba0f
+MD5 0bbc9961d70a1a022b017e6b33fc6030 tork-0.17.ebuild 1169
+RMD160 95556688775ed71baa48aea2acc1c6164ec77be9 tork-0.17.ebuild 1169
+SHA256 58c2ccb7d3a77ef176780722fb0c71fa757a843cd0b505a05257cbfbf0fbba0f tork-0.17.ebuild 1169
+MISC ChangeLog 3326 RMD160 631d6fcdcfaee2bc37741d30bf840a0d70810902 SHA1 9f5fc43dbc937bbabd08ecd91e9e013b55b81da1 SHA256 10c6cb02eaf061497f6f8a4d305243602788353024a68294349ef0bbc090fbc3
+MD5 467285cae2d1ea34c4ee5f5e68383b7a ChangeLog 3326
+RMD160 631d6fcdcfaee2bc37741d30bf840a0d70810902 ChangeLog 3326
+SHA256 10c6cb02eaf061497f6f8a4d305243602788353024a68294349ef0bbc090fbc3 ChangeLog 3326
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -36,7 +36,7 @@ SHA256 4ac8ae8a8c3520291c35e2c79c522eb710e22ad7979c72445a1fcf409f9c1053 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGYdzYCkvF58q80IkRAkvYAJ9ycIcPesA0ETPenM3aphPoz+u55QCfUq27
-L0X7OHrMBBDsoWpCNGSz/WE=
-=cKyi
+iD8DBQFGZu41CkvF58q80IkRAtjMAJ95l77HaRfM1R5UA0CjPJwZzWtm4gCcC3Xn
+29yEJOzTtQg5pfVuoljaYaA=
+=GwER
-----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/tork-0.17.ebuild b/kde-misc/tork/tork-0.17.ebuild
index 96b238aea85b..980fc6bcb113 100644
--- a/kde-misc/tork/tork-0.17.ebuild
+++ b/kde-misc/tork/tork-0.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.17.ebuild,v 1.1 2007/06/02 21:10:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.17.ebuild,v 1.2 2007/06/06 17:26:06 philantrop Exp $
inherit kde
@@ -15,7 +15,7 @@ IUSE=""
DEPEND="dev-libs/openssl
>=dev-libs/geoip-1.4.0
- kde-base/libkonq"
+ || ( kde-base/libkonq kde-base/kdebase )"
RDEPEND="${DEPEND}
>=net-misc/tor-0.1.2.14