Use /var/lib/transmission instead of /var/transmission wrt #476802 by Michał Górny

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 214 insertions, 5 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 1772a58cd67c..87a669d014d8 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.240 2013/09/06 18:21:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.241 2013/09/07 12:10:02 ssuominen Exp $
+
+*transmission-2.82-r2 (07 Sep 2013)
+
+  07 Sep 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/transmission-daemon.confd.4, +files/transmission-daemon.initd.9,
+  +transmission-2.82-r2.ebuild, files/transmission-daemon.confd.3:
+  Use /var/lib/transmission instead of /var/transmission wrt #476802 by Michał
+  Górny
 
 *transmission-2.81-r1 (06 Sep 2013)
 *transmission-2.82-r1 (06 Sep 2013)
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 71b2ca0c2089..fad7ffa01ebd 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -4,7 +4,9 @@ Hash: SHA256
 AUX transmission-2.77-translations-path-fix.patch 731 SHA256 b90c26906c9ef3ddb0c81d02b54afaf515b3dfc236b5856fad9c3ab20383b346 SHA512 e8f1c9eea0ac5491bce901bd629e0b92821933989d009c78afca1a65e97b273f39c05bce4358b377be6cd30b87d6a36d1be9021e7d646719a64e82600887898e WHIRLPOOL cd5d688194babf090be381c0e1a0062d3ff1769324da4b343d7a848dc57ea347241eddbf042a9f4fad44061e7c074a0a8bfda5b492877b154046dc8e410878ec
 AUX transmission-2.80-translations-path-fix.patch 718 SHA256 94951127429649d18af5d9f04f9a4c1f2c698266fc6ee17b43d83015e2218548 SHA512 e317b23918fd47d27af3bca4694f8a71d6adb5f65ac5f3b30faa2d636d4420e6a691eca912c7be70103364f7c279f1b4ec851a5d8c5a1ca3dee880b465327fda WHIRLPOOL fbbabafb81d7e72fbf01a1b64d1c4a6e5473c254b14ed94e71e77ea8447982af3200ce76466df99d6cf9648c35f4e58dff83fe2cfd1b67b678c4b69a42982541
 AUX transmission-daemon.confd.3 703 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70 SHA512 a3b9ac2b7bbe30e33060c8b6a693dc7072d3c6ac44f92ddd567969d8f57a0bfc1a561e781ae167703ccb4b2fd5b0e6d8f8a66c5ba14fe01d8d89a501d4501474 WHIRLPOOL 41e2937a7bd03b6e667c991d122b8370d650dc8c26ed9e5825fe0e76aa68bb356171411e6057c44c1a51780f2f2d5eb23b8f3e1ad22a89836587944a8ef9e7c5
+AUX transmission-daemon.confd.4 711 SHA256 249689688aad23d0d27ccdd08a0907fd85058d6a52ccd3467f756b07f5d059ee SHA512 dbc093fe00335bb207c28a4e810becc15e74b6f75e7579d561b160755d6b54bb23a45db39ee3480195a94a5e9bffdad692559d1b9662bba28119d18b713747a1 WHIRLPOOL c19f3a6d46ff5cf824e9f3d9df2ec4364c17d424a406b3922921e3385801b543f736ed7dd8e1b7f24cd81262e2ac162edd92d7b6b832909012ae4cd677d94c1d
 AUX transmission-daemon.initd.8 2247 SHA256 c4383a3380c7dac82941d073a3d52451ed6e1d6bf0969ea0fe3e86aa4b8cbe2e SHA512 bc27b582c02220fe1b771581a4ff7df4d8cbe39b778e1e30f9dd7f3ee6abd5114626cbdb3ede85a41ff80dce06c0f1d99ae45b00fafd16285301e70a25908547 WHIRLPOOL 69007d64bdc660e8cded35c229e1e20dd8cc68ae9d3d2b9a3980282e4ea180b16a223aafd75c0a177046dcbb5a25e9dd67cf69f604091b11f74e265b9e40df6d
