Restore latest stable 4.4 ebuild. Remove 5.2.2-r1 for bug #336166 (removal of 5.x...

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 945500ed6e4883567ca38f014bb9908da3fd444b..6a2947c9607dd23fd0e7b17bed40b848a9486de8 100644 (file)
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.142 2011/09/29 10:28:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.143 2011/11/15 01:31:46 dirtyepic Exp $
+
+  15 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> +bittorrent-4.4.0-r1.ebuild,
+  -bittorrent-5.2.2-r1.ebuild:
+  Restore latest stable 4.4 ebuild. Remove 5.2.2-r1 for bug #336166 (removal of
+  5.x series).
 
   15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
   -bittorrent-4.4.0-r1.ebuild, -bittorrent-5.0.9-r1.ebuild,

diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 5fd8a9b73f68b2c5e762e9e22a486287fafa3125..5125efc0295eb74af3795431e7282111f6b7d9fe 100644 (file)
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -13,15 +13,14 @@ AUX bittorrent-tracker.confd 565 RMD160 9a21fec4c8b654ed71ac0a1425943622cd1b525f
 AUX bittorrent-tracker.initd 653 RMD160 4546d4d647969f91f623d98bc80ef53dc86a2117 SHA1 898ed64266ac07c53c8536223b1851a2fc5b671d SHA256 5f70c794dcc5d821df1224168ac449fd94983a7f9eeb3e498d31fc369b3b2ff3
 AUX bittorrent.desktop 295 RMD160 573ec80b5eed531caf2db32b35d77d41b71ed7fa SHA1 e2c765b9015ce100181710a2d529ca471d83adc2 SHA256 59459f2dddef3c168f528c3679971fe67e9c996234935c5f682f86f33200f31a
 DIST BitTorrent-4.4.0.tar.gz 1255281 RMD160 9e743b3178142855d289743d4430598353fb4d3f SHA1 8ca3e52c8049ff29a6785da410d6aa80c6726882 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
-DIST BitTorrent-5.2.2.tar.gz 2499810 RMD160 9cda47bb81ab1b8ef254855bf3bd84877bac102f SHA1 ba407346d6cce9d59aef0464d8ee931a953f3a48 SHA256 a9cfe1377b284a0e98d8c0e49d099f44fc8ead6e7f45456428d66bbee0006816
+EBUILD bittorrent-4.4.0-r1.ebuild 1779 RMD160 cdf440d3a64d65952dd23eff8b92ae07e52da6bc SHA1 61e503ad627297ab25c5f7b8de69d901c52806a8 SHA256 f5335da2f85915c56eafdf9cf3974ffc9c1c2e63efb643dd3fdff8b5c2da780a
 EBUILD bittorrent-4.4.0-r2.ebuild 2280 RMD160 eb441837121c9dccba5969ecd2cf1d06fc1e02c2 SHA1 52e20344a8f7c4cd9546c6fc19cc0919797c88ac SHA256 4c69957ded97c00907064b0109c1f82a6a43cda2d920e8ae8cfc705ef9eb2806
-EBUILD bittorrent-5.2.2-r1.ebuild 1780 RMD160 db1f892b1299ea7b93540947a3e7403fc0c8468f SHA1 fcf13f33f255738948740a72e479779a23003969 SHA256 b51e79621257fdd95728518fb02a286c43b33e2e400ec34721e006ed765a66a0
-MISC ChangeLog 20992 RMD160 860d331d7b24294610889f69e3453c7ce74e3049 SHA1 2757913da0693c9393b1371d5fe727240b5227e2 SHA256 2adc3daf0f7a55a511efe5de33da2ad8dec6ac616a05555f7483599d1b564489
+MISC ChangeLog 21198 RMD160 184d4d1f43e923f485715e390d0b35188d660e48 SHA1 94fcda5b21af29a6b688c663d8b9b960a216d0e2 SHA256 784720ebd6ec74733b10ebdc1084f8843d87d71b64b956f6e70c3b1a9d91e097
 MISC metadata.xml 253 RMD160 c5653dbfa27ea739e3430aed0980016fd12aa68f SHA1 461dedcaf3322af7e59c93c21845796c5fa27419 SHA256 301f970e0628e48cfeaf5bd540b63c012452b458b76ef05bb0bcbe640a0f373f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6ESGYACgkQX3X2B8XHTonmXwCfU31zHXQGajvsCpaDs28XHaWM
