diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-27 20:30:15 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-27 20:30:15 +0000 |
| commit | ce5356d37b3708363f509a53cfcd1171d475eaa6 (patch) | |
| tree | 0e4733ab290bb4c89aa8a6d0a90af28528b7dd34 | |
| parent | remove shipped config.h since it causes problems with out of tree builds, bug... (diff) | |
| download | gentoo-2-ce5356d37b3708363f509a53cfcd1171d475eaa6.tar.gz gentoo-2-ce5356d37b3708363f509a53cfcd1171d475eaa6.tar.bz2 gentoo-2-ce5356d37b3708363f509a53cfcd1171d475eaa6.zip | |
Make MPEG-4 license conditional on whether we whip faac or not. Bug #475028 by Ulrich Müller.
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | app-emulation/emul-linux-x86-medialibs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog index e9edf4deaf43..d4dabc5a3043 100644 --- a/app-emulation/emul-linux-x86-medialibs/ChangeLog +++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.69 2013/06/27 16:23:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.70 2013/06/27 20:30:15 aballier Exp $ + + 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> + emul-linux-x86-medialibs-20130224-r2.ebuild: + Make MPEG-4 license conditional on whether we whip faac or not. Bug #475028 + by Ulrich Müller. *emul-linux-x86-medialibs-20130224-r2 (27 Jun 2013) diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild index 8deab1713d14..a5331c355821 100644 --- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild +++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild,v 1.1 2013/06/27 16:23:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild,v 1.2 2013/06/27 20:30:15 aballier Exp $ EAPI=5 inherit emul-linux-x86 -LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 MPEG-4" +LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )" KEYWORDS="-* ~amd64" IUSE="abi_x86_32" |