Enable support for Qt5, https://bugs.funtoo.org/browse/FL-2204.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 64c84bc93e3ccc07fd3f79a84c277d7ac9d807ea..38665afaa9101e34acac72a97e6632ad43f7848a 100644 (file)
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/transmission
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.261 2014/09/05 05:39:30 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.262 2015/03/24 22:57:05 mgorny Exp $
+
+*transmission-2.84-r1 (24 Mar 2015)
+
+  24 Mar 2015; Michał Górny <mgorny@gentoo.org> +transmission-2.84-r1.ebuild:
+  Enable support for Qt5, https://bugs.funtoo.org/browse/FL-2204.
 
   05 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> transmission-2.84.ebuild:
   Reference /var/lib instead of /var in pkg_postinst() message wrt #521898

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5e6d4ae7d0d0e2076d4c33370ce4afaa8becc23f..592919ae658ada14e79de141821b582e0305965d 100644 (file)
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -5,17 +5,26 @@ AUX transmission-2.80-translations-path-fix.patch 718 SHA256 94951127429649d18af
 AUX transmission-daemon.confd.4 711 SHA256 249689688aad23d0d27ccdd08a0907fd85058d6a52ccd3467f756b07f5d059ee SHA512 dbc093fe00335bb207c28a4e810becc15e74b6f75e7579d561b160755d6b54bb23a45db39ee3480195a94a5e9bffdad692559d1b9662bba28119d18b713747a1 WHIRLPOOL c19f3a6d46ff5cf824e9f3d9df2ec4364c17d424a406b3922921e3385801b543f736ed7dd8e1b7f24cd81262e2ac162edd92d7b6b832909012ae4cd677d94c1d
 AUX transmission-daemon.initd.9 2256 SHA256 06d047b47befe6aaf1b1542fdd50e84ea38e0fef004b5095f6096f33fa1901a3 SHA512 37205d2375b9baa631bb5b4cdc4d95b3bd63780aae118bce89286b1ea2f00859e276316519b7f0279ae8ce23423da79a60ae339d63ca0e131130912341d1a133 WHIRLPOOL a067c9c48014b330624ff2db153991a866b381ebbe213194a7af1150cb4766a62a67323ce3346622912e2acba135a28a05f83db8824e568968a0e6f898da586b
 DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
+EBUILD transmission-2.84-r1.ebuild 4464 SHA256 640fbe57a57f7972d9854d370b65c9433fe96f977dcb4979dc7302265931a3cd SHA512 d7ef071b012b14571f386ec74835ef25128073a165d8d9c18e9924c015ce485d355c412ab5436310141d0fd4e4c894f1549d57e466887a86af505aa07a779919 WHIRLPOOL 2b8b1a6298abd31c71bb0d515831f0cb63afaec3e6ea6cab1148d347a336db1e50adf3fe01725eb56d1433eb7e46abd72c505edd5faab05bddf0b6bcda0820fa
 EBUILD transmission-2.84.ebuild 4119 SHA256 b848dd07e3c80cf38e859382b32f996795188c33b163acfe5e612cc8acb18c2c SHA512 48481abfed004ed34fb1090fa8b9d466c37f1ce7bb9b29e1ad186ec610d51092d668a092501bcbb8ca43901f7d4aa2f2589a31305aed70550c6a9be1c7cceb38 WHIRLPOOL ba51b16d3f8af5d4d3ebe57c6574b1bede7b86a0fb09a953958e8f6e093a72d63457f327523242090db21badf14c11559ed4f87af6c7f677cc60cd0449998c54
