From 0a8fe34bcc6d9bf85735abb4320955c88e44f1ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 7 Jan 2012 00:38:25 +0000 Subject: [PATCH] Add MPEG-4 to LICENSE and change LGPL-2 to LGPL-2.1, bug 357779. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- media-libs/faac/ChangeLog | 7 +++++-- media-libs/faac/Manifest | 24 ++++++++++++++++-------- media-libs/faac/faac-1.28-r1.ebuild | 6 +++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog index b36fab7913ca..e38c25eaf472 100644 --- a/media-libs/faac/ChangeLog +++ b/media-libs/faac/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/faac -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.81 2011/03/06 11:29:18 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.82 2012/01/07 00:38:25 ulm Exp $ + + 07 Jan 2012; Ulrich Mueller faac-1.28-r1.ebuild: + Add MPEG-4 to LICENSE and change LGPL-2 to LGPL-2.1, bug 357779. 06 Mar 2011; Kacper Kowalik faac-1.28-r1.ebuild, +files/faac-1.28-altivec.patch: diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest index 3add32ca947e..73a75d3035d0 100644 --- a/media-libs/faac/Manifest +++ b/media-libs/faac/Manifest @@ -4,15 +4,23 @@ Hash: SHA1 AUX faac-1.28-altivec.patch 964 RMD160 892eafd60e8aaacfb5c580e2785f0675595c6b1e SHA1 79e403c5b6528c556930e4927e7e5cfb5cd24fe4 SHA256 36647018413fd0804762ec6dfad1c4c26566ce67130a5052172639d3d5c68a03 AUX faac-1.28-external-libmp4v2.patch 1766 RMD160 fcb3567d6a3752e10a0180b9d0937b3211de59f3 SHA1 790f83abaecb458f67e627f04b1eccfbbf2be2b7 SHA256 8e0bfe501acb7f31a701ab2c797c2ace539ccd60e5f5b3c0ae538bcd5719c1df DIST faac-1.28.tar.gz 678891 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df -EBUILD faac-1.28-r1.ebuild 1033 RMD160 bbbb7b800337a8f2777695aa0d6fa659abfe161f SHA1 759b7d4dc826bb81d10957b78f4423597515b473 SHA256 c1f2c0025f83a8075e5c67c03684964590a83a736d296e5ce2a00abfb9274776 -MISC ChangeLog 10085 RMD160 b44329ec348dd14b90c5adf98b7cfac2300d7f2f SHA1 a8652629459f723677f93ffb4de95f184ee467d9 SHA256 98dc58cd0925086a62b3c74358502f0356058c27f4f49f246b47ededc27e0fad +EBUILD faac-1.28-r1.ebuild 1035 RMD160 0f595bb17adb61e172dd18939d73a3f7e59bcfd9 SHA1 73e1ae6616c8c2129cf8391d6afa7eb3460b40dd SHA256 4dc194e74ec4d434b8af448f0016189ea941be11297674b84f4420a70106d079 +MISC ChangeLog 10214 RMD160 4197b6128bb30f7d0e9915f4b4d3956ce310dab9 SHA1 237b55a30a44a0900b0c90502c7bb5ea59c950e5 SHA256 21a3a8f8b347a9cdac420097e1cf35f1c7b1bd36033cdaa2a7ede69e4892e6c6 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk1zcBQACgkQIiMqcbOVdxRUuQP/R9o1Y118NSwUNNMZwE91WjlL -p2ZTqIupAufCb7CYsMCL1N6D1wzS0sZVHKtJricbNb4bkaJ1neyaL7EFa2qvcXxE -uAYVlMztJtKODCipO6FuR4P4aqy8o6AASpkThifOegC9gCZDs3ZMjem4UJOJCLDq -2WnkKgEC+qFJu57+07I= -=hCJC +iQIcBAEBAgAGBQJPB5QHAAoJEDxpGckxwJCBAAsQAJib2ONMOKcFqVD3YT1n5sLC +5cjBxhQeM6IKRTpRxoPUxXyJi0bzmp7iucFR9s4C+No3jwvlXJw8yL/qpsKiqWaT +9g7zzguk0gjd9vkRXKpjay2Bbn7itrIn9cHT92rb5cELcpZ4UdYZV11WUEqCvJDB +4/QqavQbnFg3fk1PPvWm7GqsO2xoAm7PqHCvJRlrIeixoRwAZziyEXzfpUK/jtVk +tcmdkoNjyTm3ubTlz1NHnQf46lJDpLav3hFGTRZGC1GtmT/+z7L2DHiZQN+N1jM3 +vjVWumBHUY0ZSCj6c59F7dIq47brli6eYcbIi6sfBaZBr5/8hYJG7QXSZLwTbazC +vXW8i9C6gwdP/Zg24m/PWCexH88OP5N0OtRblVuYwCPz039Dn1pD23ocjxFTg1/Q +6c1ZnOukLkdnOCsPtPgoMffjsoAtHK3ArvG0+UDLoOeYSoOCuO/EN8gTU7rVvGou +0YJzmn94N65nK79xTZaNpF2BK1H8qNSEYpb7IiLb4bQuMLkJ44+OWS8eXLLKwi+n +tPssxi+fabCOHuhnjIw6Ot1FMCSvYnTyjxsZ9GjmKW1g2fabqaCoR9xw88J70NF4 +HIglUvNt9cV52gKIGXr/hfkHuebHk5Ieq/EBzW70HlWmUFzcp8oYQxTUVTQXmm3P +SW4PD3HrAH+prGY3weVV +=pHzw -----END PGP SIGNATURE----- diff --git a/media-libs/faac/faac-1.28-r1.ebuild b/media-libs/faac/faac-1.28-r1.ebuild index 74bda8406624..ec308ae6d28a 100644 --- a/media-libs/faac/faac-1.28-r1.ebuild +++ b/media-libs/faac/faac-1.28-r1.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-libs/faac/faac-1.28-r1.ebuild,v 1.11 2011/03/06 11:29:18 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r1.ebuild,v 1.12 2012/01/07 00:38:25 ulm Exp $ EAPI=2 inherit autotools eutils @@ -9,7 +9,7 @@ DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com" HOMEPAGE="http://www.audiocoding.com" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="LGPL-2" +LICENSE="MPEG-4 LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="static-libs" -- 2.26.2