stable on amd64; a bit preliminary as we need this in the 2007.0 release

(Portage version: 2.1.2-r13)

6 files changed, 9 insertions, 58 deletions

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index a45ba2ac8417..2d09f55e4be8 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.16 2007/02/27 10:55:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.17 2007/03/02 15:04:15 blubb Exp $
+
+  02 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-medialibs-1.1-r1.ebuild,
+  -emul-linux-x86-medialibs-1.2.ebuild,
+  emul-linux-x86-medialibs-10.2.ebuild:
+  stable on amd64; a bit preliminary as we need this in the 2007.0 release
 
 *emul-linux-x86-medialibs-10.2 (27 Feb 2007)
 
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild
deleted file mode 100644
index a083e46c3b3c..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 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-1.1-r1.ebuild,v 1.4 2006/03/09 01:48:18 flameeyes Exp $
-
-DESCRIPTION="Media libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-	>=app-emulation/emul-linux-x86-soundlibs-2.0"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	# Remove this to avoid confict with emul-soundlibs
-	rm -f ${WORKDIR}/emul/linux/x86/usr/lib/libesd.so*
-
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild
deleted file mode 100644
index 338ed484e19e..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 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-1.2.ebuild,v 1.4 2006/10/04 16:38:37 dang Exp $
-
-DESCRIPTION="Media libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-	>=app-emulation/emul-linux-x86-soundlibs-2.0"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
index 267af50a6106..fee2977a4eac 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-10.2.ebuild,v 1.1 2007/02/27 10:55:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-10.2.ebuild,v 1.2 2007/03/02 15:04:15 blubb Exp $
 
 inherit emul-libs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/fribidi-0.10.7.tbz2
 		mirror://gentoo/xvid-1.1.0-r3.tbz2"
 
 LICENSE="GPL-2 LGPL-2.1 as-is xiph"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 DEPEND=""
 RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2
diff --git a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1 b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1
deleted file mode 100644
index ce7116227cb6..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05cc1e1ca964002039ecaee61d09eab3 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
-RMD160 6d159dbd6df3aac8f168831a98e7935febaba1d6 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
-SHA256 b215807b7e2535bcf0d7d3210bc7ea08a34f4fd5c990e8e11ae4299c04d50839 emul-linux-x86-medialibs-1.1.tar.bz2 1594464
diff --git a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2 b/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2
deleted file mode 100644
index 83660a4fe749..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/files/digest-emul-linux-x86-medialibs-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc8d1af8a07dc81ddc2484fac7d4e3d0 emul-linux-x86-medialibs-1.2.tar.bz2 1586690
-RMD160 c9d1761da566371c5bf11a05659b6618ac588f63 emul-linux-x86-medialibs-1.2.tar.bz2 1586690
-SHA256 86cc74ce768aa90389682b6e1528c07def773dde4f1b7e7633a16329c5fe73a1 emul-linux-x86-medialibs-1.2.tar.bz2 1586690