old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 6 insertions, 371 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index bdc4554cc633..b3550468e212 100644
--- 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.259 2014/08/09 10:48:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.260 2014/08/10 05:17:06 ssuominen Exp $
+
+  10 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/transmission-2.82-qt4.patch, -transmission-2.82-r3.ebuild,
+  -transmission-2.83.ebuild:
+  old
 
   09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> transmission-2.84.ebuild:
   Stable for ppc64, wrt bug #516822
diff --git a/net-p2p/transmission/files/transmission-2.82-qt4.patch b/net-p2p/transmission/files/transmission-2.82-qt4.patch
deleted file mode 100644
index 5754b36874bd..000000000000
--- a/net-p2p/transmission/files/transmission-2.82-qt4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 <QNetworkAccessManager>
- #include <QNetworkReply>
- #include <QNetworkRequest>
--#include <QStandardPaths>
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-+ #include <QDesktopServices>
-+#else
-+ #include <QStandardPaths>
-+#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; i<NUM_COLUMNS; ++i)
-     {
-       setColumnHidden (i, (i<FIRST_VISIBLE_COLUMN) || (LAST_VISIBLE_COLUMN<i));
-+
-+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-+      header()->setResizeMode(i, QHeaderView::Interactive);
-+#else
-       header()->setSectionResizeMode(i, QHeaderView::Interactive);
-+#endif
-     }
- 
-   connect (this, SIGNAL(clicked(const QModelIndex&)),
-
-------------------------------------------------------------------------
diff --git a/net-p2p/transmission/transmission-2.82-r3.ebuild b/net-p2p/transmission/transmission-2.82-r3.ebuild
deleted file mode 100644
index 6ced82ddf989..000000000000
--- a/net-p2p/transmission/transmission-2.82-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.82-r3.ebuild,v 1.6 2014/03/04 20:18:56 vincent Exp $
-
-EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2 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"
-
-LICENSE="GPL-2 MIT"
-SLOT=0
-IUSE="ayatana gtk lightweight systemd qt4 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.6.20120509:=
-	>=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=
-		)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	xfs? ( sys-fs/xfsprogs )"
-
-REQUIRED_USE="ayatana? ( gtk )"
-
-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/transmission-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
-	# Restore support for Qt 4.x using upstream patch
-	epatch "${FILESDIR}"/${P}-qt4.patch
-
-	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; then
-		pushd qt >/dev/null
-		eqmake4 qtr.pro
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; then
-		pushd qt >/dev/null
-		emake
-		lrelease translations/*.ts
-		popd >/dev/null
-	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; then
-		pushd qt >/dev/null
-		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
-
-		insinto /usr/share/qt4/translations
-		doins translations/*.qm
-		popd >/dev/null
-	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/${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
-}
diff --git a/net-p2p/transmission/transmission-2.83.ebuild b/net-p2p/transmission/transmission-2.83.ebuild
deleted file mode 100644
index c6f51a54b032..000000000000
--- a/net-p2p/transmission/transmission-2.83.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.83.ebuild,v 1.4 2014/07/06 09:38:46 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils qt4-r2 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 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=
-		)"
-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 )"
-
-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; then
-		pushd qt >/dev/null
-		eqmake4 qtr.pro
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; then
-		pushd qt >/dev/null
-		emake
-		lrelease translations/*.ts
-		popd >/dev/null
-	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; then
-		pushd qt >/dev/null
-		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
-
-		insinto /usr/share/qt4/translations
-		doins translations/*.qm
-		popd >/dev/null
-	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/${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
-}