[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-soundlibs: emul-linux-x86-soundlibs-20140508.ebuild emul-linux-x86-soundlibs-20140406-r1.ebuild ChangeLog

2014-05-10 Thread Michal Gorny (mgorny) 
mgorny  14/05/10 10:06:35

  Modified: emul-linux-x86-soundlibs-20140508.ebuild
emul-linux-x86-soundlibs-20140406-r1.ebuild
ChangeLog
  Log:
  Accept multilib bluez-4 as well.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.4  
app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?rev=1.4view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?rev=1.4content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?r1=1.3r2=1.4

Index: emul-linux-x86-soundlibs-20140508.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emul-linux-x86-soundlibs-20140508.ebuild9 May 2014 19:03:35 -   
1.3
+++ emul-linux-x86-soundlibs-20140508.ebuild10 May 2014 10:06:35 -  
1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-20140508.ebuild,v
 1.3 2014/05/09 19:03:35 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v
 1.4 2014/05/10 10:06:35 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -40,7 +40,10 @@
=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
=media-plugins/alsa-plugins-1.0.27-r2[abi_x86_32(-)]
-   =net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+   || (
+   =net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+   =net-wireless/bluez-4.101-r9[abi_x86_32(-)]
+   )
pulseaudio? ( =media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
)
 



1.3  
app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild?rev=1.3view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild?rev=1.3content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild?r1=1.2r2=1.3

Index: emul-linux-x86-soundlibs-20140406-r1.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emul-linux-x86-soundlibs-20140406-r1.ebuild 9 May 2014 19:03:35 -   
1.2
+++ emul-linux-x86-soundlibs-20140406-r1.ebuild 10 May 2014 10:06:35 -  
1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-20140406-r1.ebuild,v
 1.2 2014/05/09 19:03:35 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild,v
 1.3 2014/05/10 10:06:35 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -40,7 +40,10 @@
=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
=media-plugins/alsa-plugins-1.0.27-r2[abi_x86_32(-)]
-   =net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+   || (
+   =net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+   =net-wireless/bluez-4.101-r9[abi_x86_32(-)]
+   )
pulseaudio? ( =media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
)
 



1.121app-emulation/emul-linux-x86-soundlibs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.121view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.121content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?r1=1.120r2=1.121

Index: ChangeLog

[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-soundlibs: emul-linux-x86-soundlibs-20140508.ebuild emul-linux-x86-soundlibs-20140406-r1.ebuild ChangeLog

2014-05-09 Thread Michal Gorny (mgorny) 
mgorny  14/05/09 14:41:16

  Modified: emul-linux-x86-soundlibs-20140508.ebuild ChangeLog
  Added:emul-linux-x86-soundlibs-20140406-r1.ebuild
  Log:
  Update. All packages are multilib now.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.2  
app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild?r1=1.1r2=1.2

Index: emul-linux-x86-soundlibs-20140508.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emul-linux-x86-soundlibs-20140508.ebuild8 May 2014 21:49:00 -   
1.1
+++ emul-linux-x86-soundlibs-20140508.ebuild9 May 2014 14:41:16 -   
1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-20140508.ebuild,v
 1.1 2014/05/08 21:49:00 pacho Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v
 1.2 2014/05/09 14:41:16 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -38,6 +38,9 @@
=media-libs/portaudio-19_pre2021-r1[abi_x86_32(-)]
=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
+   =media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)]
+   =media-plugins/alsa-plugins-1.0.27-r2[abi_x86_32(-)]
+   =net-wireless/bluez-5.18-r1[abi_x86_32(-)]
pulseaudio? ( =media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
)
 
@@ -50,16 +53,9 @@
 }
 
 src_prepare() {
-   _ALLOWED=${S}/etc/env.d
-   use alsa  _ALLOWED=${_ALLOWED}|${S}/usr/bin/aoss
-   ALLOWED=(${_ALLOWED})
-
-   emul-linux-x86_src_prepare
-
-   if use alsa; then
-   mv -f ${S}/usr/bin/aoss{,32} || die
-   fi
+   use abi_x86_32 || emul-linux-x86_src_prepare
+}
 
-   # Remove migrated stuff.
-   use abi_x86_32  rm -f $(sed ${FILESDIR}/remove-native-${PVR} -e 
'/^#/d')
+src_install() {
+   use abi_x86_32 || emul-linux-x86_src_install
 }



1.119app-emulation/emul-linux-x86-soundlibs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.119view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.119content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?r1=1.118r2=1.119

Index: ChangeLog
===
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog   9 May 2014 07:53:45 -   1.118
+++ ChangeLog   9 May 2014 14:41:16 -   1.119
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 
1.118 2014/05/09 07:53:45 mgorny Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 
1.119 2014/05/09 14:41:16 mgorny Exp $
+
+*emul-linux-x86-soundlibs-20140406-r1 (09 May 2014)
+
+  09 May 2014; Michał Górny mgo...@gentoo.org
+  +emul-linux-x86-soundlibs-20140406-r1.ebuild, -files/remove-native-20140508,
+  emul-linux-x86-soundlibs-20140508.ebuild:
+  Update. All packages are multilib now.
 
   09 May 2014; Michał Górny mgo...@gentoo.org files/remove-native-20140508:
   Update remove-native wrt library soname changes.



1.1  
app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild?rev=1.1content-type=text/plain

Index: emul-linux-x86-soundlibs-20140406-r1.ebuild