a lot of minor changes, check changelog for hightlights

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 70 insertions, 53 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 45f8f0b5fdea..be6a364f81db 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.176 2012/03/02 03:13:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.177 2012/03/02 09:30:04 ssuominen Exp $
+
+  02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  transmission-2.50-r1.ebuild, metadata.xml:
+  Remove USE="kde" and always install transmission-magnet.protocol file.
+  USE="lightweight" for low-resource systems. Run lrelease in compile phase
+  instead of install phase.
 
   02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/transmission-2.33-0001-configure.ac.patch,
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5f43335db829..2717d3e7e10c 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -11,17 +11,17 @@ DIST transmission-2.42.tar.xz 2629072 RMD160 c74688a61c2a8489f878363046ac705f1ce
 DIST transmission-2.50.tar.xz 2766300 RMD160 7299f7410af58fbbad2a4e5771f33bc923f2a1de SHA1 df0c19c0380f28b39e6391cab2875fcf720ac70b SHA256 c271c8f4b64959c2b1ba1245c465e3ec27b5450128f40e15c07ff2f136e9f900
 EBUILD transmission-2.22.ebuild 3905 RMD160 fa3fb412e80762df5ea9f586e306d3d78f7940a2 SHA1 c8abfcb6c950ebe7946b912fc5246d6f950f7bd1 SHA256 bc88d99b145cd04958b0b7c34533e2e730a247d3b87423010886178e542b0a4d
 EBUILD transmission-2.42-r1.ebuild 4024 RMD160 5e4e41071f61074280791163b7401b4ff4e46a69 SHA1 bb3a4cfb78d75ec9964590543562c38c4d9c54a4 SHA256 2e8ad71896135d2304283c571567b3f8cd01f30dbe85463640cbb8ad62afd521
-EBUILD transmission-2.50-r1.ebuild 3947 RMD160 e173b33648721ed91d867542f801a49f2611f600 SHA1 055bbd240d149d9d507629d36f97ad29dfcd0007 SHA256 77365d39f04fc7ee3ea36a160c3723747852e3228640ca1d09020f2ba2e4f65f
-MISC ChangeLog 31249 RMD160 32d98c9024b0a6d8ec1a958c54d9f446af01c98f SHA1 b8d0a3e4531d93f296b2c5400520f98ef7e4a733 SHA256 a4ed9b7d8ab82546a2216ed1c083fcb57e41334445ac0697aa8ef17292485754
-MISC metadata.xml 574 RMD160 0998ce04eade75bb62455d35b062cf6ce6c0a91f SHA1 e8336b2bf16d310520c033f9cb81fd4e54f46c02 SHA256 76d6ece258f87f060754898cb2f4c9479f3f36ea2917908f551fac389af0ea46
+EBUILD transmission-2.50-r1.ebuild 3800 RMD160 7393037764606e03d97f1ee04e1f526bbd246f2e SHA1 6ef60f3579093717c5ef60a3db94642ee8639f0d SHA256 9a0f5f8bcb7d257824b05f7a8f97e610a9271ad70513e093c9a48dce937cb9c7
+MISC ChangeLog 31526 RMD160 d06d71292054526da2af77fced2159bddb82134a SHA1 44d8b994a080bb264ccdd421f01dbe1d57537beb SHA256 a409b32fb6fd8523a4247ee893e6909c8f76a4e9f4dd2195f6b88172624a7683
+MISC metadata.xml 763 RMD160 802660e4eeef0ecf8e93ac57b6297a6c68e7a36d SHA1 cae620541a466a6febfd67f5004f4fa189b4fc8d SHA256 dbea4b7cce679731b350d31875e4acbf57d7db750b5623f058ae23ba8ac7e337
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPUDq8AAoJEEdUh39IaPFNFgEIAKCq8y421roj0vHv8WFiXI05
-CHshvoUIAqOtXbThT/en+vl1eb9TmgUfCUljV1dnykbja331XdHcngjbHEkiMRGn
-GMYfc/gRE4FKZlvxP7WZnqS4l7ITDrjjZrOEf2mTg2lgm21ZlDtFh9sI8K/4X6i7
-IIJQ9XG5ivX0PUZFl4DqhGg5nIklwBX96LyfpiOSIyIn7iNdBU9N6qyhRWcZ/yhr
-vvSF0w/+2+xAl2jbwSF0jPM6jqFdkdTBxqedaTRUIjIBKuPneg9XtPDQ8bi3N0YY
-18JXzsMSl23eyLbiBYD3lU/0Y91xxdgtqQgiNI4C2DTgfuxHL0k7mYu7jX+B2LI=
-=uTC2
+iQEcBAEBAgAGBQJPUJLuAAoJEEdUh39IaPFNudUH/3f90JK+V42SV4kCwKeZH3Sg
+VMnprNUNfCFy2uFr+Pp5QPtK8Y+Vx7VkKcOc4j1vCROwLwIw7RBI/E+P7SkRvyux
+ni6VLrE167UDNaGj3qKvQZKNCMqQe7U3tNLiBe+t3uF4vXplgQ+iIpvPuxNJgiS6
+Dc4YJjnOiyGwWx/DJ2uwvzvN2Eyyp2GihvX2i9ihe+Ni9p1tJT0iG24BhXKa6rA8
+wPTm5t086tjUR5rttt1aqiJXRcUIU3IHIn2nFqDPvsmJlRCINxNxeaJNJSjCEhS+
+K44c6UXi6J3qM7eFe5DeCK3JGxGYOgTGmMAqEkjGQf/PsVapWVfEbigpWhJTpeI=
+=6P+v
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 74ec7cf46ebd..151c89518c8e 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -12,6 +12,7 @@
   </maintainer>
   <use>
     <flag name='libcanberra'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
