summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-02 20:03:48 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-02 20:03:48 +0000
commit43b3ad000a6be8f11682cad229ce22ca6ce73776 (patch)
tree8741bd5c01af5a609437278f250e0fba77d7dc9f /net-im/kopete
parentversion bump (diff)
downloadhistorical-43b3ad000a6be8f11682cad229ce22ca6ce73776.tar.gz
historical-43b3ad000a6be8f11682cad229ce22ca6ce73776.tar.bz2
historical-43b3ad000a6be8f11682cad229ce22ca6ce73776.zip
Properly block kde-base/kdenetwork and net-libs/libjingle thanks to Daniel Webert <rockoo@gmail.com> in bug 135310
Package-Manager: portage-2.1_rc3-r5
Diffstat (limited to 'net-im/kopete')
-rw-r--r--net-im/kopete/ChangeLog6
-rw-r--r--net-im/kopete/Manifest26
-rw-r--r--net-im/kopete/kopete-0.12.0.ebuild6
3 files changed, 17 insertions, 21 deletions
diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 42422b1e59f6..1ca192e53950 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/kopete
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.59 2006/06/02 10:52:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.60 2006/06/02 20:03:48 genstef Exp $
+
+ 02 Jun 2006; Stefan Schweizer <genstef@gentoo.org> kopete-0.12.0.ebuild:
+ Properly block kde-base/kdenetwork and net-libs/libjingle thanks to Daniel
+ Webert <rockoo@gmail.com> in bug 135310
02 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-0.12.0.ebuild:
Add ~ppc keyword (okay from lu_zero).
diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index 1bee7c5303c4..0e0dc4738316 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d
MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch 778
RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
DIST kopete-0.12.tar.bz2 5303165 RMD160 f69576edb740dc80b74e69455b3302e7345d71b6 SHA1 723c7ed0e38afe7f7579caf2f39fadcb5180b77e SHA256 1fc32f9729dcf29ae5cad344858ec7d4b3bbb0f94f13edbbbe72462e89cdfa58
-EBUILD kopete-0.12.0.ebuild 2031 RMD160 1c8b4e19914048f1912050dbab94f7180974b459 SHA1 f2378cb4989f63e592853d0a5a3e4bc80fc8ee47 SHA256 bdb3d654dfd1b93ceef33d664cc5fbc31b91aa17fa73fe61d484a19ebefc9157
-MD5 990145a5d43b90fc862f1756a865cba3 kopete-0.12.0.ebuild 2031
-RMD160 1c8b4e19914048f1912050dbab94f7180974b459 kopete-0.12.0.ebuild 2031
-SHA256 bdb3d654dfd1b93ceef33d664cc5fbc31b91aa17fa73fe61d484a19ebefc9157 kopete-0.12.0.ebuild 2031
-MISC ChangeLog 2117 RMD160 a68d7e4d78df92d8e856f35950cfbe1995cc57e1 SHA1 203c41c7dcc97f8f31914c0df2d641b13300404d SHA256 408dc2c50d14249c2d9aa9c365d344cc38fa61b068efdeb24f45139dd2043c0e
-MD5 4dd5e8913ed62f0f55e2d2e9d8c2c281 ChangeLog 2117
-RMD160 a68d7e4d78df92d8e856f35950cfbe1995cc57e1 ChangeLog 2117
-SHA256 408dc2c50d14249c2d9aa9c365d344cc38fa61b068efdeb24f45139dd2043c0e ChangeLog 2117
+EBUILD kopete-0.12.0.ebuild 2072 RMD160 d3695502fabef579f9d5f987a4b096643a33e455 SHA1 e10b8d79af6ff59fa8d5f2fe95196b160c4320dc SHA256 4cc7571ed7ffada9441fbc40a4f48f0af0720527fd5ce019ddce4c181be597e7
+MD5 6bd3076e7626bf3d5f01fbc538f5af46 kopete-0.12.0.ebuild 2072
+RMD160 d3695502fabef579f9d5f987a4b096643a33e455 kopete-0.12.0.ebuild 2072
+SHA256 4cc7571ed7ffada9441fbc40a4f48f0af0720527fd5ce019ddce4c181be597e7 kopete-0.12.0.ebuild 2072
+MISC ChangeLog 2310 RMD160 5718118ad4fcff8822a4f8ece7ee8d6bdbe4ee72 SHA1 9ffac3558cf83b772176fef63ef12c23df02f236 SHA256 0af32b168cfd60a99b1268648ca781936178879d7e85a1f39b4a2f037846b51c
+MD5 f187175867a73d27947486e26a2a0ffd ChangeLog 2310
+RMD160 5718118ad4fcff8822a4f8ece7ee8d6bdbe4ee72 ChangeLog 2310
+SHA256 0af32b168cfd60a99b1268648ca781936178879d7e85a1f39b4a2f037846b51c ChangeLog 2310
MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -21,10 +18,3 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
MD5 01832fcb2e5e8d98235b4ff35d29c467 files/digest-kopete-0.12.0 241
RMD160 570f6293396053404d178f86b01eaecc5c783d44 files/digest-kopete-0.12.0 241
SHA256 7c82928c5b35764c916e17475c795b9a07d73a2f5db052ad0afac911089abb74 files/digest-kopete-0.12.0 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEgBh5AiZjviIA2XgRAtQtAJ9Hw2BuZEjg/YCnlaIRNvxYxogs0QCeNDVh
-YkDxJS+d74/LeaYmE+opjzo=
-=x4p4
------END PGP SIGNATURE-----
diff --git a/net-im/kopete/kopete-0.12.0.ebuild b/net-im/kopete/kopete-0.12.0.ebuild
index 6d3a22ca0187..42737788560c 100644
--- a/net-im/kopete/kopete-0.12.0.ebuild
+++ b/net-im/kopete/kopete-0.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.0.ebuild,v 1.2 2006/06/02 10:52:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.0.ebuild,v 1.3 2006/06/02 20:03:48 genstef Exp $
inherit kde eutils
@@ -40,7 +40,9 @@ BOTH_DEPEND="dev-libs/libxslt
RDEPEND="${BOTH_DEPEND}
ssl? ( app-crypt/qca-tls )
- !kde-base/kopete"
+ !kde-base/kopete
+ !kde-base/kdenetwork
+ !net-libs/libjingle"
DEPEND="${BOTH_DEPEND}
kernel_linux? ( virtual/os-headers )