Convert to distutils-r1.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 30cb6996d022c440015773975bbc9de027741a99..bea95bc6d3d20ce196a4fa06a668fe1b47215a7a 100644 (file)
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.152 2014/03/09 03:44:03 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.153 2014/12/25 10:47:23 mgorny Exp $
+
+*bittorrent-4.4.0-r3 (25 Dec 2014)
+
+  25 Dec 2014; Michał Górny <mgorny@gentoo.org> +bittorrent-4.4.0-r3.ebuild:
+  Convert to distutils-r1.
 
   09 Mar 2014; Ryan Hill <rhill@gentoo.org> metadata.xml:
   Change my email.

diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index aa526242547eec8538624ccac1a6567945680a04..d6674b1d663228445487cc37e164b70452bb4059 100644 (file)
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -12,19 +12,28 @@ AUX bittorrent-4.4.0-python26-syntax.patch 1597 SHA256 b11160c397c460d994393e1e1
 AUX bittorrent-tracker.confd 565 SHA256 c994ddd1670a274289043380db70f2f08829cf7c7747be9805ba31dce0e2bc86 SHA512 4df6c8ae7d23c8c239cf94adf34295974bff2eee36ba9db0c65e9d4df0428a693a2066da95ffb75c9143090d9224082cb760789a194ccd0191a6436ed7775ae6 WHIRLPOOL 9163a496b4b5ba5e99be99b2764c4c6861fc536bf31e1b6b26c04c3360935e8a608f39ed440891a82330316b0859dead3ce26c1c36173e26b0b9fad4b0d1faa8
 AUX bittorrent-tracker.initd 653 SHA256 5f70c794dcc5d821df1224168ac449fd94983a7f9eeb3e498d31fc369b3b2ff3 SHA512 2997bead9e25a3c165fcdfdd9cbb43a761dd87c815a46d35acf73c62aa57a0c6f1ab0767b61f885c861231f42c63aff80759f9b07f52cfa745b23d22db6e3f3b WHIRLPOOL f6a9b4656a4e5d3697cc171e3707dd9534b8e1d6e90fcf311e05e8fc79a3335f3ac50e1c77b20e4d57894d118a2f4486d0da14b5395146c573c0876cc11d0eaa
 AUX bittorrent.desktop 295 SHA256 59459f2dddef3c168f528c3679971fe67e9c996234935c5f682f86f33200f31a SHA512 0ec2008e34719853ca7b77876bdaedb78e1752f477d90829506e71d5de0e5a6e41d273b1a45553332d84a5ab2518ab457c5ebb22a6cfa843e6fbf334bc2096e9 WHIRLPOOL 505e64a6418d4fba79849a336dc97ed69d809b5dc33aaa5ce36e6f90e4c8df9244bedb160ec2a008151687afe7b3bf614aadbc8de3dff438500d2d43038ac5aa
-DIST BitTorrent-4.4.0.tar.gz 1255281 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
+DIST BitTorrent-4.4.0.tar.gz 1255281 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0 SHA512 04ac6690fe11225c182c10dd3e7a84b53d84fd795efdc8a8d502835bc1c728a95c6cb12cc42173aadc483eff39bfaaba3df418fc86114c240748631e91d6ddd8 WHIRLPOOL 99e38f8da90e9eadaa0e3d14cc4bf102964443e951da98a423383d5d428b253a736bbee4ed6c4475e8a0ba5456f515e28346c1ea2328b5ed8c642cf50a13b15c
 EBUILD bittorrent-4.4.0-r1.ebuild 1776 SHA256 d8a19a56e8c6e2f2185d50004204b36827603bce0a6869582015f6aba1d8230d SHA512 9cb8993c9c7ad079d78ae4d2f7fd2f1d1e13eb74cb27a837b6434bcea66a8c8797eb201899220c0385e10265dcdad55ae017c646ed95bdad8c3e9405dcf0eda9 WHIRLPOOL 8c4ba226b31ae1aaedeb309902a30a3cef792d986c9ca59c4e7e208343447cc3c8fcdd0f8b49fae06ebfa5252ff404cd62fc3af8ed6acd63a25cb28915fc689d
 EBUILD bittorrent-4.4.0-r2.ebuild 2338 SHA256 db219db73982d6c4eedfaddbdce737f2c3abc65117cfac78db183fb646a624f1 SHA512 55621a9115b7f8c9436161a1ad3a3e066ce16a9adc015c819932f601cd27f3fa7ca1472af0791b1f4f8772452f6364940d257ac73f1c35b8493de938806983b6 WHIRLPOOL 71ebf8168a7eb57e7b7a3933d768ccc2abb37189d8c89e188e2114222e26b76ad7fcc938c1a3349615b220e431c0051399dfdb20b8b26d31f062e8de3f43f893