-L64An0rjf+wCAg2ktY3RiJHZun1FL9Yy
-=VjWh
+iEYEARECAAYFAk7Bw2EACgkQiqiDRvmkBmJOlgCgiWZF1DRW5DLw97ddXAFR7IHv
+fZ4An3LzfsBRgT6A0jeDKjaeszH1xn2e
+=w0DM
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bittorrent/bittorrent-5.2.2-r1.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
similarity index 63%
rename from net-p2p/bittorrent/bittorrent-5.2.2-r1.ebuild
rename to net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
index ac0ec33c6cecddbfcd86ecad466be369ed7c3ff8..7360d839dc19c297dc7c068f7f12cef7db211014 100644 (file)
--- a/net-p2p/bittorrent/bittorrent-5.2.2-r1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-5.2.2-r1.ebuild,v 1.1 2011/09/15 07:35:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild,v 1.7 2011/11/15 01:31:48 dirtyepic Exp $
+
+EAPI=3
 
-EAPI="3"
 PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
 
 inherit distutils fdo-mime eutils
 
@@ -14,34 +14,42 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="tool for distributing files via a distributed network of nodes"
 HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://download.bittorrent.com/dl/archive/${MY_P}.tar.gz"
+SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
 
 LICENSE="BitTorrent"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
+IUSE="gtk"
 
-RDEPEND=">=dev-python/pycrypto-2.0
-       >=dev-python/twisted-2
-       dev-python/twisted-web
-       net-zope/zope-interface"
+RDEPEND="gtk? (
+               >=x11-libs/gtk+-2.6:2
+               >=dev-python/pygtk-2.6
+       )
+       >=dev-python/pycrypto-2.0"
 DEPEND="${RDEPEND}
        app-arch/gzip
        >=sys-apps/sed-4.0.5
        dev-python/dnspython"
 
-DOCS="README.txt TRACKERLESS.txt public.key"
+DOCS="TRACKERLESS.txt public.key credits.txt"
 PYTHON_MODNAME="BitTorrent"
 
 src_prepare() {
        # path for documentation is in lowercase #109743
        sed -i -r "s:(dp.*appdir):\1.lower():" BitTorrent/platform.py
-       distutils_src_prepare
 }
 
 src_install() {
        distutils_src_install
-       rm -f "${D}"/usr/bin/bittorrent
+       use gtk || rm -f "${D}"/usr/bin/bittorrent
+       dohtml redirdonate.html
+
+       if use gtk ; then
+               doicon images/logo/bittorrent.ico
+               make_desktop_entry "bittorrent" "BitTorrent" bittorrent.ico "Network"
+               echo "MimeType=application/x-bittorrent" \
+                       >> "${D}"/usr/share/applications/bittorrent-${PN}.desktop
+       fi
 
        newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
        newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
@@ -51,11 +59,6 @@ pkg_postinst() {
        einfo "Remember that BitTorrent has changed file naming scheme"
        einfo "To run BitTorrent just execute /usr/bin/bittorrent"
        einfo "To run the init.d, please use /etc/init.d/bittorrent-tracker"
-       elog
-       elog "If you are upgrading from bittorrent-4.4.0 you must remove "
-       elog "the ~/.bittorrent dir to make this version work. Remember to "
-       elog "do a backup first!"
-       elog
        distutils_pkg_postinst
        fdo-mime_desktop_database_update
 }