diff options
Diffstat (limited to 'net-p2p/transmission')
| -rw-r--r-- | net-p2p/transmission/ChangeLog | 12 | ||||
| -rw-r--r-- | net-p2p/transmission/files/transmission-daemon.initd.4 (renamed from net-p2p/transmission/files/transmission-daemon.initd.3) | 18 | ||||
| -rw-r--r-- | net-p2p/transmission/transmission-1.92.ebuild | 112 | ||||
| -rw-r--r-- | net-p2p/transmission/transmission-2.11.ebuild (renamed from net-p2p/transmission/transmission-2.10.ebuild) | 43 |
4 files changed, 51 insertions, 134 deletions
diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog index 68808ed57447..9e29c35dd755 100644 --- a/net-p2p/transmission/ChangeLog +++ b/net-p2p/transmission/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-p2p/transmission # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.129 2010/10/24 15:30:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.130 2010/10/25 13:29:41 pva Exp $ + +*transmission-2.11 (25 Oct 2010) + + 25 Oct 2010; Peter Volkov <pva@gentoo.org> -transmission-1.92.ebuild, + -transmission-2.10.ebuild, +transmission-2.11.ebuild, + -files/transmission-daemon.initd.3, +files/transmission-daemon.initd.4: + Version bump, #342027, thank Samuli Suominen for report. Fixed init script + for baselayout-1 again, #341451 wrt Sebastian LechteSebastian Lechte and + masc. Fix desktop entry for qt4 ebuild, recognize magnet links in kde, + #341507 thank Michel Lang for report. Drop old. 24 Oct 2010; Brent Baude <ranger@gentoo.org> transmission-2.04-r1.ebuild: stable ppc, bug 338059 diff --git a/net-p2p/transmission/files/transmission-daemon.initd.3 b/net-p2p/transmission/files/transmission-daemon.initd.4 index 2aaf7a741871..80a373f3cbd4 100644 --- a/net-p2p/transmission/files/transmission-daemon.initd.3 +++ b/net-p2p/transmission/files/transmission-daemon.initd.4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.3,v 1.1 2010/10/15 11:50:14 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.4,v 1.1 2010/10/25 13:29:41 pva Exp $ opts="start stop reload" description="Transmission is a fast, easy and free bittorrent client" @@ -45,31 +45,21 @@ check_config() { SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}" fi fi - - if [ -n "${logfile}" ]; then - if [ -f /etc/init.d/sysfs ]; then - SSD_OPTIONS="${SSD_OPTIONS} --stdout ${logfile} --stderr ${logfile}" - else - SSD_OPTIONS="${SSD_OPTIONS} >${logfile} 2>&1" - fi - fi } start() { check_config ebegin "Starting transmission daemon" - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile ${pidfile} ${SSD_OPTIONS} --exec \ - /usr/bin/transmission-daemon -- --foreground \ + start-stop-daemon --start --quiet --background --pidfile ${pidfile} ${SSD_OPTIONS} \ + --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} --logfile ${logfile} \ ${TRANSMISSION_OPTIONS} eend $? } stop() { ebegin "Stopping transmission daemon" - start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 \ - --pidfile ${pidfile} + start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} eend $? } diff --git a/net-p2p/transmission/transmission-1.92.ebuild b/net-p2p/transmission/transmission-1.92.ebuild deleted file mode 100644 index df7688df2c20..000000000000 --- a/net-p2p/transmission/transmission-1.92.ebuild +++ /dev/null @@ -1,112 +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/transmission/transmission-1.92.ebuild,v 1.5 2010/04/15 15:57:09 ranger Exp $ - -EAPI=2 -inherit autotools eutils fdo-mime gnome2-utils qt4-r2 - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" - -RDEPEND=">=dev-libs/libevent-1.4.11 - <dev-libs/libevent-2 - >=dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.15.5:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - gnome? ( gnome-base/gconf ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - sound? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4 )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - sed -i \ - -e 's:-g -O0::g' \ - -e 's:-g -O3::g' \ - -e 's:-ggdb3::g' \ - configure.ac || die - - sed -i \ - -e 's:$${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a:-levent:' \ - qt/qtr.pro || die - - eautoreconf -} - -src_configure() { - local myconf="--disable-libnotify --disable-libcanberra --disable-libgconf" - - if use gtk; then - myconf="$(use_enable libnotify) $(use_enable sound libcanberra) - $(use_enable gnome libgconf)" - fi - - # cli and daemon doesn't have external deps - econf \ - --disable-dependency-tracking \ - $(use_enable gtk) \ - --enable-cli \ - --enable-daemon \ - ${myconf} - - if use qt4; then - cd qt - eqmake4 qtr.pro - fi -} - -src_compile() { - emake || die - - if use qt4; then - cd qt - emake || die - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${D}"/usr/share/${PN}/web/LICENSE - - # these are likely outdated for 1.83 - newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon - newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || doicon qt/icons/transmission.png - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.10.ebuild b/net-p2p/transmission/transmission-2.11.ebuild index b15ac84ff8ea..20d8706fbc5d 100644 --- a/net-p2p/transmission/transmission-2.10.ebuild +++ b/net-p2p/transmission/transmission-2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.10.ebuild,v 1.1 2010/10/15 11:50:13 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.11.ebuild,v 1.1 2010/10/25 13:29:41 pva Exp $ EAPI=2 inherit eutils fdo-mime gnome2-utils qt4-r2 @@ -12,7 +12,7 @@ SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2" LICENSE="MIT GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="gnome gtk libnotify sound qt4" +IUSE="gnome gtk kde libnotify sound qt4" RDEPEND=" sys-libs/zlib @@ -42,6 +42,23 @@ pkg_setup() { src_prepare() { sed -i -e 's:-ggdb3::g' configure || die + # Magnet link support + if use kde; then + cat > transmission-magnet.protocol <<-EOF + [Protocol] + exec=transmission-qt '%u' + protocol=magnet + Icon=transmission + input=none + output=none + helper=true + listing= + reading=false + writing=false + makedir=false + deleting=false + EOF + fi } src_configure() { @@ -67,7 +84,7 @@ src_install() { dodoc AUTHORS NEWS qt/README.txt rm -f "${D}"/usr/share/${PN}/web/LICENSE - newinitd "${FILESDIR}"/${PN}-daemon.initd.3 ${PN}-daemon || die + newinitd "${FILESDIR}"/${PN}-daemon.initd.4 ${PN}-daemon || die newconfd "${FILESDIR}"/${PN}-daemon.confd.2 ${PN}-daemon || die keepdir /var/{transmission/{config,downloads},log/transmission} @@ -76,9 +93,14 @@ src_install() { if use qt4; then cd qt emake INSTALL_ROOT="${D}/usr" install || die - make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \ - "Network;FileTransfer;P2P;Qt" - use gtk || { doicon icons/transmission.png || die; } + insinto /usr/share/applications/ + doins transmission-qt.desktop || die + mv icons/transmission{,-qt}.png + doicon icons/transmission-qt.png || die + if use kde; then + insinto /usr/share/kde4/services/ + doins transmission-magnet.protocol || die + fi fi } @@ -91,12 +113,19 @@ pkg_postinst() { gnome2_icon_cache_update # Keep default permissions on default dirs - chmod -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} + chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} ewarn "If you use transmission-daemon, please, set 'rpc-username' and" ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" ewarn "start) in settings.json file located at /var/transmission/config or" ewarn "any other appropriate config directory." + + if use gtk; then + elog 'If you want magnet link support in gnome run this commands:' + elog 'gconftool-2 -t string -s /desktop/gnome/url-handlers/magnet/command "/usr/bin/transmission-gtk %s"' + elog 'gconftool-2 -s /desktop/gnome/url-handlers/magnet/needs_terminal false -t bool' + elog 'gconftool-2 -t bool -s /desktop/gnome/url-handlers/magnet/enabled true' + fi } pkg_postrm() { |