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

(Portage version: 2.1.9.49/cvs/Linux x86_64)

7 files changed, 27 insertions, 240 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index c835b8c42994..1ec702d8ed03 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.151 2011/05/21 16:05:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.152 2011/05/23 07:32:00 pva Exp $
+
+  23 May 2011; Peter Volkov <pva@gentoo.org> -transmission-2.13.ebuild,
+  -files/transmission-2.13-libnotify-0.7.patch, transmission-2.31.ebuild,
+  +files/transmission-2.31-qt-libutp.patch, -files/transmission-daemon.confd.2,
+  -files/transmission-daemon.initd.5:
+  Fix libutp related build issue, bug #368187 thank thomasg for this fix. Drop
+  old.
 
   21 May 2011; Michael Weber <xmw@gentoo.org> transmission-2.22.ebuild:
   ppc stable (bug 361169)
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 $?
-}
-
diff --git a/net-p2p/transmission/transmission-2.13.ebuild b/net-p2p/transmission/transmission-2.13.ebuild
deleted file mode 100644
index 8868cd38318a..000000000000
--- a/net-p2p/transmission/transmission-2.13.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.13.ebuild,v 1.6 2011/04/29 18:11:48 xarthisius Exp $
-
-EAPI=2
-inherit 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 ~ppc64 x86 ~x86-fbsd"
-IUSE="gnome gtk kde libnotify libcanberra qt4"
-
-RDEPEND="
-	sys-libs/zlib
-	>=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-2.20.0 )
-		libnotify? ( >=x11-libs/libnotify-0.4.3 )
-		libcanberra? ( >=media-libs/libcanberra-0.10 ) )
-	qt4? ( x11-libs/qt-gui:4[dbus] )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	sys-apps/sed"
-
-pkg_setup() {
-	enewgroup transmission
-	enewuser transmission -1 -1 -1 transmission
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	sed -i -e 's:-ggdb3::g' configure || die
-	# Magnet link support
-	if use kde; then
-		cat > qt/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() {
-	# cli and daemon doesn't have external deps and are enabled by default
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable gtk) \
-		$(use gtk && use_enable libnotify) \
-		$(use gtk && use_enable libcanberra) \
-		$(use gtk && use_enable gnome gconf2)
-
-	use qt4 && cd qt && eqmake4 qtr.pro
-}
-
-src_compile() {
-	emake || die
-	use qt4 && cd qt && { emake || die; }
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS NEWS qt/README.txt
-	rm -f "${D}"/usr/share/${PN}/web/LICENSE
-
-	newinitd "${FILESDIR}"/${PN}-daemon.initd.5 ${PN}-daemon || die
-	newconfd "${FILESDIR}"/${PN}-daemon.confd.2 ${PN}-daemon || die
-
-	keepdir /var/{transmission/{config,downloads},log/transmission}
-	fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
-
-	if use qt4; then
-		cd qt
-		emake INSTALL_ROOT="${D}/usr" install || 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
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	# Keep default permissions on default dirs
-	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() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/transmission/transmission-2.31.ebuild b/net-p2p/transmission/transmission-2.31.ebuild
index 356865ddd039..e742758681c0 100644
--- a/net-p2p/transmission/transmission-2.31.ebuild
+++ b/net-p2p/transmission/transmission-2.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.31.ebuild,v 1.1 2011/05/20 12:13:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.31.ebuild,v 1.2 2011/05/23 07:32:00 pva Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils qt4-r2
@@ -45,6 +45,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-qt-libutp.patch" #368187
+
 	sed -i -e 's:-ggdb3::g' configure || die
 	# Magnet link support
 	if use kde; then