From 5c94b7d7906e255e9be107e913156108cd4c6831 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 12 Apr 2010 21:25:27 +0200 Subject: Bumped deluge-1.2.2 to -r1 and added files --- net-p2p/deluge/Manifest | 2 +- net-p2p/deluge/deluge-1.2.2-r1.ebuild | 61 ++++++++++++++++++++++++++++++ net-p2p/deluge/deluge-1.2.2.ebuild | 61 ------------------------------ net-p2p/deluge/files/deluged.conf | 7 ++++ net-p2p/deluge/files/deluged.init | 71 +++++++++++++++++++++++++++++++++++ 5 files changed, 140 insertions(+), 62 deletions(-) create mode 100644 net-p2p/deluge/deluge-1.2.2-r1.ebuild delete mode 100644 net-p2p/deluge/deluge-1.2.2.ebuild create mode 100644 net-p2p/deluge/files/deluged.conf create mode 100644 net-p2p/deluge/files/deluged.init diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index 9c05ef6..722fe52 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -9,7 +9,7 @@ EBUILD deluge-1.1.9.ebuild 1671 RMD160 ec88aa4011e1e027bb113491b0a54b5b686d2aec EBUILD deluge-1.2.0.ebuild 1672 RMD160 d388e3201d74ca65f878edf2396806259c133e71 SHA1 8b43a7da959a02c20a02c50ae4ec659c2d9b87a7 SHA256 137f9c6aae857113b7db7efb0c157b9b4eab8be149a21499c6ba4e1217a18619 EBUILD deluge-1.2.0_rc5.ebuild 1679 RMD160 b5df9e9e6d84f9e994e4de7763982b6828d5048a SHA1 5b00b384d2a5b1f8d2289e78ec525cd5e3b36216 SHA256 95b4e3ff04cb2807a5180168ad4ae1cb63af624ffadca1d49ff625940797608e EBUILD deluge-1.2.1.ebuild 1675 RMD160 f5c8a8152550d6a114368d08e146b1d3029e1764 SHA1 f4e17f52a8a097669b3396a2975b40cdd563455c SHA256 9f4ae65c40a452d7b29ed960a31d8e38d36c393489d7fc1e9b7b852b5016fa53 -EBUILD deluge-1.2.2.ebuild 1675 RMD160 84fd057bd3f8086bce46d90cf2411dc00e08c4d3 SHA1 d6c24192f020691875071bde1c68cfd9bf71f0dc SHA256 f9204329ddd30389fa8ee119dfebbca88b607c3d88932e43e4a1ab7cca6714e8 +EBUILD deluge-1.2.2-r1.ebuild 1674 RMD160 f7866f722bd24ebff5f543bf865ec57914cbdbdd SHA1 f5023e48cd9c53c0b2a5257ebf55f2d815b5bac4 SHA256 3401133ccfd6a3b9eda63ea012ba169fe0508ea7f95eec997911638316e75ab3 EBUILD deluge-9999.ebuild 1603 RMD160 e4d125fca0e38b5655a3ebedd0ef93ed83a351c5 SHA1 2446f7df5c98d821dd6a02c8cc605856ea46007e SHA256 d0ad474095307c53e79a343714c6c38dcb251fc68f68123ac4fc90ddaa708f15 MISC ChangeLog 19947 RMD160 3df9e1f4ac295acd804335bad6f4b5202c2c9259 SHA1 3deb14b2d998d2fe0229bb405546ebc5fe7ef031 SHA256 09955d30f5f6f9f540e59944b4f51a9a6831db26ad95ecb9056015b919846b1e MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f diff --git a/net-p2p/deluge/deluge-1.2.2-r1.ebuild b/net-p2p/deluge/deluge-1.2.2-r1.ebuild new file mode 100644 index 0000000..2dd778f --- /dev/null +++ b/net-p2p/deluge/deluge-1.2.2-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.2.2.ebuild,v 1.1 2010/03/20 13:11:37 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 ~arm ~ppc ~x86" +IUSE="gtk libnotify webinterface" + +DEPEND=">=virtual/python-2.5 + || ( app-arch/xz-utils app-arch/lzma-utils ) + =net-libs/rb_libtorrent-0.14.9[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-1.2.2.ebuild b/net-p2p/deluge/deluge-1.2.2.ebuild deleted file mode 100644 index b80ed5b..0000000 --- a/net-p2p/deluge/deluge-1.2.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.2.2.ebuild,v 1.1 2010/03/20 13:11:37 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 ~arm ~ppc ~x86" -IUSE="gtk libnotify webinterface" - -DEPEND=">=virtual/python-2.5 - || ( app-arch/xz-utils app-arch/lzma-utils ) - >=net-libs/rb_libtorrent-0.14.9[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/files/deluged.conf b/net-p2p/deluge/files/deluged.conf new file mode 100644 index 0000000..1d4714c --- /dev/null +++ b/net-p2p/deluge/files/deluged.conf @@ -0,0 +1,7 @@ +# /etc/conf.d/deluged +# Change this to the user you want to run deluged as. +# You may specify a group too, after a colon +DELUGED_USER="" +DELUGEUI_START="false" +DELUGEUI_OPTS="-u web" + diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init new file mode 100644 index 0000000..f9b2a30 --- /dev/null +++ b/net-p2p/deluge/files/deluged.init @@ -0,0 +1,71 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.5 2009/02/17 15:32:17 armin76 Exp $ + +depend() { + need net +} + +checkconfig() { + if [[ "${DELUGED_USER}" == "" ]] ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "You have to specify a user to run deluged as, as we will not run it as root!" + eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)" + return 1 + fi + if ! `getent passwd | cut -d ':' -f 1 | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 1 ) -sq` ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "Your user has to exist!" + return 1 + fi + if ! `echo "${DELUGED_USER}" | grep ':' -sq` ; then + return 0 + else + if ! `cut -d ':' -f 1 /etc/group | grep $( echo "${DELUGED_USER}" | cut -d ':' -f 2 ) -sq` ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "Your group has to exist too!" + return 1 + fi + fi + return 0 +} + +start() { + checkconfig || return $? + if [[ "${DELUGED_HOME}" == "" ]] ; then + DELUGED_USER_HOME=`getent passwd | grep ^$( echo "${DELUGED_USER}" | cut -d ':' -f 1 ): | cut -d ':' -f 6` + else + DELUGED_USER_HOME="${DELUGED_HOME}" + fi + ebegin "Starting Deluged" + start-stop-daemon --start --user "${DELUGED_USER}" \ + --name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \ + --exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}" + eend $? + + + if [[ "${DELUGEUI_START}" == "true" ]] ; then + ebegin "Starting Deluge" + start-stop-daemon --start --background --pidfile \ + /var/run/deluge.pid --make-pidfile \ + --exec /usr/bin/deluge -c "${DELUGED_USER}" \ + -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS} + eend $? + fi +} + +stop() { + ebegin "Stopping Deluged" + start-stop-daemon --stop --user "${DELUGED_USER}" \ + --name deluged --pidfile /var/run/deluged.pid + eend $? + + + if [[ "${DELUGEUI_START}" == "true" ]] ; then + ebegin "Stopping Deluge" + start-stop-daemon --stop --user "${DELUGED_USER}" \ + --name deluge --pidfile /var/run/deluge.pid + eend $? + fi +} -- cgit v1.2.3-65-gdbad