gentoo resync : 06.08.2019

14 files changed, 155 insertions, 107 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0d8ddbd7523a..87b47225bec6 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index cc88e9e3c237..b7f87f7222a6 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -4,5 +4,7 @@ AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993b
 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
 AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
+DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
 EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899
+EBUILD ktorrent-5.1.2-r1.ebuild 3056 BLAKE2B 7bce29b1c9ef8cb43e30df074abe8539df270172f2a2828397c19c1c6422acaad0a2ddae59b9b3ab645e4dd57e9fc5827167df3d1599df8729ed2681264f12a1 SHA512 aa6d6ed75b45f3526807ddf39bba2859c42c2b3e35d0c5f436e0b5592c4e96d5db7421076f7dee765f41b519e09c32fa4da0f8d3ba34b4758272420339d3eb75
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..6de16c595265
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
++mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=net-libs/libktorrent-2.1.1:5
+	infowidget? ( dev-libs/geoip )
+	kross? (
+		$(add_frameworks_dep karchive)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kross)
+	)
+	mediaplayer? (
+		media-libs/phonon[qt5(+)]
+		>=media-libs/taglib-1.5
+	)
+	rss? (
+		$(add_frameworks_dep kdewebkit)
+		$(add_frameworks_dep syndication)
+	)
+	search? (
+		$(add_frameworks_dep kdewebkit)
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	shutdown? ( $(add_plasma_dep plasma-workspace) )
+	stats? ( $(add_frameworks_dep kplotting) )
+	upnp? ( $(add_frameworks_dep kcompletion) )
+	zeroconf? ( $(add_frameworks_dep kdnssd) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		$(add_frameworks_dep ktextwidgets)
+		$(add_kdeapps_dep kio-extras)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.1.1-singlefile-torrent.patch" ) # git master
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
+		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
+		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
+		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
+		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
+		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
+		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
+		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
+		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
+		$(cmake-utils_use_find_package rss KF5Syndication)
+		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
+		-DENABLE_SEARCH_PLUGIN=$(usex search)
+		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
+		-DENABLE_STATS_PLUGIN=$(usex stats)
+		-DENABLE_UPNP_PLUGIN=$(usex upnp)
+		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
+	)
+# add back when ported
+#		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	kde5_src_configure
+}
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 24080819139f..99b86244e43d 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -7,4 +7,4 @@ DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B f92c7195c67e3a9186cb9e691114dc2c1b96
 EBUILD mldonkey-3.1.5-r1.ebuild 4356 BLAKE2B 4fffa30f9bda190d601eb0e8e4cc7ab217575d99b8ebf91663ff1b642cf558942abf1e3ed00409428b48d77ab49eb6c491981bd032e4b6599d003437636ac660 SHA512 37c85135b6f346e65513e80733f84f8fd42345b5698322c70e9d5af08fa4e8a70d2ba44155b7bd3f1e9d8e090797d80ca1c104088e57563ad8490dca63320102
 EBUILD mldonkey-3.1.6-r1.ebuild 4463 BLAKE2B 0c67e039fdd1c9fd9571c5f46541baadcadc465460dba345823a2ebe52aa1d9baac529662311dcd8bf08406b1002a7622f65f5d2d1ee258b17b5842503cefc4e SHA512 898892a8884166e050d1205e78bee827f5fcad3a2adad3bbce03badcfb171c5102f0d158b6c26ef3b365e2ef70268b6107fbf8df7fd2e5b492738481aad2ae54
 EBUILD mldonkey-3.1.6.ebuild 4330 BLAKE2B da18da74f5300bc30921ee25049387eac3c9a5cf43518af9bae1fba6bea3cd47328077563beae8655a861eb916c345234c16b7a096a800705b023319effd3fa4 SHA512 3da6cdb7e908c71985c0ecb043fdd810614c60986c18375e6e24b39c26a96b27e37290b262427b82e90cbfc904be22d9c0650f4ac1d07da4c80dfc1eb8c3519e