-    <flag name='xfs'>Use <pkg>sys-fs/xfsprogs</pkg> headers in building of fdlimit(.c)</flag>
+    <flag name='lightweight'>Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+    <flag name='xfs'>Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
   </use>
 </pkgmetadata>
diff --git a/net-p2p/transmission/transmission-2.50-r1.ebuild b/net-p2p/transmission/transmission-2.50-r1.ebuild
index 532666caf027..550667826609 100644
--- a/net-p2p/transmission/transmission-2.50-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.1 2012/03/02 03:10:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.50-r1.ebuild,v 1.2 2012/03/02 09:30:04 ssuominen Exp $
 
 EAPI=4
 LANGS="en es kk lt pt_BR ru"
@@ -13,7 +13,7 @@ SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gtk kde nls qt4 xfs"
+IUSE="ayatana gtk lightweight nls qt4 xfs"
 
 RDEPEND="
 	>=dev-libs/libevent-2.0.10
@@ -33,21 +33,21 @@ RDEPEND="
 		x11-libs/qt-gui:4[dbus]
 		)"
 
-DEPEND="${RDEPEND}
+EAUTORECONF_DEPEND="
 	dev-util/intltool
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	${EAUTORECONF_DEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext
 	virtual/os-headers
 	nls? (
-		>=dev-util/intltool-0.40
+		dev-util/intltool
 		sys-devel/gettext
 		)
 	xfs? ( sys-fs/xfsprogs )"
-# note: gettext is always a depend with eautoreconf
 
-REQUIRED_USE="
-	ayatana? ( gtk )
-	kde? ( qt4 )"
+REQUIRED_USE="ayatana? ( gtk )"
 
 DOCS="AUTHORS NEWS qt/README.txt"
 
@@ -57,7 +57,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build-with-natpmp1.patch
+	epatch "${FILESDIR}"/${P}-build-with-natpmp1.patch #376647
 
 	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac
 	use ayatana || sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac
@@ -67,12 +67,12 @@ src_prepare() {
 
 	eautoreconf
 
-	if use kde; then
+	if use qt4; then
 		cat <<-EOF > "${T}"/${PN}-magnet.protocol
 		[Protocol]
-		exec=transmission-qt '%u'
+		exec=${PN}-qt '%u'
 		protocol=magnet
-		Icon=transmission
+		Icon=${PN}
 		input=none
 		output=none
 		helper=true
@@ -91,14 +91,31 @@ src_configure() {
 	econf \
 		--enable-external-natpmp \
 		$(use_enable nls) \
+		$(use_enable lightweight) \
 		$(use_with gtk)
 
-	use qt4 && cd qt && eqmake4 qtr.pro
+	if use qt4; then
+		pushd qt >/dev/null
+		eqmake4 qtr.pro
+		popd >/dev/null
+	fi
 }
 
 src_compile() {
-	emake
-	use qt4 && cd qt && emake
+	default
+
+	if use qt4; then
+		pushd qt >/dev/null
+		emake
+
+		local l
+		for l in ${LANGS}; do
+			if use linguas_${l}; then
+				lrelease translations/${PN}_${l}.ts
+			fi
+		done
+		popd >/dev/null
+	fi
 }
 
 src_install() {
@@ -109,8 +126,8 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon
 	newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon
 
-	keepdir /var/{transmission/{config,downloads},log/transmission}
-	fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+	keepdir /var/{${PN}/{config,downloads},log/${PN}}
+	fowners -R ${PN}:${PN} /var/{${PN}/{,config,downloads},log/${PN}}
 
 	if use qt4; then
 		pushd qt >/dev/null
@@ -119,21 +136,18 @@ src_install() {
 		domenu ${PN}-qt.desktop
 		doicon icons/${PN}-qt.png
 
+		insinto /usr/share/kde4/services
+		doins "${T}"/${PN}-magnet.protocol
+
 		if use nls; then
 			insinto /usr/share/qt4/translations
-			local lang
-			for lang in ${LANGS}; do
-				if use linguas_${lang}; then
-					lrelease translations/${PN}_${lang}.ts || die
-					doins translations/${PN}_${lang}.qm
+			local l
+			for l in ${LANGS}; do
+				if use linguas_${l}; then
+					doins translations/${PN}_${l}.qm
 				fi
 			done
 		fi
-
-		if use kde; then
-			insinto /usr/share/kde4/services
-			doins "${T}"/${PN}-magnet.protocol
-		fi
 		popd >/dev/null
 	fi
 }
@@ -146,20 +160,16 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 
-	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."
-	elog
-	elog "To enable sound emerge media-libs/libcanberra and check that at least"
-	elog "some sound them is selected. For this go:"
-	elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'"
+	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
-	ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket."
-	ewarn "Please, add into /etc/sysctl.conf following lines:"
-	ewarn " net.core.rmem_max = 4194304"
-	ewarn " net.core.wmem_max = 1048576"
-	ewarn "and run sysctl -p"
+	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() {