remove old and update emul-linux-soundlibs mask

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 12 insertions, 56 deletions

diff --git a/media-libs/libogg/ChangeLog b/media-libs/libogg/ChangeLog
index d9a76623d6da..a9ecbd3e5d05 100644
--- a/media-libs/libogg/ChangeLog
+++ b/media-libs/libogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libogg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.92 2013/06/01 06:46:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.93 2013/06/26 17:48:05 aballier Exp $
+
+  26 Jun 2013; Alexis Ballier <aballier@gentoo.org> -libogg-1.3.0-r1.ebuild,
+  libogg-1.3.1.ebuild:
+  remove old and update emul-linux-soundlibs mask
 
 *libogg-1.3.1 (01 Jun 2013)
 
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 40e8adb7f8a0..e3a61d4d58c8 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -3,19 +3,14 @@ Hash: SHA256
 
 DIST libogg-1.3.0.tar.xz 289384 SHA256 231725029c843492914f24e74085e734bca6f1d6446ac72df39b0c3a9d4bc74b SHA512 d99f7285d1d92940e5e82778f208afe615ff44384b373d81186a57a77d57a8c7f5e3347ea9ad99dc87cd6091e41ed8f47f0c3277e6a113dbb157c6aa6dd0f357 WHIRLPOOL 75954c92b475686f23d3da9d2970f04271865c2617a53e4e0f38336991bcc0a8171ed394b48048b4bf91aff85951381a7360ffb0509158788688666c395a3c6b
 DIST libogg-1.3.1.tar.xz 406840 SHA256 3a5bad78d81afb78908326d11761c0fb1a0662ee7150b6ad587cc586838cdcfa SHA512 980d8916b5d6bf22376105869a9b9d5312cee81f0ff1f6aa9f34359e92a93b7b34555a4c4f124922d87ef7e48a4b9451e35d9b536929b9144fcc22bcf6debbf0 WHIRLPOOL 474dd64231cfe39198a90a3c06ce2075e31fe2eaa72bf924586e34fbd505c3b21e1c57c86f12bc9a2e30f2a124665487592174ca5ffc63e01fd9f65dafff94fa
-EBUILD libogg-1.3.0-r1.ebuild 1266 SHA256 adae3a5bb0586040a2133075578d82c6711d1d38887baee16cc71492db7a3c9e SHA512 6fbbc0d3fe1df3ecccde1bc3ea8f791860f11c27c92ef97952d076fa48b1d1de9c23f2401eb1a974356485f7d090c592c2b4d055e4305a30b6c4ed2130568a62 WHIRLPOOL 19519ffc518bd809e05cda67823d6712002f4dea66bf9bdeceadd2aad8933f6461c8bd66fcc43f183200b5269843ee30bc241aa22c9e3784067e4e71cf988e15
 EBUILD libogg-1.3.0.ebuild 877 SHA256 60108a6840906fed56ebf67c9be9e6e2a5003efdf4799afdcdaa6211b01b852f SHA512 92907adef9130b3db36713e142f10988f91d3581f16c0f3b158b29822935eb1ffb71808b00d3159c13c94ce2118519f0d0fbda8006a6473f2557bd363a361b08 WHIRLPOOL fa02b0dd1cbe6e88aef57720e55cef8769b475d6930f5148dfa20927eac8f57ecd0b6ddf0b217487fdad2a3da85daf9f269220161096266ec1dc835aa92e5c53