+AUX transmission-daemon.initd.9 2256 SHA256 06d047b47befe6aaf1b1542fdd50e84ea38e0fef004b5095f6096f33fa1901a3 SHA512 37205d2375b9baa631bb5b4cdc4d95b3bd63780aae118bce89286b1ea2f00859e276316519b7f0279ae8ce23423da79a60ae339d63ca0e131130912341d1a133 WHIRLPOOL a067c9c48014b330624ff2db153991a866b381ebbe213194a7af1150cb4766a62a67323ce3346622912e2acba135a28a05f83db8824e568968a0e6f898da586b
 DIST transmission-2.77.tar.xz 2953840 SHA256 55b1653fc18a10153ba9439f284bd7b2276a6859416dcae217d9e8c689841fde SHA512 2c7457ab2bd25300ef5cb2ba9218df70b33451c5ac46e0f12738fe562cd4885d62bce5361f8d0fb10e823674c833ee4d0cb785724519d6352f2701879154dfff WHIRLPOOL c003d31d3c54ddd522717bc976c9d97224cc16c754e4d3067c609be32b5711678e7f0711418b06a601e0aa8f60469afc4ed915484fe80ceae6e6e386b92a0895
 DIST transmission-2.81.tar.xz 3167816 SHA256 bbb571f5825466aa45e6ef4ad286176135a1a9c0234ffea3527ebd8001cc56ab SHA512 4b646b1c8498499e5557c3084e2a4350526b2e009e5f369ccf24f9d81dad8df05442744db17614486c8567c3bd90cef8567a564fad1f1f6f8b234740c7679dee WHIRLPOOL 1274a5a97ae82d7ebc29e0e40d02f3148546f25eb7aff8ab3298245447071b467802f6d518cb58f1842f576fe77c70b3c559a87620e0714fd724b7b75e08f020
 DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca
@@ -12,13 +14,18 @@ EBUILD transmission-2.77-r1.ebuild 3333 SHA256 44fbeb1e2d1a26cb18569f0252dd367c4
 EBUILD transmission-2.81-r1.ebuild 3714 SHA256 cc1abba185a2210f9f1880d363ee4eed25e1e66d5b4eaabb30d88df5e8cee47a SHA512 b5db7b988193deb9c4a9db66e462103b6c57e3232acf234e62cd6cdad10a699b4866b5b9f96371c161e41d159ebc85e7ec100071c8e4b2c8203dd30b87db3d94 WHIRLPOOL 2f0a6663c7091d34d0264051938ce12161e197a36e0715050e935172096655464a3abc4ad1dd7b692219bc721c86977b939b2f96ff572852793d5d6175089e44
 EBUILD transmission-2.81.ebuild 3499 SHA256 9680092429724e2b865536e9668b84ea78a6f2bda6902fc6a99da90180788058 SHA512 4dfd72430679ded62763b3b30c075916cc8c6b9bc95994c2ecf9c1217932a8c30aa8b02955b21df9b53840dfd77e040ae90a2f47aa973049be42517410ce7a67 WHIRLPOOL 15785b2aac15d45e5c051e59ba3ad2ec59243275b5e49ec969fe658dc8f166f7bf6eb4cd1200b29300fd056cf0619abdaccb71d7209f3ac4f6efa00259eb6dec
 EBUILD transmission-2.82-r1.ebuild 2925 SHA256 20438aa5371fabcdc492c51dbf40db7dffb20c95b8d53a59385dd8fa53ee2fdd SHA512 e5e3b420a33d8b3f54cfcb4820bac4b7d3f2ec752a5ec22ed06effa945545c25fbc962626846aea0cee0299ee034487813acafd3a46dc181da5c985ba89cf6ad WHIRLPOOL ff5e79a0bfe0a98b37846ccf451a2d394edb372d6dd98e5c9099b4dbdab6b4eb21e0037ea024d9918dd95134d327e5e4c4d29b427924971127180416a6f92bf5
+EBUILD transmission-2.82-r2.ebuild 2967 SHA256 498e5b2a46c89b40b0ace2cdd5ded99caa2b1befb2aabd96cc0b5a043cecec8c SHA512 218fc73c0cd6a76bcc92863951dad198f413ea363011c08e48d04738305752a64687396b698110e60be929b0bf0f9d1fee3db847b2e7f10b4ebd8ce3e8c4c0be WHIRLPOOL 087e5a985711451ba3d1f485a2a1381af8ecd074d9cfd24ae2556873ffa96efbb36f86a7755ac2f4dc2d242379ade9841df6e0895196c76a281f313bd77c8e59
 EBUILD transmission-2.82.ebuild 2709 SHA256 c9b7256996c304778055f4597349adb3d194c74af6ce54912a054f794a18e86c SHA512 9522fcc3046af8934bfc5a378f0cda18ba784f6c21a086374675efa4f12a5e80a15178c694c528d714e113c91c33a437441e74d56452b5711be9feec1e16680e WHIRLPOOL 00d97d29ecf6a4d99d9effca3c82eb2908cbf2ed13de29d27691b523cd4c66b81b944a1b467c68df2399b9362d5e2e5c31f5a7d42e10a2dc5da086d26bfb8265