-MISC ChangeLog 44422 SHA256 a8a5eefa0e0166fe55bfdc123cadb117ce3a14e2446bd9496c1a2bd407f27cfe SHA512 36734dcb808d443d0ce9ed49d089ad5c45025b6edbbf0cfb192efc8f90062cdd728b7581f012ccc3d4f6dad93ec4b334a2d8fbb39ca68735d94934f751fa380a WHIRLPOOL e174d402af0e06b80b10afa3876f74fb30df15c8056fce8337432d8c70b01652957d820222a2dd56ebb85788570b9665a520126d42f0c4d8ba79a71d4c4dd550
+MISC ChangeLog 44603 SHA256 a8b2ea584d4dccbd5ab86c1dde709064c9bdde059fc7f9b1b3e6f53c4aca8b7f SHA512 fab15a4788e9dd13718cf77faade082bc3d44fe978ff97295cfa4c04d14843ceaa09cd2e88c9d65bf3daafd04d1695f6b04b2b8f7d01b8fa5cc09d7dba4954c3 WHIRLPOOL 3e664d61274013d321e7a63360cb73d9dff612d42ca87175976b7a3b408e319ea15c26f21e821d29dd56fde8a7f2a4811af9a8637fb346c1b1b15adfff611efb
 MISC metadata.xml 566 SHA256 ee4ef67c4bf912c1b5e529965fc45eca1f41dbebf76bcf785c8fc7b38a602633 SHA512 60ee8ea3d363fa60f5a1f94ec9d8fe7653465cb2fc3de8c92d6945f5cb01468f7af580149ceefeb8fdd866af7b5ae2143b584853bf3aa5fcc69408a21e4566eb WHIRLPOOL b3b4ed16faa68d7abb0519e025607c55c68a1ba0462992ac1e8b3e7f775dca278039391041097abcb1063b6cc5fa3f8741ecd76587fb3533c437d780ce4b0423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUCUveAAoJEEdUh39IaPFN0GkIAJFwv2zXt4OINO8fonk673g2
