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

(Portage version: 2.1.11.52/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 86 insertions, 8 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/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
 }