x86 stable wrt bug #396521

Package-Manager: portage-2.1.10.41/cvs/Linux i686

3 files changed, 12 insertions, 13 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index c303a794f2a1..23fc113c1242 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.658 2012/01/14 16:52:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.659 2012/01/15 15:47:25 phajdan.jr Exp $
+
+  15 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> xine-lib-1.1.20.ebuild:
+  x86 stable wrt bug #396521
 
   14 Jan 2012; Christian Ruppert <idl0r@gentoo.org> xine-lib-1.2.9999.ebuild:
   Add support for custom user patches.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 036f593196e0..d38b32b0e159 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xine-lib-1.1.19-ffmpeg.patch 12127 RMD160 2b70139da2f4832e3577a667c352257dcd610dcf SHA1 d70f14c3dbb59b65c581575fa1fe13aeeb38f1b1 SHA256 6ca05a1fbed6eeee19e822da2d789831c3f2593cb0d430385416ae170bc3c48f
 AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
@@ -9,19 +9,15 @@ DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a904
 DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a37c5 SHA1 1dbd48e14113739101429391d45f65ebbf6519fc SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb
 DIST xine-lib-1.2.0.tar.xz 4878972 RMD160 17b73f43e2dc440137727f65d401c673273b1265 SHA1 5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d SHA256 93dff67d07ff2230fac68e64259a72f8a007f4c3fae01b4dd580f74adea78c6f
 EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da
-EBUILD xine-lib-1.1.20.ebuild 5417 RMD160 fc6944c1bd57a0c69cb223aa65fb3c1200ba8255 SHA1 745c02feb72f331cfed8b4d83b63baa858be7125 SHA256 78ed6bc09a48de1df95c0884e7df2c2f71bcf11ef3b50353c0a6943454099bb6
+EBUILD xine-lib-1.1.20.ebuild 5420 RMD160 1076fc17fde5b9fcf8f06c936c878120d8f19c40 SHA1 0ff249f671e05f44cab494378de2b402490fde57 SHA256 1620fcf30b89d39ce145dc3a29eaf4bf45eaf0961fe1905c3cd3ae6dbc6ba173
 EBUILD xine-lib-1.2.0-r1.ebuild 5145 RMD160 6f4f9c44bb36c6ea8dfc8ef4e85b23463ccdc7e5 SHA1 a344cf557a0769afeafd2769d4912dfd2d7de6c1 SHA256 dd9a0adf36573cfc10563e201fbb57fbc221b2535d37a58faad6971c3321c6da
 EBUILD xine-lib-1.2.9999.ebuild 5163 RMD160 fd641aafdc8fee17b49d54d77f98eee4fbb1df08 SHA1 ce66a4a34f4c784bc88524ce337231f2a5f4ebeb SHA256 abfb6935a743bbeb79cf54819ce4c101776cf6fea0dc20983e162b6d8acecb5c
-MISC ChangeLog 76854 RMD160 b5a9701f4ed6d2848dc04ae227f052a5efb4258a SHA1 e292a55921709e84e5b96e23cd37de8aaaa6fa74 SHA256 874247d1c0d243f2f9b38a8dc10dbea72e13586dfd2b6df77620e265937899af
+MISC ChangeLog 76968 RMD160 3c5c4ede6450d8d948a1347f8a7ba429dca80330 SHA1 471dd02f0c93e710c68a79a35948d50b3a49d4fe SHA256 1530dc68ebd06949439f2121b2479340fc5f64cb2bfd151279ad5ae79ac061d3
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPEbLKAAoJEMOx0zmdw4Z1NSAIAJt4soZiYkzZon1uIzzfEhhy
-wMmHDF9bZrvs6xGap90R9yJfBgiGWy/FdFEiQXweoPn/rQdbtPmJXYAzqadWQ9fx
-ooDZ0L3nKz9CP3RinbbDm8DPVVPpL6jP+Y3ZRTsBk4Yl/vBcwo3mGkqNHSEi8/Pe
-sdnpxSrxLo8aRNIfzyws4hIwk6pfr9eFuXvCjhs34j/G4lmZzFPC4CsDGGKxWcu1
-InPS8cCp+R4u/JXEfszRjqgStMCsyJsY8oGMyOFC+s8QLN227BxImo0s4ZDVGQMP
-a104f39/IoI/lrCdvwFzK4movfIDeA4WMZuSc8iMBPUBXY4BxvJmg0vdtk9flYM=
-=DxCp
+iEYEAREKAAYFAk8S9RMACgkQuUQtlDBCeQJQnwCfaejLz1TzuQcSE1/zQ894lu7R
+c30AnjvIx32zNJToT2kiXOlQ11YWmO9x
+=bVua
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.1.20.ebuild b/media-libs/xine-lib/xine-lib-1.1.20.ebuild
index acb98632465d..3eb5a919aa61 100644
--- a/media-libs/xine-lib/xine-lib-1.1.20.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.20.ebuild,v 1.4 2012/01/08 21:02:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.20.ebuild,v 1.5 2012/01/15 15:47:25 phajdan.jr Exp $
 
 EAPI=4
 inherit flag-o-matic toolchain-funcs multilib eutils
@@ -21,7 +21,7 @@ HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="aalib libcaca win32codecs nls +css +X directfb +vorbis +alsa sdl speex +theora ipv6 altivec opengl aac fbcon +xv xvmc samba dxr3 vidix mng flac oss +v4l xinerama vcd +a52 +mad imagemagick +dts +modplug gtk pulseaudio mmap truetype wavpack +musepack +xcb jack real +vis"