Version bump, remove old.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 13c2f142f155c6725d00337e5b91d9f31f3f6e96..d1b899c441058fa4e6bc2575016e67765c0e7210 100644 (file)
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.86 2011/03/30 09:05:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.87 2011/07/22 19:17:41 pacho Exp $
+
+*emul-linux-x86-gtklibs-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-gtklibs-20100915.ebuild,
+  +emul-linux-x86-gtklibs-20110722.ebuild:
+  Version bump, remove old.
 
   30 Mar 2011; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-gtklibs-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
similarity index 76%
rename from app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
rename to app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
index f2d89a28143aacf73b7bfcd60615cba002227068..2535e79d11ff0273d417a813c72c00c98d52df92 100644 (file)
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100915.ebuild,v 1.2 2010/10/04 12:51:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild,v 1.1 2011/07/22 19:17:41 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-IUSE=""
+KEYWORDS="-* ~amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-       ~app-emulation/emul-linux-x86-xlibs-${PV}"
+       ~app-emulation/emul-linux-x86-xlibs-${PV}
+       ~app-emulation/emul-linux-x86-opengl-${PV}"
+# RDEPEND on opengl stuff shouldn't be needed, but add it anyway until bug #354943 is properly solved
 
-src_unpack() {
+src_prepare() {
        query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
        ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
-       emul-linux-x86_src_unpack
+       emul-linux-x86_src_prepare
 
        # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
        mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
@@ -43,7 +45,7 @@ pkg_postinst() {
        einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
        mkdir -p ${GTK2_CONFDIR}
        gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-       gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+       gdk-pixbuf-query-loaders32 > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 
        # gdk-pixbuf.loaders should be in their CHOST directories respectively.
        if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 40a1714272f81c6fcc3e7183bc4fab58ed1452e9..9cd632bc8a53d4c2df91bddca21d93cf8c059419 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.47 2011/02/12 20:19:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.48 2011/07/22 19:21:11 pacho Exp $
+
+*emul-linux-x86-medialibs-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-medialibs-20100915-r1.ebuild,
+  +emul-linux-x86-medialibs-20110722.ebuild:
+  Version bump, remove old.
 
   12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-medialibs-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915-r1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
similarity index 68%
rename from app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915-r1.ebuild
rename to app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
index ca14ab9b58e362007af7408257667ba82f99a144..945a9092d07c45d9913053598c23544e00baadf1 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915-r1.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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-20100915-r1.ebuild,v 1.2 2011/01/09 11:03:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild,v 1.1 2011/07/22 19:21:11 pacho Exp $
 
-inherit emul-linux-x86
+EAPI="4"
 
-LICENSE="GPL-2 LGPL-2.1 BSD"
-KEYWORDS="-* amd64"
+inherit emul-linux-x86
 
-IUSE=""
+LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
+KEYWORDS="-* ~amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
@@ -15,8 +15,8 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
        !<=app-emulation/emul-linux-x86-sdl-20081109"
 PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
 
-src_unpack() {
+src_prepare() {
        # Include all libv4l libs, bug #348277
        ALLOWED="${S}/usr/lib32/libv4l/"
-       emul-linux-x86_src_unpack
+       emul-linux-x86_src_prepare
 }

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 8539fbf7f41af2ed2285260ff75fa36d6729486d..7dccfadb4e23295b25d762765ce50578d65a17d2 100644 (file)
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.12 2011/02/18 18:04:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.13 2011/07/22 19:17:10 pacho Exp $
+
+*emul-linux-x86-opengl-20110722-r99 (22 Jul 2011)
+*emul-linux-x86-opengl-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-opengl-20100915.ebuild,
+  -emul-linux-x86-opengl-20110129.ebuild,
+  -emul-linux-x86-opengl-20110129-r99.ebuild,
+  +emul-linux-x86-opengl-20110722.ebuild,
+  +emul-linux-x86-opengl-20110722-r99.ebuild:
+  Version bump, remove old.
 
   18 Feb 2011; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-opengl-20110129-r1.ebuild:

diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
deleted file mode 100644 (file)
index 7f4493a..0000000
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100915.ebuild,v 1.2 2010/10/04 12:50:47 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 MIT"
-
-KEYWORDS="-* amd64 ~amd64-linux"
-IUSE=""
-
-DEPEND="app-admin/eselect-opengl"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-       !<app-emulation/emul-linux-x86-xlibs-20100611
-       media-libs/mesa"
-
-src_unpack() {
-       emul-linux-x86_src_unpack
-       rm -f "${S}/usr/lib32/libGL.so" || die
-}
-
-pkg_postinst() {
-       #update GL symlinks
-       eselect opengl set --use-old
-}

diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild
deleted file mode 100644 (file)
index bacc8d2..0000000
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129.ebuild,v 1.2 2011/02/12 20:19:59 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="BSD LGPL-2 MIT kilgard"
-
-KEYWORDS="-* amd64 ~amd64-linux"
-
-DEPEND="app-admin/eselect-opengl"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-       !<app-emulation/emul-linux-x86-xlibs-20100611
-       media-libs/mesa"
-
-src_unpack() {
-       emul-linux-x86_src_unpack
-       rm -f "${S}/usr/lib32/libGL.so" || die
-}
-
-pkg_postinst() {
-       #update GL symlinks
-       eselect opengl set --use-old
-}

diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild
new file mode 100644 (file)
index 0000000..a01794e
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722-r99.ebuild,v 1.1 2011/07/22 19:17:10 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}-r99.tar.xz"
+
+LICENSE="BSD LGPL-2 MIT kilgard"
+
+KEYWORDS="-* ~amd64 ~amd64-linux"
+
+DEPEND="app-admin/eselect-opengl
+       >=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+       !<app-emulation/emul-linux-x86-xlibs-20100611
+       >=app-emulation/emul-linux-x86-baselibs-20110722-r99
+       media-libs/mesa"
+
+src_prepare() {
+       emul-linux-x86_src_prepare
+       rm -f "${S}/usr/lib32/libGL.so" || die
+       rm -f "${S}/usr/lib32/libGL.so.1" || die
+}
+
+pkg_postinst() {
+       # Update GL symlinks
+       eselect opengl set --use-old || die
+       # And the same for mesa (bug #355393)
+       eselect mesa set 32bit --auto || die
+}

diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129-r99.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
similarity index 73%
rename from app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129-r99.ebuild
rename to app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
index af4f50370c7b6415e452232189afaa8c33287540..3eecee0be36bc75c406184330f89f53bedaf697d 100644 (file)
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129-r99.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110129-r99.ebuild,v 1.2 2011/02/18 18:01:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild,v 1.1 2011/07/22 19:17:10 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="BSD LGPL-2 MIT kilgard"
 
-SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}-r99.tar.bz2"
-
 KEYWORDS="-* ~amd64 ~amd64-linux"
 
 DEPEND="app-admin/eselect-opengl
@@ -16,14 +16,15 @@ RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
        !<app-emulation/emul-linux-x86-xlibs-20100611
        media-libs/mesa"
 
-src_unpack() {
-       emul-linux-x86_src_unpack
+src_prepare() {
+       emul-linux-x86_src_prepare
        rm -f "${S}/usr/lib32/libGL.so" || die
+       rm -f "${S}/usr/lib32/libGL.so.1" || die
 }
 
 pkg_postinst() {
        # Update GL symlinks
-       eselect opengl set --use-old
+       eselect opengl set --use-old || die
        # And the same for mesa (bug #355393)
        eselect mesa set 32bit --auto || die
 }

diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index 7ee9d9066b4a8a6c67f419d9e2015824feb52cf1..7f95fe3f9ec33f2534259c01801bcef0b32f7fb6 100644 (file)
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.67 2011/02/12 20:20:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.68 2011/07/22 19:23:45 pacho Exp $
+
+*emul-linux-x86-qtlibs-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-qtlibs-20100915.ebuild,
+  +emul-linux-x86-qtlibs-20110722.ebuild:
+  Version bump, remove old.
 
   12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-qtlibs-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild
similarity index 70%
rename from app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild
rename to app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild
index 51ed8b080769d9d1399d640d0fa267a99af776b1..9e05fbdff4c43123889d1e4346824238a5c0a48f 100644 (file)
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20100915.ebuild,v 1.2 2010/10/04 12:52:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild,v 1.1 2011/07/22 19:23:45 pacho Exp $
+
+EAPI="4"
 
 inherit eutils emul-linux-x86
 
 LICENSE="LGPL-2.1 GPL-3"
-KEYWORDS="-* amd64"
-IUSE=""
+KEYWORDS="-* ~amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+       ~app-emulation/emul-linux-x86-medialibs-${PV}
        ~app-emulation/emul-linux-x86-xlibs-${PV}"
 
 src_install() {

diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index de703c1e1d02581ab6f22722a172acd29402a7b6..a6fbf0b0ca4d86e5a06287c103247d0ea69709dc 100644 (file)
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.52 2011/02/12 20:20:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.53 2011/07/22 19:25:08 pacho Exp $
+
+*emul-linux-x86-sdl-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-sdl-20100915.ebuild, +emul-linux-x86-sdl-20110722.ebuild:
+  Version bump, remove old.
 
   12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-sdl-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild
similarity index 50%
rename from app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild
rename to app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild
index fca678e95c9a623c395f8d70bb358c12fe9b131e..4b490b670b2e83d1a509a4f7d1364d650c2d63de 100644 (file)
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild
@@ -1,15 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20100915.ebuild,v 1.2 2010/10/04 12:52:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild,v 1.1 2011/07/22 19:25:09 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="LGPL-2 LGPL-2.1"
-KEYWORDS="-* amd64"
-IUSE=""
+KEYWORDS="-* ~amd64"
+IUSE="pulseaudio"
+
+SRC_URI="${SRC_URI}
+       !pulseaudio? ( http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libsdl-1.2.14-r6.tbz2 )"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
        ~app-emulation/emul-linux-x86-baselibs-${PV}
-       ~app-emulation/emul-linux-x86-soundlibs-${PV}
+       ~app-emulation/emul-linux-x86-soundlibs-${PV}[pulseaudio?]
        ~app-emulation/emul-linux-x86-medialibs-${PV}"

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 2129770836095fd3e16443948f92b5db54454b5a..d554a116bea6412305b9fbbcc1772ea98939fb16 100644 (file)
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.67 2011/02/12 20:20:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.68 2011/07/22 19:20:41 pacho Exp $
+
+*emul-linux-x86-soundlibs-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-soundlibs-20100915.ebuild,
+  +emul-linux-x86-soundlibs-20110722.ebuild:
+  Version bump, remove old.
 
   12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-soundlibs-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild
similarity index 71%
rename from app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild
rename to app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild
index 956e05a26c75f33bb1cda27198608331a780ebf5..bcd0cd8d249514c8334d3ffe986379d6b475b1a2 100644 (file)
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20100915.ebuild,v 1.2 2010/10/04 12:52:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild,v 1.1 2011/07/22 19:20:41 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
-LICENSE="as-is BSD GPL-2 LGPL-2 LGPL-2.1 gsm"
-KEYWORDS="-* amd64"
+LICENSE="as-is BSD FDL-1.2 GPL-2 LGPL-2 LGPL-2.1 gsm public-domain"
+KEYWORDS="-* ~amd64"
 IUSE="alsa pulseaudio"
 
 RDEPEND="pulseaudio? ( media-sound/pulseaudio )
@@ -14,12 +16,12 @@ RDEPEND="pulseaudio? ( media-sound/pulseaudio )
 
 QA_DT_HASH="usr/lib32/.*"
 
-src_unpack() {
+src_prepare() {
        _ALLOWED="${S}/etc/env.d"
        use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
        ALLOWED="(${_ALLOWED})"
 
-       emul-linux-x86_src_unpack
+       emul-linux-x86_src_prepare
 
        if use alsa; then
                mv -f "${S}"/usr/bin/aoss{,32} || die

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 3cf5d94421008859b67853e231fbaf9a1f413183..7c1f09db6988b82c208060b0fcded4e45f9c17af 100644 (file)
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.104 2011/02/12 20:21:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.105 2011/07/22 19:14:22 pacho Exp $
+
+*emul-linux-x86-xlibs-20110722 (22 Jul 2011)
+
+  22 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-xlibs-20100915.ebuild, +emul-linux-x86-xlibs-20110722.ebuild:
+  Version bump, remove old.
 
   12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
   emul-linux-x86-xlibs-20110129.ebuild:

diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20100915.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild
similarity index 62%
rename from app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20100915.ebuild
rename to app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild
index c029eb4370e2b9058d32e28ce4642b93af0b1cc4..87822d323ed86921c533613755a6c7e9f0da69df 100644 (file)
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20100915.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20100915.ebuild,v 1.2 2010/10/04 12:50:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild,v 1.1 2011/07/22 19:14:22 pacho Exp $
+
+EAPI="4"
 
 inherit emul-linux-x86
 
-LICENSE="BSD FTL GPL-2 MIT MOTIF"
+LICENSE="FTL GPL-2 MIT"
 
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 IUSE="opengl"
 
 DEPEND=""