version bump, close bug #459230. Drop --as-needed filtering for comment 16 of bug #182324.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

5 files changed, 91 insertions, 11 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 093e0319c5c7..d5286948fe87 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/deluge
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.181 2012/12/21 20:27:51 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.182 2013/04/01 05:11:47 heroxbd Exp $
+
+*deluge-1.3.6 (01 Apr 2013)
+
+  01 Apr 2013; Benda Xu <heroxbd@gentoo.org> +deluge-1.3.6.ebuild,
+  deluge-1.3.5-r2.ebuild, deluge-9999.ebuild:
+  version bump, close bug #459230. Drop --as-needed filtering for comment 16 of
+  bug #182324.
 
   21 Dec 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/deluge-1.3.5-disable_libtorrent_internal_copy.patch,
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 3c84d9770a15..e63744504294 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -4,9 +4,11 @@ AUX deluged.conf 184 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e
 AUX deluged.init 2053 SHA256 04cacfadc79e738d8cccc4de6ffe735697c01e17c0e96d9604b7018e68c8a9a3 SHA512 6af52ea49039d778c7deb15673b575bebd150da2f37e550da383d5b975d8fd00e19abe79ef6b54b3e031e492e5f8ff08d9aa2214b7c8297e68f97fd40a53dc2f WHIRLPOOL 04d4cd2ce65cb4373d0f84233703008eb7749ae74286a4b1ce6bb81e1891e2bea73edaf948845ff9c6343500e8102fb566d5d76fb478fa4f13b5a4f96a2ee0ea
 DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
 DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88
+DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1
 EBUILD deluge-1.3.3.ebuild 1807 SHA256 0f716d0c09b1170a1e9387488d8e23b3758167a500feb3137e0d56bddb5cd101 SHA512 1f47c616b69391ec20bbb2472884a661c7bb6eaed1f597577cad2371ea159318685736f3ed68355d95b33db8196a2569e48ab5218abd906827e1d6537a9e0ca7 WHIRLPOOL 41f4df321e444007646614c77215ea41303c90271742cf332cabbed8bfc017234c29c99e84b9f36f0cb90fddbeee9f6f9465cdb04fe5c67f64ed259e69e1c2e1
-EBUILD deluge-1.3.5-r2.ebuild 2047 SHA256 bf04ee9f7849abd21775c1401d4ce2a58aed2201b5efb20112a5d5be6f07828a SHA512 cb4f2ab2f2ede7048f90ebb61270c7eac8aec050c64775d803b79a4e894378edf63736a75255c764620753396c2a7a4136bdcab4e21c514e793142b442eca103 WHIRLPOOL f812cd5dcfbe9f57914ffc65559d7b1cba13ca0f97a77761469ce51d096ed9f9f62560f375264d91f72b50e1dcfdd1d97f1f9abe9ab59316796f99800c10d61b
+EBUILD deluge-1.3.5-r2.ebuild 2045 SHA256 c1565d3197094e5d7a3c931c8e96e3eee89ad6ed13b5c8a52b5fa4f336513a3c SHA512 b19e0a0133b565592cf2e180c27cf275ac511ec1d4c19ac225b46024498bf36fe13825e48980e6c00501de84586dc7ddaaf504ba6cacb10666b5e74f38ce5e9f WHIRLPOOL 3668f4d171266a92cedc977345ec3a416a1a5304176b5d96e9c60d82ecfe72afc4b26acb7a205eaebba9c2d92bce2790bd31d2cf44f2dc2f2ce25315d2915d11
 EBUILD deluge-1.3.5.ebuild 1890 SHA256 593ccd278bdfff2dbe6d2de2b284ad69835773209ec5b6730b6b8bb35441109e SHA512 c9706e7bf96b037a22496e04017a690dde649b8f7d64d09eb89a5d940d62d195004f974ab4b08ba59c3d3e62573ae5864f8e2b7fd0617c8f1091f61366f268da WHIRLPOOL 110f37556f6c716d8c6ad138c518a91fb71368654865d07428ef02cb261b1a199e77619aae2300fec81b8076f3874431356194b10851408d3313ab3528f226a2
