diff --git a/eclass/transmission-2.76.eclass b/eclass/transmission-2.82.eclass similarity index 86% rename from eclass/transmission-2.76.eclass rename to eclass/transmission-2.82.eclass index 7d38533ba..f9808b044 100644 --- a/eclass/transmission-2.76.eclass +++ b/eclass/transmission-2.82.eclass @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -# @ECLASS: transmission-2.71.eclass +# @ECLASS: transmission-2.xx.eclass # @MAINTAINER: # slawomir.nizio@sabayon.org # @AUTHOR: @@ -13,6 +13,8 @@ # Its name contains a version that corresponds to net-p2p/transmission one, # because the eclass will change often when needed to follow changes # in Gentoo ebuild. +# Always call phase functions using their public names, such like: +# transmission-2.82_src_configure, and never _transmission_src_configure. # @ECLASS-VARIABLE: TRANSMISSION_PATCHES # @DEFAULT_UNSET @@ -44,6 +46,22 @@ _transmission_is() { [[ ${what} = "${E_TRANSM_TAIL}" ]] } +# @FUNCTION: _transmission_eclass_setup_functions +# @INTERNAL +# @DESCRIPTION: +# Function to setup functions. The eval uses strictly controlled variables, +# so it's OK. +_transmission_eclass_setup_functions() { + local v=2.82 + local func + for func in pkg_setup src_prepare src_configure src_compile \ + pkg_preinst pkg_postinst pkg_postrm; do + eval "transmission-${v}_${func}() { _transmission_${func}; }" + done +} + +_transmission_eclass_setup_functions + MY_ECLASSES="" _transmission_is gtk && MY_ECLASSES+="fdo-mime gnome2-utils" _transmission_is qt4 && MY_ECLASSES+="fdo-mime qt4-r2" @@ -111,22 +129,26 @@ fi S="${WORKDIR}/${MY_P}" _transmission_is "" && S="${WORKDIR}" -transmission-2.76_pkg_setup() { +_transmission_pkg_setup() { if _transmission_is base; then enewgroup transmission enewuser transmission -1 -1 -1 transmission fi } -transmission-2.76_src_prepare() { +_transmission_src_prepare() { _transmission_is "" && return sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die if ! use_if_iuse ayatana; then + # Trick to avoid automagic dependency sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die fi + # Pass our configuration dir to systemd unit file + sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/transmission-daemon.service || die + # http://trac.transmissionbt.com/ticket/4324 sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${MY_PN}/Makefile.am || die @@ -149,7 +171,7 @@ transmission-2.76_src_prepare() { fi } -transmission-2.76_src_configure() { +_transmission_src_configure() { _transmission_is "" && return local econfargs=( @@ -175,6 +197,7 @@ transmission-2.76_src_configure() { --disable-cli --enable-daemon --without-gtk + $(use_with systemd systemd-daemon) ) elif _transmission_is gtk; then econfargs+=( @@ -200,7 +223,7 @@ transmission-2.76_src_configure() { fi } -transmission-2.76_src_compile() { +_transmission_src_compile() { _transmission_is "" && return emake @@ -216,11 +239,11 @@ transmission-2.76_src_compile() { # Note: not providing src_install. Too many differences and too much code # which would only clutter this pretty eclass. -transmission-2.76_pkg_preinst() { +_transmission_pkg_preinst() { _transmission_is gtk && gnome2_icon_savelist } -transmission-2.76_pkg_postinst() { +_transmission_pkg_postinst() { if _transmission_is gtk || _transmission_is qt4; then fdo-mime_desktop_database_update fi @@ -252,7 +275,7 @@ transmission-2.76_pkg_postinst() { fi } -transmission-2.76_pkg_postrm() { +_transmission_pkg_postrm() { if _transmission_is gtk || _transmission_is qt4; then fdo-mime_desktop_database_update fi diff --git a/net-p2p/transmission-base/Manifest b/net-p2p/transmission-base/Manifest index aa5118300..c656f70fb 100644 --- a/net-p2p/transmission-base/Manifest +++ b/net-p2p/transmission-base/Manifest @@ -1,2 +1,2 @@ -DIST transmission-2.80.tar.xz 3167136 SHA256 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3 SHA512 1d442fe7f744161644d3eb0b6f0d79cace058e09213ac00fc258dbf97d5161d75825310faabd139ccbcce7fa435b09c2755ac807905cc698cd4272a92aa90182 WHIRLPOOL 6ec7f9beb74a466f42b8785fac14d81d614a5d9b112c8492eb6855977be8daebcc32fb416b941e21d56d3b829fb0b2933c45c328701141454c7d0a9298d02971 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020 +DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca diff --git a/net-p2p/transmission-base/transmission-base-2.80.ebuild b/net-p2p/transmission-base/transmission-base-2.82-r3.ebuild similarity index 71% rename from net-p2p/transmission-base/transmission-base-2.80.ebuild rename to net-p2p/transmission-base/transmission-base-2.82-r3.ebuild index c3b01d56c..1587eb157 100644 --- a/net-p2p/transmission-base/transmission-base-2.80.ebuild +++ b/net-p2p/transmission-base/transmission-base-2.82-r3.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit transmission-2.80 +inherit transmission-2.82 DESCRIPTION="A Fast, Easy and Free BitTorrent client - base files" KEYWORDS="~amd64 ~x86" @@ -17,7 +17,7 @@ src_install() { default rm "${ED}"/usr/share/${MY_PN}/web/LICENSE || die - keepdir /var/{${MY_PN}/{config,downloads},log/${MY_PN}} - fowners -R ${MY_PN}:${MY_PN} /var/{${MY_PN}/{,config,downloads},log/${MY_PN}} + keepdir /var/{lib/${MY_PN}/{config,downloads},log/${MY_PN}} + fowners -R ${MY_PN}:${MY_PN} /var/{lib/${MY_PN}/{,config,downloads},log/${MY_PN}} dolib.a "${S}/libtransmission/libtransmission.a" } diff --git a/net-p2p/transmission-cli/Manifest b/net-p2p/transmission-cli/Manifest index aa5118300..c656f70fb 100644 --- a/net-p2p/transmission-cli/Manifest +++ b/net-p2p/transmission-cli/Manifest @@ -1,2 +1,2 @@ -DIST transmission-2.80.tar.xz 3167136 SHA256 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3 SHA512 1d442fe7f744161644d3eb0b6f0d79cace058e09213ac00fc258dbf97d5161d75825310faabd139ccbcce7fa435b09c2755ac807905cc698cd4272a92aa90182 WHIRLPOOL 6ec7f9beb74a466f42b8785fac14d81d614a5d9b112c8492eb6855977be8daebcc32fb416b941e21d56d3b829fb0b2933c45c328701141454c7d0a9298d02971 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020 +DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca diff --git a/net-p2p/transmission-cli/transmission-cli-2.80.ebuild b/net-p2p/transmission-cli/transmission-cli-2.82-r3.ebuild similarity index 90% rename from net-p2p/transmission-cli/transmission-cli-2.80.ebuild rename to net-p2p/transmission-cli/transmission-cli-2.82-r3.ebuild index a532a5200..8f50635fd 100644 --- a/net-p2p/transmission-cli/transmission-cli-2.80.ebuild +++ b/net-p2p/transmission-cli/transmission-cli-2.82-r3.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit eutils transmission-2.80 +inherit eutils transmission-2.82 DESCRIPTION="A Fast, Easy and Free BitTorrent client - command line (CLI) version" KEYWORDS="~amd64 ~x86" diff --git a/net-p2p/transmission-daemon/Manifest b/net-p2p/transmission-daemon/Manifest index aa5118300..c656f70fb 100644 --- a/net-p2p/transmission-daemon/Manifest +++ b/net-p2p/transmission-daemon/Manifest @@ -1,2 +1,2 @@ -DIST transmission-2.80.tar.xz 3167136 SHA256 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3 SHA512 1d442fe7f744161644d3eb0b6f0d79cace058e09213ac00fc258dbf97d5161d75825310faabd139ccbcce7fa435b09c2755ac807905cc698cd4272a92aa90182 WHIRLPOOL 6ec7f9beb74a466f42b8785fac14d81d614a5d9b112c8492eb6855977be8daebcc32fb416b941e21d56d3b829fb0b2933c45c328701141454c7d0a9298d02971 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020 +DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca diff --git a/net-p2p/transmission-daemon/files/transmission-daemon.confd.4 b/net-p2p/transmission-daemon/files/transmission-daemon.confd.4 new file mode 100644 index 000000000..8f3b1317a --- /dev/null +++ b/net-p2p/transmission-daemon/files/transmission-daemon.confd.4 @@ -0,0 +1,14 @@ +# This is the transmission-daemon configuration file. For other options and +# better explanation, take a look at transmission-daemon manual page Note: it's +# better to configure some settings (like username/password) in +# /var/lib/transmission/config/settings.json to avoid other users see it with `ps` + +TRANSMISSION_OPTIONS="--encryption-preferred" + +# Run daemon as another user (username or username:groupname) +# If you change this setting, chown -R /var/lib/transmission/config +#runas_user=transmission + +# Location of logfile (should be writeable for runas_user user) +# Set logfile=syslog to use syslog for logging +#logfile=/var/log/transmission/transmission.log diff --git a/net-p2p/transmission-daemon/files/transmission-daemon.initd.9 b/net-p2p/transmission-daemon/files/transmission-daemon.initd.9 new file mode 100644 index 000000000..3c4914c58 --- /dev/null +++ b/net-p2p/transmission-daemon/files/transmission-daemon.initd.9 @@ -0,0 +1,73 @@ +#!/sbin/runscript +# Copyright 1999-2013 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.9,v 1.1 2013/09/07 12:10:01 ssuominen Exp $ + +extra_started_commands="reload" +description="Transmission is a fast, easy and free bittorrent client" +description_start="Start transmission-daemon server and web interface" +description_stop="Stop transmission-daemon server and web interface" +description_reload="Reload transmission-daemon settings" + +rundir=${rundir:-/var/run/transmission} +pidfile=${pidfile:-${rundir}/transmission.pid} +config_dir=${config_dir:-/var/lib/transmission/config} +download_dir=${download_dir:-/var/lib/transmission/downloads} +logfile=${logfile:-/var/log/transmission/transmission.log} +runas_user=${runas_user:-transmission:transmission} + +SSD_OPTIONS="" + +depend() { + need net +} + +check_config() { + if [ ! -d "${rundir}" ]; then + mkdir "${rundir}" + if [ -n "${runas_user}" ]; then + chown -R ${runas_user} "${rundir}" + fi + fi + + # In case no config directory option passed use default + if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then + TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}" + # put download dir location on first run (and take it from config later) + if [ ! -f ${config_dir}/settings.json ]; then + TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}" + fi + fi + + if [ -n "${runas_user}" ]; then + if [ -f /etc/init.d/sysfs ]; then + SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}" + else + SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}" + fi + fi +} + +start() { + check_config + + ebegin "Starting transmission daemon" + start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \ + --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \ + $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \ + ${TRANSMISSION_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping transmission daemon" + start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} + eend $? +} + +reload() { + ebegin "Reloading transmission configuration" + start-stop-daemon --signal HUP --pidfile ${pidfile} + eend $? +} + diff --git a/net-p2p/transmission-daemon/transmission-daemon-2.80.ebuild b/net-p2p/transmission-daemon/transmission-daemon-2.82-r3.ebuild similarity index 68% rename from net-p2p/transmission-daemon/transmission-daemon-2.80.ebuild rename to net-p2p/transmission-daemon/transmission-daemon-2.82-r3.ebuild index 2e66bb86a..f4c5c9084 100644 --- a/net-p2p/transmission-daemon/transmission-daemon-2.80.ebuild +++ b/net-p2p/transmission-daemon/transmission-daemon-2.82-r3.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit transmission-2.80 +inherit systemd transmission-2.82 DESCRIPTION="A Fast, Easy and Free BitTorrent client - daemon" KEYWORDS="~amd64 ~x86" @@ -19,6 +19,7 @@ src_install() { doman daemon/transmission-daemon.1 doman daemon/transmission-remote.1 - newinitd "${FILESDIR}"/${MY_PN}-daemon.initd.8 ${MY_PN}-daemon - newconfd "${FILESDIR}"/${MY_PN}-daemon.confd.3 ${MY_PN}-daemon + newinitd "${FILESDIR}"/${MY_PN}-daemon.initd.9 ${MY_PN}-daemon + newconfd "${FILESDIR}"/${MY_PN}-daemon.confd.4 ${MY_PN}-daemon + systemd_dounit daemon/${MY_PN}-daemon.service } diff --git a/net-p2p/transmission-gtk/Manifest b/net-p2p/transmission-gtk/Manifest index aa5118300..c656f70fb 100644 --- a/net-p2p/transmission-gtk/Manifest +++ b/net-p2p/transmission-gtk/Manifest @@ -1,2 +1,2 @@ -DIST transmission-2.80.tar.xz 3167136 SHA256 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3 SHA512 1d442fe7f744161644d3eb0b6f0d79cace058e09213ac00fc258dbf97d5161d75825310faabd139ccbcce7fa435b09c2755ac807905cc698cd4272a92aa90182 WHIRLPOOL 6ec7f9beb74a466f42b8785fac14d81d614a5d9b112c8492eb6855977be8daebcc32fb416b941e21d56d3b829fb0b2933c45c328701141454c7d0a9298d02971 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020 +DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca diff --git a/net-p2p/transmission-gtk/transmission-gtk-2.80.ebuild b/net-p2p/transmission-gtk/transmission-gtk-2.82-r3.ebuild similarity index 95% rename from net-p2p/transmission-gtk/transmission-gtk-2.80.ebuild rename to net-p2p/transmission-gtk/transmission-gtk-2.82-r3.ebuild index 2d93b4de4..a6211d7fc 100644 --- a/net-p2p/transmission-gtk/transmission-gtk-2.80.ebuild +++ b/net-p2p/transmission-gtk/transmission-gtk-2.82-r3.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit eutils transmission-2.80 +inherit eutils transmission-2.82 DESCRIPTION="A Fast, Easy and Free BitTorrent client - Gtk+ UI" KEYWORDS="~amd64 ~x86" @@ -11,7 +11,7 @@ IUSE="ayatana" RDEPEND=" >=dev-libs/dbus-glib-0.100:= - >=dev-libs/glib-2.28:2= + >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) !net-p2p/transmission-gtk+ diff --git a/net-p2p/transmission-qt4/Manifest b/net-p2p/transmission-qt4/Manifest index aa5118300..c656f70fb 100644 --- a/net-p2p/transmission-qt4/Manifest +++ b/net-p2p/transmission-qt4/Manifest @@ -1,2 +1,2 @@ -DIST transmission-2.80.tar.xz 3167136 SHA256 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3 SHA512 1d442fe7f744161644d3eb0b6f0d79cace058e09213ac00fc258dbf97d5161d75825310faabd139ccbcce7fa435b09c2755ac807905cc698cd4272a92aa90182 WHIRLPOOL 6ec7f9beb74a466f42b8785fac14d81d614a5d9b112c8492eb6855977be8daebcc32fb416b941e21d56d3b829fb0b2933c45c328701141454c7d0a9298d02971 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020 +DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca diff --git a/net-p2p/transmission-qt4/files/transmission-2.82-qt4.patch b/net-p2p/transmission-qt4/files/transmission-2.82-qt4.patch new file mode 100644 index 000000000..5754b3687 --- /dev/null +++ b/net-p2p/transmission-qt4/files/transmission-2.82-qt4.patch @@ -0,0 +1,70 @@ +Restore Qt 4.x support because Qt 5.x is not in Portage yet and 2.82 is a good stabilization target, see: + +http://bugs.gentoo.org/485038 + +--- qt/qtr.pro ++++ qt/qtr.pro +@@ -12,9 +12,13 @@ + man.files = transmission-qt.1 + + CONFIG += qt thread debug link_pkgconfig +-QT += network dbus widgets ++QT += network dbus + PKGCONFIG = fontconfig libcurl openssl libevent + ++greaterThan(QT_MAJOR_VERSION, 4) { ++ QT += widgets ++} ++ + TRANSMISSION_TOP = .. + + include(config.pri) +--- qt/favicon.cc ++++ qt/favicon.cc +@@ -14,8 +14,13 @@ + #include + #include + #include +-#include + ++#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) ++ #include ++#else ++ #include ++#endif ++ + #include "favicon.h" + + /*** +@@ -40,7 +45,13 @@ + QString + Favicons :: getCacheDir( ) + { +- const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); ++ const QString base = ++#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) ++ QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); ++#else ++ QStandardPaths::writableLocation( QStandardPaths::CacheLocation ); ++#endif ++ + return QDir( base ).absoluteFilePath( "favicons" ); + } + +--- qt/file-tree.cc ++++ qt/file-tree.cc +@@ -885,7 +885,12 @@ + for (int i=0; isetResizeMode(i, QHeaderView::Interactive); ++#else + header()->setSectionResizeMode(i, QHeaderView::Interactive); ++#endif + } + + connect (this, SIGNAL(clicked(const QModelIndex&)), + +------------------------------------------------------------------------ diff --git a/net-p2p/transmission-qt4/transmission-qt4-2.80.ebuild b/net-p2p/transmission-qt4/transmission-qt4-2.82-r3.ebuild similarity index 73% rename from net-p2p/transmission-qt4/transmission-qt4-2.80.ebuild rename to net-p2p/transmission-qt4/transmission-qt4-2.82-r3.ebuild index 9b40dab89..506ab9b2b 100644 --- a/net-p2p/transmission-qt4/transmission-qt4-2.80.ebuild +++ b/net-p2p/transmission-qt4/transmission-qt4-2.82-r3.ebuild @@ -4,17 +4,20 @@ EAPI=5 TRANSMISSION_PATCHES=( - # fix for broken translations path - "${FILESDIR}/${P}-translations-path-fix.patch" + # Fix for broken translations path + "${FILESDIR}"/${PN}-2.80-translations-path-fix.patch + # Restore support for Qt 4.x using upstream patch + "${FILESDIR}"/transmission-${PV}-qt4.patch ) -inherit eutils transmission-2.80 +inherit eutils transmission-2.82 DESCRIPTION="A Fast, Easy and Free BitTorrent client - Qt4 UI" KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="dev-qt/qtcore:4= - dev-qt/qtgui:4=[dbus(+)] + dev-qt/qtgui:4= + dev-qt/qtdbus:4= " DEPEND="${RDEPEND}" diff --git a/net-p2p/transmission/transmission-2.80.ebuild b/net-p2p/transmission/transmission-2.82-r3.ebuild similarity index 94% rename from net-p2p/transmission/transmission-2.80.ebuild rename to net-p2p/transmission/transmission-2.82-r3.ebuild index 11c5db0cf..59abfbbd8 100644 --- a/net-p2p/transmission/transmission-2.80.ebuild +++ b/net-p2p/transmission/transmission-2.82-r3.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit transmission-2.80 +inherit transmission-2.82 DESCRIPTION="A BitTorrent client (meta package)" #HOMEPAGE="http://www.transmissionbt.com/"