Version bump wrt #290578 and fix 9999

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 86 insertions, 17 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index b8bd1fd8d170..6e89f9b0eeb6 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.133 2009/10/04 15:11:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.134 2009/11/01 12:17:21 armin76 Exp $
+
+*deluge-1.2.0_rc2 (01 Nov 2009)
+
+  01 Nov 2009; Raúl Porcel <armin76@gentoo.org> +deluge-1.2.0_rc2.ebuild,
+  deluge-9999.ebuild, metadata.xml:
+  Version bump wrt #290578 and fix 9999
 
   04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> deluge-1.1.9.ebuild,
   deluge-9999.ebuild:
diff --git a/net-p2p/deluge/deluge-1.2.0_rc2.ebuild b/net-p2p/deluge/deluge-1.2.0_rc2.ebuild
new file mode 100644
index 000000000000..98230f8854cb
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.2.0_rc2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.2.0_rc2.ebuild,v 1.1 2009/11/01 12:17:21 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils distutils flag-o-matic python
+
+DESCRIPTION="BitTorrent client with a client/server model."
+HOMEPAGE="http://deluge-torrent.org/"
+SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk libnotify webinterface"
+
+DEPEND=">=virtual/python-2.5
+	>=net-libs/rb_libtorrent-0.14.5[python]
+	dev-python/setuptools"
+RDEPEND="${DEPEND}
+	dev-python/chardet
+	dev-python/pyopenssl
+	dev-python/pyxdg
+	|| ( >=virtual/python-2.6 dev-python/simplejson )
+	>=dev-python/twisted-8.1
+	>=dev-python/twisted-web-8.1
+	gtk? (
+		dev-python/pygame
+		dev-python/pygobject
+		>=dev-python/pygtk-2.12
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python )
+	)
+	webinterface? ( dev-python/mako )"
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
+src_install() {
+	distutils_src_install
+	newinitd "${FILESDIR}"/deluged.init deluged
+	newconfd "${FILESDIR}"/deluged.conf deluged
+}
+
+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 66462f6f764e..5b0adcb465ca 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.22 2009/10/04 15:11:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.23 2009/11/01 12:17:21 armin76 Exp $
+
+EAPI="2"
 
 inherit eutils distutils subversion flag-o-matic
 
@@ -14,26 +16,26 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk libnotify"
+IUSE="gtk libnotify webinterface"
 
-DEPEND=">=dev-lang/python-2.5
-	>=dev-libs/boost-1.34
+DEPEND=">=virtual/python-2.5
+	>=net-libs/rb_libtorrent-0.14.5[python]
 	dev-python/setuptools"
 RDEPEND="${DEPEND}
 	dev-python/chardet
-	dev-python/pyxdg
-	dev-python/twisted
-	dev-python/twisted-web
-	dev-python/simplejson
 	dev-python/pyopenssl
+	dev-python/pyxdg
+	|| ( >=virtual/python-2.6 dev-python/simplejson )
+	>=dev-python/twisted-8.1
+	>=dev-python/twisted-web-8.1
 	gtk? (
+		dev-python/pygame
 		dev-python/pygobject
-		>=dev-python/pygtk-2
-		dev-python/pyxdg
-		dev-python/dbus-python
+		>=dev-python/pygtk-2.12
 		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python )
 	)
-	libnotify? ( dev-python/notify-python )"
+	webinterface? ( dev-python/mako )"
 
 pkg_setup() {
 	append-ldflags $(no-as-needed)
@@ -51,10 +53,6 @@ pkg_postinst() {
 	elog "'~/.config/deluge' directory and try again, but make a backup"
 	elog "first!"
 	elog
-	einfo "Please note that Deluge is still in it's early stages"
-	einfo "of development. Use it carefully and feel free to submit bugs"
-	einfo "in upstream page."
-	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"
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 0633df79cbed..5be1a33fc1d4 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -5,4 +5,9 @@
 <maintainer>
 <email>net-p2p@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='webinterface'>Install dependencies needed for the web
+		interface
+	</flag>
+</use>
 </pkgmetadata>