-MISC ChangeLog 22238 SHA256 ff921c517563be091195e90d0c55b01b7b8103a5a3e5733c8a5e1a568e75217b SHA512 515e26fa2d9ee7217126f69ff3523a94b0c0a0ba8a1a02b6f9bc19a767cca2c96b0721d9a83a50391b6b7e291189402ce69ff48dd555d7963af771e21617f222 WHIRLPOOL 9837cbffa1363bd6448175ee04a79cda04498c796da0454697425939922bff649906c2e4390568fa742196b50028a6560b9d925f86ead9c7b33bf0227c10733d
+EBUILD bittorrent-4.4.0-r3.ebuild 2445 SHA256 8e80321cce3642871fe3a8d118613c83bd1d23c23109899bea47f8517ba36a83 SHA512 78355851372519316a0c2afbd09512c101fa97c05945a3d8d435dd3a822a6b4abdbc562c136c999c4c65fb0b899443bc3fcd2661c74af9058a55a9485c551482 WHIRLPOOL 9b4d38a08a9dcb67d7f0cd53c33aa8302b0c51b33319fed2b39d972525fc62a435167563ff4a86ad037dd987114e837a9d9f43c1281d6df9fba868ef2a934bd2
+MISC ChangeLog 22382 SHA256 7b0c0eb88c4d9200fa1258611ecb2241ff0ca1163ff009f62ee54d6047536325 SHA512 e1794e1177bcc054e834ee1629dc90b3c05319045eeb96d8f44402a4c52a6d41ac384872480903c484a176490c411dcd3bd5af5f9a23a189021ee7923adb07b8 WHIRLPOOL f52e6b8e98e6de698b80aad1a64ddf4a0537ba6bb21e57939e99026da31ff09216c667f77c5703f03b77b227f65226949c822956fb8b2c80146956d9f5d60dfa
 MISC metadata.xml 249 SHA256 969c2ae2981196ab093815aec0d3a086a981c907ff27841e22b99c9eeb856551 SHA512 fffa95cf2d66705aeb330fa994ac11983203e6e3911baa34f4cd0790c0ac6a73826241a504b880f696553f38160e262d1ab49612dc0266ad9714cc1eb5fcb7d6 WHIRLPOOL 45621ac2a81920972454cbe30388d4e71b0b4d36a858d9eef4d4917c45eafdfbd53a0ead3726eaf25a7812cc0522e98acdf3418eac01960008fd5e86ee40ab2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTG+OEAAoJEO04vUmVeoRjE/sH/Rs0DhjSrn6vlQByPMWKz+7g
