summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-06-27 20:30:28 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-06-27 20:30:28 +0000
commite34e7bdaab09982b6f7c8a446a4fa83bd5ef50d9 (patch)
treeac54c07d105c5ea98066bab81e7a4c5d608cdf87 /app-emulation/emul-linux-x86-medialibs
parentUpdate ldap patch to fix segfault issue. (diff)
downloadhistorical-e34e7bdaab09982b6f7c8a446a4fa83bd5ef50d9.tar.gz
historical-e34e7bdaab09982b6f7c8a446a4fa83bd5ef50d9.tar.bz2
historical-e34e7bdaab09982b6f7c8a446a4fa83bd5ef50d9.zip
Make MPEG-4 license conditional on whether we whip faac or not. Bug #475028 by Ulrich Müller.
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'app-emulation/emul-linux-x86-medialibs')
-rw-r--r--app-emulation/emul-linux-x86-medialibs/ChangeLog7
-rw-r--r--app-emulation/emul-linux-x86-medialibs/Manifest10
-rw-r--r--app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r2.ebuild4
3 files changed, 13 insertions, 8 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/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index 1938906a822d..46c5d4808914 100644
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -5,14 +5,14 @@ AUX remove-native 842 SHA256 a94be1ed799eb91ed7cc26c1d4569e59028de47fe8ea2fedb28
DIST emul-linux-x86-medialibs-20121202.tar.xz 10366156 SHA256 87a7adbf1587d357c74372c33cdb5a8a22f201943ef57dab7ed56492770830dd SHA512 f46c514d15b95da0657fc9fb1c852a93d60aeb35d4532ce2dd66481b22911ba8f8e504879a02f9840b3cd4bf40f0732b291e0fe7d5085a7f409fe9c529569a4c WHIRLPOOL 0a286593163d87c6b9f8efc5629cf9b037923f05af82bf12591e1f1d0a3fdf3fc95f13950f15f49b21871886018dd4d171ec3e5d6b442d8ee02ba883923936e2
DIST emul-linux-x86-medialibs-20130224.tar.xz 10416488 SHA256 a23696b51754cb838227bf24c81a785b980ad8b492a58b80623004d4634d2ed1 SHA512 56a17ec80c583f10e6754ce0101182d2d6895637b09cb3c3963663b8d3387f86de9d7ba07a7a880c22007ebc42dcfde2f63318a487825b38f4b1d1f1b15041a3 WHIRLPOOL 5d18b4fba7f24ea5fc6b212e2d67b04bfee3a8d80de11c5a53d7c684c94b0227b644e8b3f5ae420fbdd3e0b91fa818be757bb0ddbd7858d0eff1902e23d74f57
EBUILD emul-linux-x86-medialibs-20121202.ebuild 815 SHA256 0f3a03243a1df921ec40e2671981b6f324a7ff8aa144c28b4d15dd28cbe6e7ef SHA512 7dbe3cf512760b81e7f679a3af89a0f2c16f745c5cd63e9bb9a6ac9ecd44b8cdac331c507a126f11ae0692f37e7cd55b50dad7017e5851c87f123cf49bcd344e WHIRLPOOL 70bc018e88786b34ac3997f4bfe9d29a212fcb2b3015fc17a4bdb502d9ce7a3b0abdcadfe9154f5cfc234a901e56b6e281090b578c342392636adaec36e24f5a
-EBUILD emul-linux-x86-medialibs-20130224-r2.ebuild 1262 SHA256 894f8005f78963b950663a51ed1cd2d491b6e40f36d0abca7bf6292353e1a627 SHA512 87e59f36ca9fb291f6a0d5c4490f4abf4d86d077bc1459590757d00c01a4d4fea5f5bbabb452905d36cb43efae39f33e4e2945eadceca575aa3bd4f0d5c40860 WHIRLPOOL 1530535d11e983107f850783a7abde4e8559a46e3be59cc8e312d52ea4996e2183b76dc6f9c7d6a0fcdd64b9c5a52b488b102492b7935162ae81ce0df95a7bec
+EBUILD emul-linux-x86-medialibs-20130224-r2.ebuild 1279 SHA256 5853ab95df056ac6a98b1310c3e09b6b37ebb92a8645d13e119bcb1979031947 SHA512 b0b1f0af1580c99819c346616e95d750401776a2dc0547814a56d9beb2d8bddf00d0de340f274fb11f65ce4f72a967716193c2d35bf5e0b26604fd876b4abfc8 WHIRLPOOL bf1cf431b4a4973a8721b4d4a2c75f0a12ffa3a40b576f9dd92cba55c51f28818f7a51bef0cd517de226bce80665d35a606a678d896988fd4badb3aeba34fe2a
EBUILD emul-linux-x86-medialibs-20130224.ebuild 862 SHA256 67b65c3b1df77b3a800f2317bab2c7322fa5c4656e708fe02851f2d33c5c5a50 SHA512 a121ed6e95d965a5d803829e990242300f6b4dfa49e2d3acc07436e580f468fa40b03a5a7362fe59fa01145e88a3890aea2024d0936168b421713ef203556394 WHIRLPOOL bd543f51049295b92ce8b4bb2f3523b7ac87f5088f0cd0983080f691862a32ab162946418b913bc05298daaeaadeba4b799d6b8a264ef0f2ec2e065def969e1a
-MISC ChangeLog 12764 SHA256 83022f4135e64a01fe5cc7814fa44419b474b0491845352be1ae5e69d6215632 SHA512 8f42176017a77b51e5c881d309c4c6edf792489147e84676fbd1c06dec624a02196d37ea028cff7b32ae27cb72c64e88d0705d2a668eec196d2bc4482fb1df76 WHIRLPOOL 4f6ea4045940d157dd89795facd622d0516c40073a25451f757f5e15be6a358cf53a99c00822e2e3e1594995a904661f4af016458c3c932054d3261d9df79f4a
+MISC ChangeLog 12963 SHA256 b4cf30faf2cc73c0fffd09624be74e0c364a6f1a916b8642ad45bb3aece09864 SHA512 c282cc87c1bb5dcafedc7944cfc287a4dd83ceef341cd564072e0e1be4ee4fd985fb5ba8bdeeaf8535ac231eeda75af9315d58c4a0f650c6d61b48d302177035 WHIRLPOOL 075545a3a9b51e2cd5f50e94a299826c9d1a2fd74b7d4699f9e33b637cbef0c18078e5fa200e017b07de111fa398919fb14a780040582cd93dd97d34bae515d9
MISC metadata.xml 225 SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453 SHA512 924fc3abc73e518a76ae8255dc51a98e2a96c5e0312b15a3b5f12e278b2b4345d0de8a7a2eb91dbad0b9e55e2c38ccc215fac8b07ff73ccd2fd9843e68531cf5 WHIRLPOOL 9ecaf784ea9cc1ae7e81cead25eb99cff6f61247a2f33ccf27782ddb17c2642f63a6892b9b664015d4f278469b2c8ef93b9f69b9a6d1f15cfcc55ce41451c503
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHMZwUACgkQvFcC4BYPU0r1gwCfUPh62iNXkx2+I0DK/anWr1U+
-OE8An3KnJ1PEy7/+E2OaiIVKsLU+6ZOv
-=LPxv
+iEYEAREIAAYFAlHMoNgACgkQvFcC4BYPU0r44QCbB9TTBP5lST4e2rK3QOslHFRU
+4uQAoKjGazjQCiJNyY7gtJx7gfkiRW1K
+=OaG3
-----END PGP SIGNATURE-----
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"