-EBUILD deluge-9999.ebuild 1964 SHA256 13b7a00c919c25a7ea4820f7cf3c77da6411d8ed666cdae06b27679d26ddff8a SHA512 5dc1f965fe25bf30e2232a29b1979e1043c4ac79dbac797544a05c5f3291b1dc748809ef5fc9d0aa857ac72da045163e2ee9a4d670d1dee4bc0b0184d6903212 WHIRLPOOL bf4c6c1f755d49a90a7274a76a4cf0941daddf94f67ceaafc4d0a41a5cbce0e3070a1047b7ddcdc4688e7ab2204a281a252b72e825779a3397c0ac6df1bcaacb
-MISC ChangeLog 25471 SHA256 e7821429f9ee92b55aef6ff7918b6e489b6e45649cb2d9aebbc10436d7c5f958 SHA512 ff0ac2354bf4cc3455be91647c55833da9d03de4ac1ace0207ba8def164c518797eaaebf47c4d974c196773d9c97224493d8e69c8fc6bba219908c0c776851b9 WHIRLPOOL 44f857b9184f97a5095fd555adf6cb128e6ee0afce246493018d1ddf16b59ce9bc3be29be96d7c98f05d480124bfccb3b9ae4c6a1b70bae416142d2d65344a85
+EBUILD deluge-1.3.6.ebuild 1938 SHA256 3db17b092ae82dd0221de086bda5b17e3e1b2e0ef7775f5beff3b5510d339539 SHA512 16399c9f246158c01eac34ea3fb1552d2055afbb307369c4e20f5d8a33bcb3303bf152894b284a72275d10f4e513b8bf9be19ad32245b6480359e8d312423dee WHIRLPOOL db2466ffdaa141bc5309a0153d5394c3e5aaf1c7789975cca344ea348a7c539b0c82a01c899cb46b01fc6a3b45493dc2282a13d11c5c6eed20e61163942ef99b
+EBUILD deluge-9999.ebuild 1918 SHA256 a720a3b5179594e9a8a9313eb03b8d5998c09abb903bc8d6cc2e764e5bb26689 SHA512 7fcbbbde4a2e5f83ac161b7a0a8b799470b3d34c889da1f6a18c777e0731dcbd02783ef9d5915433c1e2fb8887cbe96827873a838ff2ec546997ebfd51e33cff WHIRLPOOL 6eeeb858ef97f547eb8a19e2216a4f1193347584ff802caa7fcd30cdfa05a78ef6690a6241222e22e6c6dcda9cffdd0148e1ce02dbe64fe8d993a4f1861ea8fd
+MISC ChangeLog 25708 SHA256 5e41cfb6ee96836eb79260766488b391754c03e7d71bf6682792f28c13f67baa SHA512 d778f30cb556766e2e802050248f188b45e354dbd9a49fba2f326264ae5b1a6279e5e614fa6191a25129e44f04e583322a6b98d0d9dd091b99f8961fb96cba1d WHIRLPOOL 3c3cef937a245070dae3cd7966e31f626e1a140a94f5dadbb8b6abe6b4ddae626af0eedc9704a0c622645ff8ae6e73206a547e2595a17600259f4240a1d2b4d1
 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582
diff --git a/net-p2p/deluge/deluge-1.3.5-r2.ebuild b/net-p2p/deluge/deluge-1.3.5-r2.ebuild
index 8cfbde523865..9a4ddc25a352 100644
--- a/net-p2p/deluge/deluge-1.3.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.3 2012/12/30 17:05:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.4 2013/04/01 05:11:47 heroxbd Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
diff --git a/net-p2p/deluge/deluge-1.3.6.ebuild b/net-p2p/deluge/deluge-1.3.6.ebuild
new file mode 100644
index 000000000000..d39dd5cecf2b
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.6.ebuild,v 1.1 2013/04/01 05:11:47 heroxbd Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit distutils eutils python
+
+DESCRIPTION="BitTorrent client with a client/server model."
+HOMEPAGE="http://deluge-torrent.org/"
+SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="geoip gtk libnotify setproctitle webinterface"
+
+DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+	dev-python/setuptools
+	dev-util/intltool"
+RDEPEND="${DEPEND}
+	dev-python/chardet
+	dev-python/pyopenssl
+	dev-python/pyxdg
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
+	>=dev-python/twisted-8.1
+	>=dev-python/twisted-web-8.1
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		dev-python/pygame
+		dev-python/pygobject:2
+		>=dev-python/pygtk-2.12
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python )
+	)
+	setproctitle? ( dev-python/setproctitle )
+	webinterface? ( dev-python/mako )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+
+}
+
+src_install() {
+	distutils_src_install
+	newinitd "${FILESDIR}"/deluged.init deluged
+	newconfd "${FILESDIR}"/deluged.conf deluged
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	elog
+	elog "If after upgrading it doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 19ff341fed59..797c916d1117 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.32 2012/12/21 20:27:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.33 2013/04/01 05:11:47 heroxbd Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit distutils flag-o-matic git-2
+inherit distutils git-2
 
 EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 	http://git.deluge-torrent.org/${PN}/"
@@ -40,7 +40,6 @@ RDEPEND="${DEPEND}
 	webinterface? ( dev-python/mako )"
 
 pkg_setup() {
-	append-ldflags $(no-as-needed)
 	python_set_active_version 2
 	python_pkg_setup
 }