From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Dec 2006 18:14:56 +0000 (+0000)
Subject: Die, dont warn, if dependency checks fail #153875 by Jory A. Pratt.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=635cf48f8000c587f7e220a562dca8b626a68837;p=gentoo.git

Die, dont warn, if dependency checks fail #153875 by Jory A. Pratt.
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index aa8290db0e4f..42d23c6d04df 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/bittorrent
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.91 2006/10/21 15:24:57 squinky86 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.92 2006/12/28 18:14:56 vapier Exp $
+
+  28 Dec 2006; Mike Frysinger <vapier@gentoo.org> bittorrent-4.26.0.ebuild:
+  Die, dont warn, if dependency checks fail #153875 by Jory A. Pratt.
 
 *bittorrent-4.26.0 (21 Oct 2006)
 
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 07063e3f2761..e7aa1755013f 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bittorrent-tracker.confd 565 RMD160 d9ff91c65fee606eb536eb672d6a28f7d0cf4ba3 SHA1 e909a7e7c5b9dec428b4c2cf0d9bf06a714e3898 SHA256 b6094703dfc486b6e8d10885284479ee4f03308d7bed25d1411c28a8428d227d
 MD5 c200bdbccb6ccbf18bef6338363c1a4a files/bittorrent-tracker.confd 565
 RMD160 d9ff91c65fee606eb536eb672d6a28f7d0cf4ba3 files/bittorrent-tracker.confd 565
@@ -34,18 +37,18 @@ EBUILD bittorrent-4.2.2.ebuild 2309 RMD160 cafd7033ccb832788bfe5a1b155207d04bfac
 MD5 37fd10a87cd1f7d00e675c861af2abc8 bittorrent-4.2.2.ebuild 2309
 RMD160 cafd7033ccb832788bfe5a1b155207d04bfacd4a bittorrent-4.2.2.ebuild 2309
 SHA256 86d72aad2253b976d98a4bdefc5e317a1339e2a82718b492c7383c44ccf075e1 bittorrent-4.2.2.ebuild 2309
-EBUILD bittorrent-4.26.0.ebuild 2263 RMD160 f895156a24aa4b9efdaa50a816047b62c52972e8 SHA1 e7719237b72770b08fffd589dc43107a5f49855a SHA256 b2b8aa954b12d8fd4a6152452426f76e9cdb3bca85067398f1cf3b6a814123d3
-MD5 480e003f6321e3d359caacca20bd24d2 bittorrent-4.26.0.ebuild 2263
-RMD160 f895156a24aa4b9efdaa50a816047b62c52972e8 bittorrent-4.26.0.ebuild 2263
-SHA256 b2b8aa954b12d8fd4a6152452426f76e9cdb3bca85067398f1cf3b6a814123d3 bittorrent-4.26.0.ebuild 2263
+EBUILD bittorrent-4.26.0.ebuild 2246 RMD160 586a78c226c8c3776b54cb297b5b9e97b39e2c50 SHA1 fe53ba05830fe1cd45daa9524d073661e812193c SHA256 9da61da60ac46d6673469f39b6dae4877dc6c0f425f1c213594d0da752980401
+MD5 f52aceacfa0fabe6d67aa19ecb3269c7 bittorrent-4.26.0.ebuild 2246
+RMD160 586a78c226c8c3776b54cb297b5b9e97b39e2c50 bittorrent-4.26.0.ebuild 2246
+SHA256 9da61da60ac46d6673469f39b6dae4877dc6c0f425f1c213594d0da752980401 bittorrent-4.26.0.ebuild 2246
 EBUILD bittorrent-4.4.0.ebuild 1906 RMD160 a0d41d46c081d3e89486a31e2fe925f24b4e178c SHA1 3de3726472dc1a697c97dd781da4877301ae275e SHA256 2ecbed1fdaaafb3161165eaaa9200dc783b86d32030f105c1c4ce3ee69903204
 MD5 59496439d90f5d71cb7bc871c1dedcc4 bittorrent-4.4.0.ebuild 1906
 RMD160 a0d41d46c081d3e89486a31e2fe925f24b4e178c bittorrent-4.4.0.ebuild 1906
 SHA256 2ecbed1fdaaafb3161165eaaa9200dc783b86d32030f105c1c4ce3ee69903204 bittorrent-4.4.0.ebuild 1906
