Fix license identification.

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

5 files changed, 22 insertions, 27 deletions

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index 3d37ee00ff7b..1a7026d96682 100644
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/rtmpdump
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.19 2011/08/10 10:41:25 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.20 2012/03/20 23:31:29 flameeyes Exp $
+
+  20 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> rtmpdump-2.3.ebuild,
+  rtmpdump-2.4.ebuild, rtmpdump-9999.ebuild:
+  Fix license identification.
 
 *rtmpdump-9999 (10 Aug 2011)
 *rtmpdump-2.4 (10 Aug 2011)
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index b5181e92ebbd..892821a74544 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST rtmpdump-2.3.tgz 125103 RMD160 1d48925e6567783806fa68819d6a695cd06138bc SHA1 b65ce7708ae79adb51d1f43dd0b6d987076d7c42 SHA256 ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
 DIST rtmpdump-2.4.tar.gz 134575 RMD160 12eb0ac4b2b68c004e75f80b9365a508b84b9787 SHA1 6a685b4f73eecb984403c36df593c412cd66febc SHA256 51f54d37907f19bfa00219d57ec6e12d09458bb31360e8cf004883df745f094c
-EBUILD rtmpdump-2.3.ebuild 1918 RMD160 d29b1877f763bc7d68056fc5c57ffb7b4d9f1961 SHA1 cd3e62992cc766611cdba5025abf005935ee0afd SHA256 b347efd0ff8a66c416dba41335529982347f2011c571a5cf843472103eab91cd
-EBUILD rtmpdump-2.4.ebuild 1854 RMD160 e9bbd4db2aa47b23f2ee43f01f44783e560ca588 SHA1 d4bfdc5f4eb5f26cd5924a82583c811f7634381f SHA256 87fcaee97aeb8a144323064ae620b44607037b9c9c005a02c74324321408e13b
-EBUILD rtmpdump-9999.ebuild 1799 RMD160 07db9acc7e634dc1d220e31b55e363b85f97ff41 SHA1 4c51bf0723b4df0c18f2c0cacb296b630036ff06 SHA256 52e9f7035ecc70969ddcb20d1afc8d7803152618c1bfc2cdd2a94e2ec0843c64
-MISC ChangeLog 3216 RMD160 c7b64e0c544fec4cf854b261b2f243762ac37269 SHA1 67cc86a430dbf5eb4e34284b4c24a5a878c05fc6 SHA256 fc8ef206a110f71d20efbbdfe96d92cc1c5aec0d3f3322b6a556d54c2dc112cf
+EBUILD rtmpdump-2.3.ebuild 1976 RMD160 3cea5bc50b65e771288ea5f59b336acd3efc4c34 SHA1 78c30936124be8b1249b9199a633a9e5cf96b3c6 SHA256 ef6d5974a116d8675a47c429361d759502b76fae258d032257cb839b8f7fcd35
+EBUILD rtmpdump-2.4.ebuild 1912 RMD160 58685748156744b833745c816fdb5fa7ea2ee701 SHA1 ef524a0a2715fa1e3aae13c05c0b93508e954e62 SHA256 4c89800f1f1c2dc8d5272be908478f1f9b00ed933fecbd6fd85e849e5104c815
+EBUILD rtmpdump-9999.ebuild 1857 RMD160 7007545dac2835f21d30fb3e9f673101c46c0179 SHA1 8544bdf74f5a51e2e67d2235bb5738bda84ca48b SHA256 f623c2f4f0de3f2c2f5995f26a46be91bfb089cdc6bfb8854d02c5fde7926dd1
+MISC ChangeLog 3370 RMD160 20140e0815d24744631700aa538edb7bf1d0e2bb SHA1 ce6634d8784f5405fdf599eb2f77c259ffa0fdfb SHA256 b4336c6068c6263eb1db25c7d3527ff2bd2b002542928c5e49c2ad4bb44c06ca
 MISC metadata.xml 451 RMD160 30efbba171af8664c976eee583af384258e35b4a SHA1 2fd2ff684a755022a53f5731e3034e09f686e6c1 SHA256 65260e5ca356283485990adad74d70c6593f402a90ed2ac5c307d45f4e98b1d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59p6AACgkQfXuS5UK5QB0qdQQAn1MUWSCgPcDLDxtKhZLcto+u
-VRVCM6W79Lc2mqPddo1Mhte8Y4CVEMgsAs5cTC9F6v6TsmIeyorxIuwpGJgVUAEN
-fOryHH9B7VAXpWz2ey/jXA0XKz4FW/1EeCCEvh5tgkviiLiBExvlyCyx8JjaaycH
-cYsDShb6GhmY2/qAoFM=
-=kvlQ
------END PGP SIGNATURE-----
diff --git a/media-video/rtmpdump/rtmpdump-2.3.ebuild b/media-video/rtmpdump/rtmpdump-2.3.ebuild
index 0718e54ddd47..31ab120491a2 100644
--- a/media-video/rtmpdump/rtmpdump-2.3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.12 2011/07/07 03:57:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.13 2012/03/20 23:31:29 flameeyes Exp $
 
 EAPI="2"
 
@@ -10,7 +10,8 @@ DESCRIPTION="Open source command-line RTMP client intended to stream audio or vi
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 SRC_URI="http://rtmpdump.mplayerhq.hu/download/${P}.tgz"
 
-LICENSE="GPL-2"
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="gnutls polarssl ssl"
diff --git a/media-video/rtmpdump/rtmpdump-2.4.ebuild b/media-video/rtmpdump/rtmpdump-2.4.ebuild
index e9895814370f..4d08904e4466 100644
--- a/media-video/rtmpdump/rtmpdump-2.4.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4.ebuild,v 1.1 2011/08/10 10:41:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4.ebuild,v 1.2 2012/03/20 23:31:29 flameeyes Exp $
 
 EAPI="4"
 
@@ -10,7 +10,8 @@ DESCRIPTION="Open source command-line RTMP client intended to stream audio or vi
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
-LICENSE="GPL-2"
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="gnutls polarssl ssl"
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index b5fbfa90d8cf..15ad8e09640f 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.1 2011/08/10 10:41:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.2 2012/03/20 23:31:29 flameeyes Exp $
 
 EAPI="4"
 
@@ -10,7 +10,8 @@ DESCRIPTION="Open source command-line RTMP client intended to stream audio or vi
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
 
-LICENSE="GPL-2"
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="gnutls polarssl ssl"