-MISC ChangeLog 41353 SHA256 dd14be86cb6c4677f77e1bfa690603409131264b700815ad2f854c9fd3ed72c4 SHA512 5d5a6c21ff5478a983f4071a344bc62d18864106144584b4bdc1f31a009a98bcb8dc6228e59b8fdd490d77cb02798fac1ec1815cbe7c30dbe8deec89fc4ca1b1 WHIRLPOOL bff7bd318244904376124b6156fd2704ca730d1c7264c270f1dea69e0b93cce8cfc0941039c95d9507f9b01837b6da84b3752365b9018bfba7d353b6129837c7
+MISC ChangeLog 41679 SHA256 fbc554a68e97a48f5db8baf1f6faa1465705dee6d7268b385e82ed71dfe8c46e SHA512 2706855be8058b26c731c1d580ef50e274690c5c357e48e7d48f0d3f7972712eff1e5ff720d6d164a2011b6720bb1209ec7472ca64b2b8bca913a4dfab0e0635 WHIRLPOOL 20437430fc02a8047fd5f46036c00c7112972d23a1e7b56828a6538a73863628c9db43c37a87b5fbf0f0964c4765b05ca67ffcead0d0667dc2a96644d1654e2c
 MISC metadata.xml 566 SHA256 ee4ef67c4bf912c1b5e529965fc45eca1f41dbebf76bcf785c8fc7b38a602633 SHA512 60ee8ea3d363fa60f5a1f94ec9d8fe7653465cb2fc3de8c92d6945f5cb01468f7af580149ceefeb8fdd866af7b5ae2143b584853bf3aa5fcc69408a21e4566eb WHIRLPOOL b3b4ed16faa68d7abb0519e025607c55c68a1ba0462992ac1e8b3e7f775dca278039391041097abcb1063b6cc5fa3f8741ecd76587fb3533c437d780ce4b0423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIqHTYACgkQCaWpQKGI+9Qa+wCdGeFVceT3H7+Z1ZZqHz7Fp2/R
-hfcAnAoWl4PyrASFhsbF6t/v/25pZHIz
-=a3Lp
+iQEcBAEBCAAGBQJSKxdPAAoJEEdUh39IaPFNBZ0IAIRacrTm+u2iVkyjv1aKgtLO
+VwyVwrVQiLTDJ5W+3tS+hkJMJGMrc1cX+wIL57NobnVJGXzdEKPsTjToNPG4CctA
+do/JvNiWMqZoaVivFads61rQUc+EKwEgcDXtwau+TVFCrmU5VXSkh4DSeGelQA8K
+qNXWBJeAw/5aj5GT6cHWYtZ/fPZDsEaATQv0vpe+OZU6u4p9cA+QAUftrbmYrRPx
+Lwl4B9YMELWqn93F21TnjXFIHTNAjZe9jd6K9HgQawi18Bi680HppcrxtldDoWpo
+8dXrLxRmkSrK1/V1A5jg377YpTvLBdsYnScBPBJ8ijd7Qb+Dp59/DPH5ObbLLc4=
+=MAWp
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/files/transmission-daemon.confd.4 b/net-p2p/transmission/files/transmission-daemon.confd.4
new file mode 100644
index 000000000000..8f3b1317a74b
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.confd.4
@@ -0,0 +1,14 @@
+# 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/lib/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/lib/transmission/config <and download directory, check web settings>
+#runas_user=transmission
+
+# Location of logfile (should be writeable for runas_user user)
+# Set logfile=syslog to use syslog for logging
+#logfile=/var/log/transmission/transmission.log
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.9 b/net-p2p/transmission/files/transmission-daemon.initd.9
new file mode 100644
index 000000000000..3c4914c5807a
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.9
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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.9,v 1.1 2013/09/07 12:10:01 ssuominen Exp $
+
+extra_started_commands="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"
+
+rundir=${rundir:-/var/run/transmission}
+pidfile=${pidfile:-${rundir}/transmission.pid}
+config_dir=${config_dir:-/var/lib/transmission/config}
+download_dir=${download_dir:-/var/lib/transmission/downloads}
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+SSD_OPTIONS=""
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			chown -R ${runas_user} "${rundir}"
+		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 --pidfile ${pidfile} ${SSD_OPTIONS} \
+		--exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \
+		$(test ${logfile} != "syslog" && echo --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.82-r2.ebuild b/net-p2p/transmission/transmission-2.82-r2.ebuild
new file mode 100644
index 000000000000..eda894620c1c
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.82-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.82-r2.ebuild,v 1.1 2013/09/07 12:10:02 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils 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 xfs"
+KEYWORDS="~amd64 ~arm ~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 )"
+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"
+
+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
+	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)
+}
+
+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}}
+}
+
+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
+}