-EBUILD libogg-1.3.1.ebuild 983 SHA256 71042d5d4fd59125b23730621649ca868f607fad953859663d90bdb7c97ffb57 SHA512 e07ec8416730265a649348bcdfe48ebf172b4cc8e5488fea9f410b21fe2f3d324f51cd60a7a9f71fab088b7bfdd41037461fc7fb9835c6624c4f298325fb7347 WHIRLPOOL b2be835bff4b38b1574226ab68104df72fc63814980637facd51e14ecf3b0c3e5c891e5a79fc9860e1070bb1f979be6820c7220edcf9ac4805167f4e9939e41b
-MISC ChangeLog 10496 SHA256 e6384e7b5b9f460fd0d9e14111f17963d321b25bd9ac3628430f587eb58b4a01 SHA512 a68d8f8cb023681f1e2b85aaa1a4c9b798afb3c167306e914db5c07a1714be5d62d65e9ab512962da312e3604a43d2a7a97b575042c73bba95212422a2a43eaf WHIRLPOOL 55ac46f896af7e7439a47acf63ffe6e0da55c0dfb4993d43e1b1608b7f1cef1a40be02a137fc91a4785cf6d069d21a7ceef9dc78996472707da98f4571094049
+EBUILD libogg-1.3.1.ebuild 987 SHA256 19a73c9dc05e1a2cbe833571ab28d525d5a6c6b4af9ed33c8899bdc943acaeee SHA512 816e04fec3d3f4bc56ec81ad4b53123614f5bd440055b650bad0a6d6dbb6747e999f0455258f08009da410bf81bee1d2a0095cd18703dd7d88cb616df27522b9 WHIRLPOOL 5880076a075ca38163db209fbd2dec372d616ce07af4737322730f09f72c46e41917cc3845147f5918738927bb644e7416f58352aacb5dcab1c84a4e5baa2126
+MISC ChangeLog 10646 SHA256 6307f116d767c2fb5011481e2b50434e9add563a2f6ee14b118a3249c2489172 SHA512 62695b584d8c59ddb572e9ba5cc554a48e4a3e4488c735440308a588a06278c0b6170f00ce89a0c36bca6d0419dba3ea3fdc90876bcf80469d88f00ca1a0d5f1 WHIRLPOOL 7d5732571339c3d71580c15dee8ca227d577c1fa22950bae5cfc512ee8f0785bb2bfedacd2de6e52c5de26630d25fd3989f7b11e1754eff86b56702de28e224e
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRqZhiAAoJEEdUh39IaPFNWpcIAJMueHSw7EKPdNgKEl+Xk6DB
-rxkfWO+S2SGrtxT1CcAOhEc8tc2KRIZ4/1B4Fo9dCgkhbAnse61V/fnhKdcA2AEi
-1nb7JyORpuJAqfZ4McxrdlJJNNmSbzzI10VD0bduMCYo34cD0Vurkj5/zVy4Qdi4
-SUjS20Nmrkhs28UQQW/VyovTbC2GmN2sKMLOToFbWBVOThXyA4pQXu2aG4c9vPub
-OKl23tpfadMwvtLc3YMj9Lk6rNfZR03zvlRt/E13EBp3XpMrcnGpcaT65CN1COZV
-Q+EH/nLh6zmkxJxRpkqZiQzAeDShDdZbxRUOe8IVmyTHReaCY5peyxTq6ruzN6Q=
-=MX7x
+iEYEAREIAAYFAlHLKVcACgkQvFcC4BYPU0puqgCgkbUV/Jc88RDEnp3OCHCT4vJ4
+qzMAnj9J9e5E5J8uusJ/fE7xD0SjjU0R
+=zPOl
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libogg/libogg-1.3.0-r1.ebuild b/media-libs/libogg/libogg-1.3.0-r1.ebuild
deleted file mode 100644
index cf1f09be5578..000000000000
--- a/media-libs/libogg/libogg-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.0-r1.ebuild,v 1.4 2013/05/01 21:30:07 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="the Ogg media file format library"
-HOMEPAGE="http://xiph.org/ogg/"
-SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-DOCS=( AUTHORS CHANGES )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ogg/config_types.h
-)
-
-src_prepare() {
-	# Fix automake-1.13 compat, copied from libvorbis.
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die
-
-	# Un-hack docdir redefinition.
-	# https://trac.xiph.org/ticket/1758
-	find -name 'Makefile.am' \
-		-exec sed -i \
-			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
-			{} + || die
-
-	autotools-multilib_src_prepare
-}
diff --git a/media-libs/libogg/libogg-1.3.1.ebuild b/media-libs/libogg/libogg-1.3.1.ebuild
index ec9a5214b52f..8a78cebdbe8e 100644
--- a/media-libs/libogg/libogg-1.3.1.ebuild
+++ b/media-libs/libogg/libogg-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.1.ebuild,v 1.1 2013/06/01 06:46:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.1.ebuild,v 1.2 2013/06/26 17:48:05 aballier Exp $
 
 EAPI=5
 inherit autotools-multilib
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE="static-libs"
 
 RDEPEND="
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
+	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
 
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 DOCS=( AUTHORS CHANGES )