-MISC metadata.xml 793 BLAKE2B 61001afe516cb624a0ab15b3e2326df537da1eef78c4aa30b983999591a862d71916db4e3198f02782ff2d485341f586a49bc0d20d52c75027950f0e50bb20f8 SHA512 faff7076c4e3f4c6e0972ee0f0ff1a667dc44dd5bce6444b76723c6c3c151633c2598bf2ba3fd12ba64232a7de6d56f46bb1da014b26db7b544cd4cabff2b4e8
+MISC metadata.xml 740 BLAKE2B 96af3507e4e0714fd01d369619b3f0e4e68a2a88e97189565a2e73ebaf9666f07063a91a33aae63f9ada4d155300a44a2361df6d5d499645f9b5df9646528b4d SHA512 ecca594b6b356c1d8c86217dc9792ed09fb842cbe015b78baae1d4c4885e86f81a9cfd694dcd8a3fbca420ede35c8ae228a15f64f1d5013d139542e06290d160
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index 6cefea4a1841..bdbe5ed30ca8 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="fasttrack">enable fasttrack support</flag>
     <flag name="gnutella">enable gnutella and gnutella2 support</flag>
     <flag name="guionly">enable client build only</flag>
-    <flag name="magic">enable use of libmagic</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">mldonkey</remote-id>
diff --git a/net-p2p/multibit/Manifest b/net-p2p/multibit/Manifest
deleted file mode 100644
index b94babb34d7d..000000000000
--- a/net-p2p/multibit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX auto-install.xml 862 BLAKE2B 99f928135329163bc4cdb975c9dd98cec14cdff49547c3e104ff816a0d1c30813d04aebb5acbc8f51082bfe62e27e2299a8c2a09d1e27cdbaf470007d40ec33b SHA512 54b1744d6efb74c9afad771fbab7f293ab102e7f5948ae9c47af60e5bb385419efcdce074795fb633a33d3f358d3814aa368ae7f600c55bcab791d30d6c0895f
-AUX multibit 81 BLAKE2B 30248bd0c42bc89ce54bac46e14ef090427b3807bea66b47a5dee087df09f977d7b168177c2cfe2621377cd4b7dbd6bf93426427a0cc36684f9d574e6d774826 SHA512 05a87d14a45478a677691b1318777f484892afe88f67ee0e0768273c78ef95b7ba10171db79fa27688944e253ddf572f8b2d7dc61f807a57366cbdb0cbf1b84c
-DIST multibit-0.5.18-linux.jar 7993916 BLAKE2B 17ab4ad38507d6aa30880c4f66b001d45f84d52726d80f6eb9af60741d18006219476e5dacf76bc27cf7a33704b2ff3123ad0267b04167e28040a96e73d42521 SHA512 788910b4a8b27f345df2cc58f8641a34d038091ffcddd69eca07c9452ed406113cf70479e6214ea52f39536d8eb21b34ecb7ab359868199223b2796b50b1b561
-EBUILD multibit-0.5.18.ebuild 838 BLAKE2B cfa6129f7990d8df2edc6d6e870d342b1e72b16d9104da141e4c256953a906d3a02c0d7c5c5f0878361e74f0f825bffe324f884b14f9ecda93f2921f0fff1f05 SHA512 17919a04057e0627305fa6f4db766fc3e62c6666b5f937617813514c5480425c4837c2124b660e7be5f955e4b7cfa619cc1922af342fe3ee27f33a2e6c7c11e2
-MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-p2p/multibit/files/auto-install.xml b/net-p2p/multibit/files/auto-install.xml
deleted file mode 100644
index 338377b9822b..000000000000
--- a/net-p2p/multibit/files/auto-install.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<AutomatedInstallation langpack="eng">
-<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
-<com.izforge.izpack.panels.InfoPanel id="UNKNOWN (com.izforge.izpack.panels.InfoPanel)"/>
-<com.izforge.izpack.panels.LicencePanel id="UNKNOWN (com.izforge.izpack.panels.LicencePanel)"/>
-<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
-<installpath>ED/opt/MultiBit</installpath>
-</com.izforge.izpack.panels.TargetPanel>
-<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
-<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
-<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
-</AutomatedInstallation>
diff --git a/net-p2p/multibit/files/multibit b/net-p2p/multibit/files/multibit
deleted file mode 100644
index c0335cac10b8..000000000000
--- a/net-p2p/multibit/files/multibit
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/bin/java -jar /opt/MultiBit/multibit-exe.jar >/dev/null 2>&1 &
diff --git a/net-p2p/multibit/metadata.xml b/net-p2p/multibit/metadata.xml
deleted file mode 100644
index d920e3ba3e56..000000000000
--- a/net-p2p/multibit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-p2p/multibit/multibit-0.5.18.ebuild b/net-p2p/multibit/multibit-0.5.18.ebuild
deleted file mode 100644
index 7e35c93ba03b..000000000000
--- a/net-p2p/multibit/multibit-0.5.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Secure, lightweight, international Bitcoin wallet written in Java"
-HOMEPAGE="https://multibit.org/"
-SRC_URI="https://multibit.org/releases/${P}/${P}-linux.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
-	cp "${FILESDIR}"/auto-install.xml "${WORKDIR}" || die
-	sed -i "s:ED:${ED}:" auto-install.xml || die
-}
-
-src_install() {
-	dobin "${FILESDIR}"/${PN}
-
-	make_desktop_entry "${PN}" "Multibit" "/opt/MultiBit/multibit48.png" "GNOME;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/multibit;\nTerminal=false"
-
-	java -jar "${DISTDIR}"/${P}-linux.jar auto-install.xml >/dev/null 2>&1
-}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 58308d6d6253..3bea35c3ea12 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,8 +1,9 @@
+AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
-EBUILD transmission-2.94.ebuild 4106 BLAKE2B 790dfe75e484a02013f96e3b5eed1a4f4ad9d9c0ffbabf2edd090ce220f6fe062c8c2cdab72fba6057fee1e87ae110884a69e6a95ce31a3a50a3d807e78923d1 SHA512 072bf1a9af81a975214db9b9f9b2d337bb9e935dd2e2ff269919788c0493cff2ec45c808e31a465ae7e376fead92f37ae314c546ed9607549b987cf01be23bce
-EBUILD transmission-9999.ebuild 3505 BLAKE2B ae448cc6ed0c52f2cd16d72d9106a923532052c41bbff74e875297f4206f3b1c9d6fe65d59d420ac8187197209ae7d2617f2740e26f353c482e62595266099e1 SHA512 5b0db4a554a38706c1b6d7914e11bd293a23708c08dc8799ac2ad0f7c2a0c1aab4012adb30fe64caf422e69e9c6875abbea33d017b888393c7164e30b2c0e5e8
+EBUILD transmission-2.94-r1.ebuild 3777 BLAKE2B a6af0614b29f30277e398fafad3860940363fed39dfe75cc12f3e0acb1cdc9c4529917e08df8c3961b2f0236b0263b4d06d089d8d68648f0aa0ed6f3840fc459 SHA512 cf0ae34c109f31247c8fc6d1850c36e46f8d54e84a3dabf2c91dc7a52235765169c6b9e880b4e58cd4c4ff565c458509fee7238019843b9cdd28857a8d43e15e
+EBUILD transmission-9999.ebuild 3293 BLAKE2B 5ff20121f1ce486e9d4a2e035ee56c113be45399fb52be6071f7d916423ca5540fa1efc98f5363fcdcecc2beae0aa3b97a8816c6ef57da2fe9afad12bc14452e SHA512 f0b04b023c37a52af09d928cb5d71515396e8f941794edf3fef0a0489a5cfe40d68d07b235b66068737fdf53e69beae16b76d49a0d0079ed27b41c2b004a453e
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/files/60-transmission.conf b/net-p2p/transmission/files/60-transmission.conf
new file mode 100644
index 000000000000..bdf0de2064e1
--- /dev/null
+++ b/net-p2p/transmission/files/60-transmission.conf
@@ -0,0 +1,2 @@
+net.core.rmem_max = 4194304
+net.core.wmem_max = 1048576
diff --git a/net-p2p/transmission/transmission-2.94.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
index 745abf9221fa..c2e85f5d064b 100644
--- a/net-p2p/transmission/transmission-2.94.ebuild
+++ b/net-p2p/transmission/transmission-2.94-r1.ebuild
@@ -16,6 +16,10 @@ SLOT=0
 IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
 COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -38,6 +42,7 @@ COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
 		)
 	systemd? ( >=sys-apps/systemd-209:= )"
 DEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
 	>=dev-libs/glib-2.32
 	dev-util/intltool
 	sys-devel/gettext
