Remove deprecated wxGTK 2.6 support wrt #391685. This ebuild is now only for cmdline tools.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 36 insertions, 24 deletions

diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index 4aeebaec9c5e..6233c993012d 100644
--- a/net-p2p/bittornado/ChangeLog
+++ b/net-p2p/bittornado/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bittornado
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.71 2011/03/28 20:31:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.72 2011/12/09 15:44:21 ssuominen Exp $
+
+  09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  bittornado-0.3.18-r2.ebuild:
+  Remove deprecated wxGTK 2.6 support wrt #391685. This ebuild is now only for
+  cmdline tools.
 
   28 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   bittornado-0.3.18-r2.ebuild:
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index cdb783ea36c6..2eff58af055f 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bittornado-0.3.18-wxversion.patch 2808 RMD160 dfb274b0a92aab97564b9a72de6314923cb66359 SHA1 8049ef9f69324588589faa751bad9b80752efc49 SHA256 1b643fdf05458139641afc582493dbf2d92e0717c4423da3536af78bf7a9132e
 AUX bittornado.desktop 274 RMD160 ce508eec735923984f4bdf0489cb976476b54954 SHA1 1f7846792407fde506b54afa4fac8eed0325088d SHA256 2fef575339ba73a7ef4cea6320b17be7dcb9a67996e04d33c6e09193a0b25616
 AUX bttrack.conf 728 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb SHA1 fbc4cf7a9b227cf267b6f7e166696010e3cd29ee SHA256 2f40a8334dde5a951c79018476e9ab1380cb382f403068c906427f2b4b435d73
 AUX bttrack.rc 631 RMD160 72d3594c01896167e70f568710cf076d2c469979 SHA1 5a4c2b0e95bb6a2c0b73dedf68456ce3bd21d6c6 SHA256 a28cb3b55c7acc0a4f9c0ce0802eb5d579eb5c0f8ddc028fbad380bc5f89f6ae
 AUX favicon.ico 1406 RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 SHA1 3fade857763dd8b603c32080c2a29542973c0dd7 SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22
 DIST BitTornado-0.3.18.tar.gz 189227 RMD160 77e61f01101c2878d4e993e0581365a71c375892 SHA1 64c65b69d112f76ba8a024ff5b8671058130b71a SHA256 d9e6ad0bf5b2e9820bab809c5a4fcd94e844a57f396ac51547fe47dbe255d9e0
-EBUILD bittornado-0.3.18-r2.ebuild 1525 RMD160 76617031748b05a1ad0688b2ec69d339d7acd0fe SHA1 f4c8af1a70ecd0b072132833b8867a615a548dc8 SHA256 5b29f8b828f43a56e140f901cb5e4557d5f46fc92e684de09eb9be914e546a70
-MISC ChangeLog 9851 RMD160 6f19d6e6d389b663ba985d27d49b26d18c566b42 SHA1 504fbe4555418c20fca2fb603ef50121698f3c19 SHA256 024a8aba9f7cd839f1a6bf73fecc4328b0ba3fa2f2edc6bd038fc02e199c831a
+EBUILD bittornado-0.3.18-r2.ebuild 1384 RMD160 474a39668841187bfc5b1f42bf12b63d9ff597ff SHA1 921fd7bd3530c1a0acadb1f1500ee4316d142fb9 SHA256 2c12d392ff4c79b590120c15de6c5cd30230f80a0482d9c093fe3b687cc0fb8b
+MISC ChangeLog 10034 RMD160 daf721e82c8d145056bad6762909179c86b3decd SHA1 cb6f058518378ae8ec81a13efb3cde46c46f0540 SHA256 4bfff4bcc666e2fd1801bcb30880c863cdaf93e24e85ef74d28cd465621acd09
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJO4iy3AAoJEEdUh39IaPFNSuoH/io2HM5yO/ARPOY5steSm/91
+zq+hLQ7NhVzSQLTF6fSRIem1s+Rfoe0744FD3UWiuCj3KB1L2jb3VxFxQMhtzf0I
+FdEjYjY4AUC2sLfjBWakibOv8+J3dEgDkeGQ12puZngDMqFtNhcElMDRtQI6+wkA
+KnUdL4lbGlqxdI6+Wxmza4sKS/y6kazzxihh/tpmU1WaUvQ6Ukwt9Nl6I+TN3occ
+itGZ1Hseuzy0bF0Fby0PyhUpDCSTNdTFECo/IETDZGevCe6+LvhuxswOkpk5fxMt
+IauVdbs4vVNwsq9c3dzElsoHQemOjk3EWMVFlOqVWc8eCytTRJWnzsHZje/G/mE=
+=PBV7
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild b/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild
index f34f62f6e401..65e7361494af 100644
--- a/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild,v 1.3 2011/03/28 20:31:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.18-r2.ebuild,v 1.4 2011/12/09 15:44:21 ssuominen Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
+# note: wxGTK interface has been removed wrt #391685. this ebuild is only for
+# cmdline tools as is.
+
+EAPI=3
+PYTHON_DEPEND=2
 
 inherit distutils eutils
 
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
+MY_PN=BitTornado
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="TheShad0w's experimental BitTorrent client"
 HOMEPAGE="http://www.bittornado.com/"
@@ -17,16 +20,15 @@ LICENSE="MIT"
 SLOT="0"
 
 KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="gtk"
+IUSE=""
 
-RDEPEND="gtk? ( =dev-python/wxpython-2.6* )
-	dev-python/pycrypto"
+RDEPEND="dev-python/pycrypto"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	>=sys-apps/sed-4.0.5"
 
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittornado"
+S=${WORKDIR}/${MY_PN}-CVS
+PIXMAPLOC=/usr/share/pixmaps/bittornado
 
 pkg_setup() {
 	python_set_active_version 2
@@ -45,17 +47,8 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 
-	if use gtk; then
-		dodir ${PIXMAPLOC}
-		insinto ${PIXMAPLOC}
-		doins icons/*.ico icons/*.gif
-	else
-		# get rid of any reference to the not-installed gui version
-		rm "${D}"/usr/bin/*gui.py
-	fi
-
-	newicon "${FILESDIR}"/favicon.ico ${PN}.ico
-	domenu "${FILESDIR}"/bittornado.desktop
+	# get rid of any reference to the not-installed gui version
+	rm "${D}"/usr/bin/*gui.py
 
 	newconfd "${FILESDIR}"/bttrack.conf bttrack
 	newinitd "${FILESDIR}"/bttrack.rc bttrack