-bmgSKHfr6IWroWuB30EF9PqUKIS0TRgKz+NO2L0tsa5T1puNL8FSevUKycfBflE1
-IRaZsU7rQFHH/WxGi+p8FYaEzMcrrpSq46tRhaUDr9xfW93uzJBB4bCgbq4PcZrl
-6adS7YY7qEp4qZNDSlVQ65bn6vNo3ae2UwduNrySRQYdNYxNAQE6gXk7H8AcFJoj
-ZXC0mrT+WwWpBAarE4/46sZZ7QJRcNh1JUIU1VvxPOIgW/T8dJDW8QZVSVCiwuK7
-v7t49EW6Xa0x9E5KeWeErkrqHgA1D6Hfl1A1FGMz85smJ1OArpnpexMEjn8fdZo=
-=y++U
+iQJ8BAEBCABmBQJUm+tAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZ4oQAJNW198tuRPegGr5Q9VcAfNP
+RGa17oMGwL3zVEOMQcK0P/tvEaUG/dIEjpA4cCJsgAVmkVWMziostPWZQ7VZrCWd
+niGpAIFlFmWPTTv/6vfR5154mW1fZNJd+SqrADOOnppFXAjpLfCPJMbtjQpvUBDp
+3YAQQ96zm8mfOT6ouisKYYl60MftVAj9ILRkAt2F+LVnO2IpMfI03WCQJQFilfBH
+sZuN8EGvtUEVmJaq6xaUReZldR0IBMVTgZAraWXEMm1IuHyNTtOAOyrm5fgrRzH5
+P6/95N6iJvIXkuJC+ug6vDL/ht2k0s6/dCER+WdZ0NsXwd6W2f9qmsOgIHg+hTNi
+BWSNdl7Bz1AU5UuS9C6Rual+f/rTWr++sG0/GCZIE/olpTX3llTtuiGTZvNnLgzJ
+UGl97nfrhSAoTWMKk7GOn/gVZCfxOYWSYefYg1KRxirh590gttaydbokx406L721
+bpDqhYk8CHo3bJTeseu69BWMF/1nSB98rjiQFQ1ebdzDq2n8efRA7Oc1Aeb16mGN
+s3zjSirFIgBwnDvWRjHaHF5MwCJuY1/vffhq8C8J4Zd6FavqKvubP2w1cjXuYeg2
+Sn7kREIQBvPItrBdoX3IgcYkH0ElRXhQiJIWM6kY1eaotvzCuQPpmO6GOw2X+dhG
+kUlwhAc+vbAl68p5PS5P
+=oSpd
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild
new file mode 100644 (file)
index 0000000..f8db613
--- /dev/null
+++ b/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild,v 1.1 2014/12/25 10:47:23 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads'
+
+# Maintainer note:
+#  keep this package at 4.4.0.
+#    5.x - requires wxpython-2.6 which we don't carry
+#    6.x - binary-only non-free crap
+# Fedora has also frozen bittorrent at 4.4.0 and is a good source of patches
+# http://pkgs.fedoraproject.org/gitweb/?p=bittorrent.git
+
+inherit distutils-r1 eutils fdo-mime
+
+MY_P="${P/bittorrent/BitTorrent}"
+
+DESCRIPTION="Tool for distributing files via a distributed network of nodes"
+HOMEPAGE="http://www.bittorrent.com/"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="aqua gtk"
+
+RDEPEND=">=dev-python/pycrypto-2.0[${PYTHON_USEDEP}]
+       gtk? (  >=x11-libs/gtk+-2.6:2
+                       >=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+#      dev-python/dnspython"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( credits.txt credits-l10n.txt README.txt TRACKERLESS.txt )
+
+python_prepare_all() {
+       epatch "${FILESDIR}"/${P}-no-version-check.patch
+       epatch "${FILESDIR}"/${P}-pkidir.patch
+       epatch "${FILESDIR}"/${P}-fastresume.patch
+       epatch "${FILESDIR}"/${P}-pygtk-thread-warnings.patch
+       epatch "${FILESDIR}"/${P}-python26-syntax.patch
+       epatch "${FILESDIR}"/${P}-bencode-float.patch
+       epatch "${FILESDIR}"/${P}-keyerror.patch
+       epatch "${FILESDIR}"/${P}-hashlib.patch
+
+       # fix doc path #109743
+       sed -i -e "/dp.*appdir/ s:appdir:'${PF}':" BitTorrent/platform.py || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_install() {
+       distutils-r1_python_install
+
+       if ! use gtk && ! use aqua; then
+               rm -f "${ED}"usr/bn/{bit,make}torrent || die
+               rm -f "${D}$(python_get_scriptdir)"/{bit,make}torrent || die
+       fi
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+
+       if use gtk; then
+               doicon images/bittorrent.ico
+               domenu "${FILESDIR}"/${PN}.desktop
+       fi
+
+       insinto /etc/pki/bittorrent/
+       doins public.key
+
+       newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
+       newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
+}
+
+pkg_postinst() {
+       use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+       use gtk && fdo-mime_desktop_database_update
+}