diff options
author | Jim Ramsay <lack@gentoo.org> | 2010-08-25 00:39:56 +0000 |
---|---|---|
committer | Jim Ramsay <lack@gentoo.org> | 2010-08-25 00:39:56 +0000 |
commit | b0522c9b13065f74cafbb4d5d38d0519095f6e43 (patch) | |
tree | 7c92c43a3a2b2f9290bed9384f3952e2ce1b3b34 /x11-misc | |
parent | Version bump, remove old (diff) | |
download | historical-b0522c9b13065f74cafbb4d5d38d0519095f6e43.tar.gz historical-b0522c9b13065f74cafbb4d5d38d0519095f6e43.tar.bz2 historical-b0522c9b13065f74cafbb4d5d38d0519095f6e43.zip |
Block x11-plugins/gkrellweather for file collision (Bug #333289)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/bbweather/ChangeLog | 6 | ||||
-rw-r--r-- | x11-misc/bbweather/Manifest | 18 | ||||
-rw-r--r-- | x11-misc/bbweather/bbweather-0.6.2.ebuild | 6 | ||||
-rw-r--r-- | x11-misc/bbweather/bbweather-0.6.3.ebuild | 5 |
4 files changed, 15 insertions, 20 deletions
diff --git a/x11-misc/bbweather/ChangeLog b/x11-misc/bbweather/ChangeLog index 980b6d08d50c..48b25e22ebc8 100644 --- a/x11-misc/bbweather/ChangeLog +++ b/x11-misc/bbweather/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/bbweather # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.27 2010/05/30 13:46:26 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.28 2010/08/25 00:39:56 lack Exp $ + + 25 Aug 2010; Jim Ramsay <lack@gentoo.org> bbweather-0.6.2.ebuild, + bbweather-0.6.3.ebuild: + Block x11-plugins/gkrellweather for file collision (Bug #333289) *bbweather-0.6.3 (30 May 2010) diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest index 7f60ff66c841..d664d26563be 100644 --- a/x11-misc/bbweather/Manifest +++ b/x11-misc/bbweather/Manifest @@ -1,19 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX bbweather-asneeded.patch 1099 RMD160 78b1b9811d2bc3461b3b9e47c289ec7ed2e432c3 SHA1 d9cf9aab5069d3ba2dedd8d4886121b3794e91c6 SHA256 963a7a76ff0ec6e341f9b0f32a65eeb8e92be49aef67efa9e9d6f49adc35e6e2 DIST bbweather-0.6.2.tar.bz2 80487 RMD160 3a93b7597af12f4001c3b61495e93ed079867cd4 SHA1 bdb3359876434a6d698a70a975312ca29b2116c4 SHA256 dac024c15df75cf8de29ae5e4a80e17771361e708ae45b772d1741fc926dc093 DIST bbweather-0.6.3.tar.bz2 80631 RMD160 b216f048c91600c3eeeecf9fe68c7c1ff72e8292 SHA1 625c756548bd9ce1dd5cfa64838fda74545d926f SHA256 575e0f5dd1af770490bf0f3ef9c26de5245deb91f79caa3d5db3cd9dc23b8e1e -EBUILD bbweather-0.6.2.ebuild 892 RMD160 613e8b89397af6ee7652d7cab55893c0942aa77b SHA1 df372ce167fc2239fdcaffc320ae962c788100f6 SHA256 039b9846f9ef2f01d91b1466481bcb5ff6d5d5473231d14acdd72e8121d04951 -EBUILD bbweather-0.6.3.ebuild 1098 RMD160 0fa70e50b0f7c17f18e00385e3c98f546d5e887c SHA1 c00f679ff5894262c22b92e3380972bc36e14d7a SHA256 3b7162da39eaf4cd9fee745df1ae8bbcd01328f8d67c9f6fb8ad82180506779d -MISC ChangeLog 3588 RMD160 75597d3992e19b1474f19f22e7c310ecc5c542da SHA1 76f1b8d0a0b5cdf3494546ffe494341ab5f24d3c SHA256 783fabe77a60a03acddcf743ed416e4f6d3938fb6f12f220031084decda5daa3 +EBUILD bbweather-0.6.2.ebuild 947 RMD160 181186d47342d69e5dbb4ac8bb86f9d15dd718a1 SHA1 b2c261b13fe31b57349f0a59e7d648abf7e87156 SHA256 cfd2208c060d0181b5170a8efc4a789fcc22b6271cae623775a02eef03954bcb +EBUILD bbweather-0.6.3.ebuild 1131 RMD160 84c43494ee3e8cc4b36c6b8dd2d7484b5fe01b18 SHA1 0aebf997eb44652432562767b56bb0e60b969a0e SHA256 5a2876c0f2d34a3b1aa2254014ec27ac8aa6df7c46cc57540495f6f971d86729 +MISC ChangeLog 3744 RMD160 0558295c358291ec024f8ccb1c9c97b4320cdbf8 SHA1 0ae49efde9feda037a7252a81480dd805bac7b32 SHA256 77a2d7d1f15611a1e8c6cb08028ef9f476b574308bee2d3309681deb88c2fd99 MISC metadata.xml 234 RMD160 446739cfd5656468251fe5d905e8e2d3ff93738a SHA1 9632bb24f575a43a775ca702184fd72d1e217d9a SHA256 2a9f00e2ade856d7ce272371d705a03e158a9f5c42e75631ce7092d0c4247332 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iJwEAQECAAYFAkwCbDwACgkQIiMqcbOVdxTUTQQAm+dWuePvlZMNsUxvTcbZdkFy -4T5GfI3YEM4FOueca1LWzFi7zLiFcPcen7bTfMg9cOke2O5kVPbTbXQgy5LBBJHa -bQzWOoImkQadKXIITjdUDMBxCm/mwvNu8coa+DsPRxQc+X9bNrD/YJ3Tgb04yydW -NjHaaRwySTHsngNH5CI= -=mQiD ------END PGP SIGNATURE----- diff --git a/x11-misc/bbweather/bbweather-0.6.2.ebuild b/x11-misc/bbweather/bbweather-0.6.2.ebuild index aec3149fa723..61bd880afa6c 100644 --- a/x11-misc/bbweather/bbweather-0.6.2.ebuild +++ b/x11-misc/bbweather/bbweather-0.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.2.ebuild,v 1.8 2008/12/27 23:06:43 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.2.ebuild,v 1.9 2010/08/25 00:39:56 lack Exp $ DESCRIPTION="blackbox weather monitor" HOMEPAGE="http://www.netmeister.org/apps/bbweather/" @@ -14,6 +14,8 @@ IUSE="" DEPEND="virtual/blackbox >=net-misc/wget-1.7 >=dev-lang/perl-5.6.1" +RDEPEND="${DEPEND} + !<=x11-plugins/gkrellweather-2.0.7-r1" src_install () { make DESTDIR="${D}" install || die "make install failed" diff --git a/x11-misc/bbweather/bbweather-0.6.3.ebuild b/x11-misc/bbweather/bbweather-0.6.3.ebuild index 652c1d49df13..e8f8a351d97c 100644 --- a/x11-misc/bbweather/bbweather-0.6.3.ebuild +++ b/x11-misc/bbweather/bbweather-0.6.3.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/x11-misc/bbweather/bbweather-0.6.3.ebuild,v 1.1 2010/05/30 13:46:26 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.3.ebuild,v 1.2 2010/08/25 00:39:56 lack Exp $ EAPI=2 @@ -20,7 +20,8 @@ DEPEND="dev-lang/perl RDEPEND="${DEPEND} net-misc/wget x11-apps/xmessage - virtual/blackbox" + virtual/blackbox + !<=x11-plugins/gkrellweather-2.0.7-r1" src_prepare() { epatch "${FILESDIR}"/${PN}-asneeded.patch |