gentoo resync : 06.08.2019

4 files changed, 49 insertions, 42 deletions

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
 }