@@ -46,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
 	xfs? ( sys-fs/xfsprogs )"
 RDEPEND="${COMMON_DEPEND}
-	acct-user/transmission"
+	${ACCT_DEPEND}"
 
 REQUIRED_USE="ayatana? ( gtk )"
 
@@ -113,6 +118,9 @@ src_install() {
 	systemd_dounit daemon/transmission-daemon.service
 	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
 
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
 	if use qt5; then
 		pushd qt >/dev/null || die
 		emake INSTALL_ROOT="${ED%/}"/usr install
@@ -129,6 +137,9 @@ src_install() {
 		doins translations/*.qm
 		popd >/dev/null || die
 	fi
+
+	diropts -o transmission -g transmission
+	keepdir /var/lib/transmission
 }
 
 pkg_preinst() {
@@ -138,17 +149,6 @@ pkg_preinst() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
-
-	elog "If you use transmission-daemon, please, set 'rpc-username' and"
-	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
-	elog "start) in settings.json file located at /var/lib/transmission/config or"
-	elog "any other appropriate config directory."
-	elog
-	elog "Since µTP is enabled by default, transmission 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() {
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 312540191f40..dc8e81488004 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils readme.gentoo-r1 systemd xdg-utils
+inherit cmake-utils systemd xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,6 +24,22 @@ SLOT="0"
 IUSE="ayatana gtk libressl lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="${ACCT_DEPEND}
+	virtual/pkgconfig
+	nls? (
+		gtk? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+		qt5? (
+			dev-qt/linguist-tools:5
+		)
+	)
+"
 COMMON_DEPEND="
 	dev-libs/libb64:0=
 	>=dev-libs/libevent-2.0.10:=
@@ -36,6 +52,7 @@ COMMON_DEPEND="
 	>=net-libs/miniupnpc-1.7:=
 	>=net-misc/curl-7.16.3[ssl]
 	sys-libs/zlib:=
+	nls? ( virtual/libintl )
 	gtk? (
 		>=dev-libs/dbus-glib-0.100
 		>=dev-libs/glib-2.32:2
@@ -52,7 +69,6 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:= )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	nls? (
 		virtual/libintl
 		gtk? (
@@ -65,7 +81,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	acct-user/transmission
+	${ACCT_DEPEND}
 "
 
 src_unpack() {
@@ -102,21 +118,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="\
-If you use transmission-daemon, please, set 'rpc-username' and
-'rpc-password' (in plain text, transmission-daemon will hash it on
-start) in settings.json file located at /var/lib/transmission/config or
-any other appropriate config directory.
-
-Since µTP is enabled by default, transmission needs large kernel buffers for
-the UDP socket. You can append following lines into /etc/sysctl.conf:
-
-net.core.rmem_max = 4194304
-net.core.wmem_max = 1048576
-
-and run sysctl -p"
-
 src_install() {
 	cmake-utils_src_install
 
@@ -125,20 +126,23 @@ src_install() {
 	systemd_dounit daemon/transmission-daemon.service
 	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
 
-	readme.gentoo_create_doc
-}
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	diropts -o transmission -g transmission
+	keepdir /var/lib/transmission
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
 }