-MISC ChangeLog 13937 RMD160 77e15f56c995e08b17f5b488212373cc0cdb1d2c SHA1 6f024bc57c1b7d3c8e09ff8430ca7dfb15656d94 SHA256 b583b3af97106db6a0fd5ba20b7110b3bb4e0b2a00f24f771e77bd666d5a2d35
-MD5 fcb690f213291824d749832e23726810 ChangeLog 13937
-RMD160 77e15f56c995e08b17f5b488212373cc0cdb1d2c ChangeLog 13937
-SHA256 b583b3af97106db6a0fd5ba20b7110b3bb4e0b2a00f24f771e77bd666d5a2d35 ChangeLog 13937
+MISC ChangeLog 14081 RMD160 625e4b9e165c73773fbfe7c4683f471b81c3b093 SHA1 9244245f083edaf542154e3ab85606e4709ad5f5 SHA256 7c8d36c47ed9f9fe6877bf4edcfcfd1dd74f72ed92fbfad5361f9de48dbd8bdd
+MD5 8a49019260e400af923f8792bb25386a ChangeLog 14081
+RMD160 625e4b9e165c73773fbfe7c4683f471b81c3b093 ChangeLog 14081
+SHA256 7c8d36c47ed9f9fe6877bf4edcfcfd1dd74f72ed92fbfad5361f9de48dbd8bdd ChangeLog 14081
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
@@ -62,3 +65,10 @@ SHA256 1c5699c5511aabf14c6a9088551948f7557145ae09eebdd9ea876f4110935d8d files/di
 MD5 a83d419e4505d00169381a9eaf023d59 files/digest-bittorrent-4.4.0 253
 RMD160 363ff7e44a1e324a4d2b30e0b455276fdb297357 files/digest-bittorrent-4.4.0 253
 SHA256 472a02e8501bc049b86ad1ec025bc15c08d19555ac6f0edd0bbddc62e29b7735 files/digest-bittorrent-4.4.0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlAnc8bi6rjpTunYRAkZFAKDj6dY7ZetWTbLVmUBlBWc6FteQdwCg2xVQ
+JcSiHQ/KImak5TdqYPsGa1Y=
+=Be7I
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/bittorrent/bittorrent-4.26.0.ebuild b/net-p2p/bittorrent/bittorrent-4.26.0.ebuild
index e95ddf4811c9..32550d455575 100644
--- a/net-p2p/bittorrent/bittorrent-4.26.0.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.26.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-p2p/bittorrent/bittorrent-4.26.0.ebuild,v 1.1 2006/10/21 15:24:57 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.26.0.ebuild,v 1.2 2006/12/28 18:14:56 vapier Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -32,16 +32,16 @@ DEPEND="${RDEPEND}
 	dev-python/dnspython"
 PROVIDE="virtual/bittorrent"
 
-DOCS="TRACKERLESS.txt LICENSE.txt public.key"
+DOCS="TRACKERLESS.txt public.key"
 PYTHON_MODNAME="BitTorrent"
 
 pkg_setup() {
-	if use gtk; then
-		if ! built_with_use x11-libs/wxGTK unicode; then
-			eerror "You must build wxGTK and wxpython with unicode support"
+	if use gtk ; then
+		if ! built_with_use x11-libs/wxGTK unicode ; then
+			die "You must build wxGTK and wxpython with unicode support"
 		fi
-		if ! built_with_use dev-python/wxpython unicode; then
-			eerror "You must build wxGTK and wxpython with unicode support"
+		if ! built_with_use dev-python/wxpython unicode ; then
+			die "You must build wxGTK and wxpython with unicode support"
 		fi
 	fi
 }
@@ -56,7 +56,7 @@ src_unpack() {
 
 src_install() {
 	distutils_src_install
-	if ! use gtk; then
+	if ! use gtk ; then
 		rm ${D}/usr/bin/bittorrent
 	fi
 	dohtml redirdonate.html