Rename OpenSSL linking license exception, and move it into the || group.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 19 insertions, 13 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 09d168f34686..e2783c673f7a 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,9 @@
 # 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.252 2014/06/03 05:23:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.253 2014/06/13 16:43:10 ulm Exp $
+
+  13 Jun 2014; Ulrich Müller <ulm@gentoo.org> transmission-2.83.ebuild:
+  Rename OpenSSL linking license exception, and move it into the || group.
 
   03 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> transmission-2.83.ebuild:
   Fix LICENSE which was updated with 2.83.
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5547a6a69d46..3477bb208683 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -8,17 +8,20 @@ AUX transmission-daemon.initd.9 2256 SHA256 06d047b47befe6aaf1b1542fdd50e84ea38e
 DIST transmission-2.82.tar.xz 3172024 SHA256 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 SHA512 05fbeda97e873b63f9d1fb15699f027112611346540da699e433e08763209b19278f5d5a513a0d4a24a9c4d0ff50115bb6a49b06d01fec8221ed91d60716d791 WHIRLPOOL bb50c1286d15ea0aa8b4bf00d4e4022bc0636c4c01091ed458bf3fd5ee7d80ed8cccec390dbf4686bbe6727c10e686233b081e17725da8001925ae4d95e91dca
 DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
 EBUILD transmission-2.82-r3.ebuild 3837 SHA256 849067f911561bdbd488365d5f79262c89565345e3f891d4dc77d7cd109ab4f5 SHA512 f7a9289b0e3caa921199cf7cd220eb9d7e5eb16e7b7129db185dd96e21b693e2d8e3db2f64a81ff26d79bc2c9f62ab693893eaa1371a6fb2ad8e387d9e3e5c33 WHIRLPOOL 583c9ac2a5a26759a0d4a6c9e3c7be89bb99912f66f8228364ba2ed0ec61da98342a0b9cd8c5061f9b9470666f98c5f934ee8d0f419e4fe473c51c398e5d873f