-yXnsBUcdh/d+pRiKcrON/io95WRI48Gfuf+5o8HVawEN1fY7CfWfasNzBO4Xh/uj
-1dT6XhHih5OVe1lapU3tFBkH1oojoJtaUwKjf55Mnlrng+UDbxZzBc6AeZHeFTDb
-+Uoyzwi3R3ys58lDbhEFOVZJjTDtOuYZnipR0VI21qORcEyMbGZy2yL4czATAuwS
-XnJDar0wpA2jMaQMZQVKXwnjfPBYyi+TBzMOTqR1OQ9gkFXgS34FoRQMR1PEy9Od
-qjT3NHsCjsD0SRfuxyeKiKM1FPCI0dpzmzVT4LwdS+brPgFGuAgVRiTKgJUKaZw=
-=+Zkc
+iQJ8BAEBCABmBQJVEevIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/DcP+wTudJYUzs9VkIMNfmOStXGu
+Q59dmhb3sCMuds/lkQwKYAzCvnDmK7XpWda57q/APsqi5VIyWv78T1+qufqp3rQP
+3aifMhgmmZMxZyZ1zIp7h9rgZIYuZssin6Qa3vcAW0Jij54XgSgVJFup59WZR8YV
+NQOrmN/2MzuLrvyzpS+lQTh/uioRQ7ktMX5IulsnzABb9NTbPe+twdwqYtln1OPx
+0ITnbFIf67wx7IbvMPZ8InnMKgkHybgwY4T4sguFbd2wS1Tp2BJHnGKiNAuLkmS3
+9wIC/mw69Apn/ldbh+t11ntELKMfWleMNoGCVN8ASnICLOHbcVWzxFiS9JHpMgc6
+890hD/QNnFDJSjYoDGpE4ATgsm/wHfBNUSGAdw0/oLxF96lx4Gf5NQzHN+/v5z+Q
+rvfpBq5zoK1+IBD+60LmhvbbsddYr8Dlk27qdTATktquPnkDBQiyEfoqjytQ71na
+j/48xLEAIajbB+M0WxXhBv3t+5Ca60RwXLpf+VPgnsa1M7s3zNa4AlAi1OWCH5OE
+HEg471U2u396bjHLCOsmdfOEaXV8pExq8XhtzIJzSRhNBh2eyOUvAQ0j5DWjgevX
+wlOz9zuU15vyA5ikGqB/ymE/GwWNlcaV+mkk7cbBDZYf+cW5zx/ML69ELTtE2jwC
+Kkh92G25X+qj7fr/zxR0
+=tGJe
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/transmission/transmission-2.84-r1.ebuild b/net-p2p/transmission/transmission-2.84-r1.ebuild
new file mode 100644 (file)
index 0000000..4c43e32
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.84-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.84-r1.ebuild,v 1.1 2015/03/24 22:57:05 mgorny Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils qmake-utils systemd user
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk lightweight systemd qt4 qt5 xfs"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND=">=dev-libs/libevent-2.0.10:=
+       dev-libs/openssl:0=
+       net-libs/libnatpmp:=
+       >=net-libs/miniupnpc-1.7:=
+       >=net-misc/curl-7.16.3:=[ssl]
+       sys-libs/zlib:=
+       gtk? (
+               >=dev-libs/dbus-glib-0.100:=
+               >=dev-libs/glib-2.32:2=
+               >=x11-libs/gtk+-3.4:3=
+               ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+               )
+       systemd? ( sys-apps/systemd:= )
+       qt4? (
+               dev-qt/qtcore:4=
+               dev-qt/qtgui:4=
+               dev-qt/qtdbus:4=
+               )
+       qt5? (
+               dev-qt/qtcore:5=
+               dev-qt/qtdbus:5=
+               dev-qt/qtgui:5=
+               dev-qt/qtnetwork:5=
+               dev-qt/qtwidgets:5=
+               )"
+DEPEND="${RDEPEND}
+       >=dev-libs/glib-2.32
+       dev-util/intltool
+       sys-devel/gettext
+       virtual/os-headers
+       virtual/pkgconfig
+       xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk ) ^^ ( qt4 qt5 )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+pkg_setup() {
+       enewgroup ${PN}
+       enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+       sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+       # Trick to avoid automagic dependency
+       use ayatana || { sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die; }
+       # Pass our configuration dir to systemd unit file
+       sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/${PN}-daemon.service || die
+       # http://trac.transmissionbt.com/ticket/4324
+       sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
+       # Fix for broken translations path
+       epatch "${FILESDIR}"/${PN}-2.80-translations-path-fix.patch
+       # http://trac.transmissionbt.com/ticket/5700
+       sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+
+       epatch_user
+       eautoreconf
+}
+
+src_configure() {
+       export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+       econf \
+               --enable-external-natpmp \
+               $(use_enable lightweight) \
+               $(use_with systemd systemd-daemon) \
+               $(use_with gtk)
+
+       if use qt4 || use qt5; then
+               pushd qt >/dev/null || die
+               use qt4 && eqmake4 qtr.pro
+               use qt5 && eqmake5 qtr.pro
+               popd >/dev/null || die
+       fi
+}
+
+src_compile() {
+       emake
+
+       if use qt4 || use qt5; then
+               use qt4 && local -x QT_SELECT=4
+               use qt5 && local -x QT_SELECT=5
+               emake -C qt
+               lrelease qt/translations/*.ts || die
+       fi
+}
+
+src_install() {
+       default
+
+       rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+       newinitd "${FILESDIR}"/${PN}-daemon.initd.9 ${PN}-daemon
+       newconfd "${FILESDIR}"/${PN}-daemon.confd.4 ${PN}-daemon
+       systemd_dounit daemon/${PN}-daemon.service
+
+       keepdir /var/{lib/${PN}/{config,downloads},log/${PN}}
+       fowners -R ${PN}:${PN} /var/{lib/${PN}/{,config,downloads},log/${PN}}
+
+       if use qt4 || use qt5; then
+               pushd qt >/dev/null || die
+               emake INSTALL_ROOT="${ED}"/usr install
+
+               domenu ${PN}-qt.desktop
+
+               local res
+               for res in 16 22 24 32 48 64 72 96 128 192 256; do
+                       doicon -s ${res} icons/hicolor/${res}x${res}/${PN}-qt.png
+               done
+               doicon -s scalable icons/hicolor/scalable/${PN}-qt.svg
+
+               use qt4 && insinto /usr/share/qt4/translations
+               use qt5 && insinto /usr/share/qt5/translations
+               doins translations/*.qm
+               popd >/dev/null || die
+       fi
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+
+       elog "If you use ${PN}-daemon, please, set 'rpc-username' and"
+       elog "'rpc-password' (in plain text, ${PN}-daemon will hash it on"
+       elog "start) in settings.json file located at /var/lib/${PN}/config or"
+       elog "any other appropriate config directory."
+       elog
+       elog "Since µTP is enabled by default, ${PN} needs large kernel buffers for"
+       elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+       elog " net.core.rmem_max = 4194304"
+       elog " net.core.wmem_max = 1048576"
+       elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+}