Fix libutp related build issue, bug #368187 thank thomasg for this fix. Drop old.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 16 insertions, 102 deletions

diff --git a/net-p2p/transmission/files/transmission-2.13-libnotify-0.7.patch b/net-p2p/transmission/files/transmission-2.13-libnotify-0.7.patch
deleted file mode 100644
index 7e92ededae6c..000000000000
--- a/net-p2p/transmission/files/transmission-2.13-libnotify-0.7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.gentoo.org/352128
-
---- gtk/notify.c
-+++ gtk/notify.c
-@@ -160,7 +160,12 @@ tr_notify_added( const char * name )
-     if( pref_flag_get( PREF_KEY_SHOW_DESKTOP_NOTIFICATION ) )
-     {
-         NotifyNotification * n = notify_notification_new(
--            _( "Torrent Added" ), name, NULL, NULL );
-+            _( "Torrent Added" ), name, NULL
-+/* the fourth argument was removed in libnotify 0.7.0 */
-+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
-+                                                    , NULL
-+#endif
-+                                                            );
-         addIcon( n );
-         notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );
-         notify_notification_show( n, NULL );
diff --git a/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch b/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch
new file mode 100644
index 000000000000..b83fac7d3aae
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch
@@ -0,0 +1,16 @@
+https://trac.transmissionbt.com/changeset/12452#file0
+https://bugs.gentoo.org/show_bug.cgi?id=368187
+
+--- qt/qtr.pro	(revision 12449)
++++ qt/qtr.pro	(working copy)
+@@ -19,7 +19,9 @@ 
+ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
+ INCLUDEPATH += $${TRANSMISSION_TOP}
+ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+-LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
++exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { 
++    LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
++}
+ LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
+ LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
+ LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
diff --git a/net-p2p/transmission/files/transmission-daemon.confd.2 b/net-p2p/transmission/files/transmission-daemon.confd.2
deleted file mode 100644
index bdc5f7a2bd8b..000000000000
--- a/net-p2p/transmission/files/transmission-daemon.confd.2
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/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/transmission/config <and download directory, check web settings>
-#runas_user=transmission
-
-# Location of logfile (should be writeable for runas_user user)
-#logfile=/var/log/transmission/transmission.log
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.5 b/net-p2p/transmission/files/transmission-daemon.initd.5
deleted file mode 100644
index a0d63f61852d..000000000000
--- a/net-p2p/transmission/files/transmission-daemon.initd.5
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/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.5,v 1.2 2010/11/11 16:05:43 pva Exp $
-
-opts="start stop 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"
-
-pidfile=/var/run/transmission/transmission.pid
-config_dir=/var/transmission/config
-download_dir=/var/transmission/downloads
-logfile=${logfile:-/var/log/transmission/transmission.log}
-runas_user=${runas_user:-transmission:transmission}
-
-SSD_OPTIONS=""
-
-depend() {
-	need net
-}
-
-check_config() {
-	if [ ! -d /var/run/transmission/ ]; then
-		mkdir /var/run/transmission/
-		if [ -n "${runas_user}" ]; then
-			chown -R ${runas_user} /var/run/transmission/
-		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 --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}
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading transmission configuration"
-	start-stop-daemon --signal HUP --pidfile ${pidfile}
-	eend $?
-}
-