-EBUILD transmission-2.83.ebuild 4086 SHA256 39ad95a1a2d5a5e823cb18ac602bdb24d4a2725226bda783f5a11ecf2dca28b0 SHA512 5df41fd6b8f477f8d0f4c1f74a391cfb09a34b66bdc4d918903b56e16c1d82fffd69b701f7da535f0e42ce9abb553be89f076ed0bb14b7e8e628c9a1a2358751 WHIRLPOOL 34f68619a2417c8b03a6708cbc74950e579f7d5b6faaac450d8bcf2e8b0b4c08cc1c47d9b9f12d0d7c705e4fc0b45c2767bd863e6cdfe1e4f3bbbf952996dd7d
-MISC ChangeLog 43232 SHA256 203f79e855b644e292c9650d3bb1e17d7d3adca43e92cc62dbc040b42207571d SHA512 9005dc1b06a64fcbed1d31d07db4ceca12c534a190729883b528ca82d9c2302a0a9c8259aacc3f6088d6cb09f2bdcb42539b5bf9014f52c02de3fcd2d0989537 WHIRLPOOL 53038f17f69beb8439c7a7d064b01f9f973d6e4fa2d0a003987499b0a7c9fe1ca19b447a39d8bb9c939b5eb546815bd0a9ac13797c4e2edd6d10286874313948
+EBUILD transmission-2.83.ebuild 4098 SHA256 4dd913b2d47a0cf1a0670fa90f5412e29b63af6a3274cbd2217d14a34e34f0f1 SHA512 edd6e512726b09a793e0148766d6af3427b18a25b2c92654fb9e60b32f9d8ae883199fd670c183c586b40d73816ba86d8bc2ce46c20d459f8ce08b1ff6ebcc4e WHIRLPOOL 5bb441a955f4bffc9a7d7e5c0670adf5947d0d44d54476af48aa89c8acacaef99fdf0771e75cce947ec10cc935553da328f81a59a8c740a3b78ed2c1b0d82483
+MISC ChangeLog 43375 SHA256 f2cf46a002648ce36874704444d51554e9e377f33b40378e1593c33baae026ff SHA512 735f0fe7a903df44d8065b0aa8b290f8aa1ff1b24d1d844b5907f5155c4fde8210d9e1559c9c4d721def6e8fe9a41a20a45c65bc0493b982cdb150d4b1bc35d0 WHIRLPOOL 62c8a3df37f05a140783f03fee6234fa08d242083960acd81729a4e73468464151043dfa038defb59e57bff195ad1b3d08f0b45614a0d3e31393a7f37c4df7a5
 MISC metadata.xml 566 SHA256 ee4ef67c4bf912c1b5e529965fc45eca1f41dbebf76bcf785c8fc7b38a602633 SHA512 60ee8ea3d363fa60f5a1f94ec9d8fe7653465cb2fc3de8c92d6945f5cb01468f7af580149ceefeb8fdd866af7b5ae2143b584853bf3aa5fcc69408a21e4566eb WHIRLPOOL b3b4ed16faa68d7abb0519e025607c55c68a1ba0462992ac1e8b3e7f775dca278039391041097abcb1063b6cc5fa3f8741ecd76587fb3533c437d780ce4b0423
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTjVtNAAoJEEdUh39IaPFNY6AIAJ8k/qgTXqdTzpk8Xufwer2T
-KznJOioRTepbdXwCo2OFgUitrByOLubnMgpk4unY6gjddDIWNtnbH2t8J9W1DrLM
-YULISov03HnaSwTJHHP1EhAYdKrUAnrnKwmc4aejoLOFzuuETTFIUq9TjS+aBpr8
-e/GUq0bN4j6xxuHQtpknq+mEoZTIi1/npGuw32pRUSzKgi5vi4Co1prGBad8Hq8G
-JY3vCc3oBc+KOYLHKf0asCegsgTAlgFLWCU4F5K3gPObvteLi2atswYafGUnXuVs
-W1YnBlTR+NLMZyJm0c6aAGiR28/f7tPA4SDGFuOyIptevQ9Q0HKdh3k1gyl34FA=
-=sB1q
+iQGcBAEBCAAGBQJTmyp0AAoJEJQzkH1pP7W46woL/i+iTMlk+8ASoZgiQj3WHK+D
+oWgKgjbTRjcpy+PlCzkoOP6GsvWOoSpeJtl3bXkNxXBubpltCizbIyIPerTQjnLp
+iyG1nmg3HSIHFgfp7c6BttqrFPtUUqvilmuO2fMHFuX3Xi5xjddt6gHZKhkkwf1C
+lfddoTYttutqLfF7j/MPXkmLqJadRA39430Mqp0WhCvtU/kCbHBnLPFSfOaJ9Ga0
+8vglle2SlMM8i794X28vwxrGx3U9pqJr+MaJKsMUAqRYGDJk/7o6RfRtNfIbfDKo
+aNpfekKRyTnerKReuUgB5OrTYmGjSq+nQMrGFRCsYkPi9of12VL/zzg+W5u137FK
+OsXSrHFCM0Pds3LOca4drxECgf/hUfWWGo+gTqNWMT8Pfe6r8igNDtq8Y5V435Mh
+2jN/YAiWgkhPq130z8WpqWASQ01ERl9jM+icii6uRvqi06LZgJjiGyuAIeSY3Cq+
+z/YVgoP62F75h5sg32EfeavvhScs/MmZ/hHkpeQm0w==
+=VDv2
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/transmission-2.83.ebuild b/net-p2p/transmission/transmission-2.83.ebuild
index 27bfaff4115f..c30f2f0fe241 100644
--- a/net-p2p/transmission/transmission-2.83.ebuild
+++ b/net-p2p/transmission/transmission-2.83.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/06/03 05:23:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.83.ebuild,v 1.3 2014/06/13 16:43:10 ulm Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime gnome2-utils qt4-r2 systemd user
@@ -12,7 +12,7 @@ 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 ) GPL-2 MIT transmission"
+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"