1 |
commit: c66924c2630c389a093b7beb78afc5252af63ee9 |
2 |
Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 21:26:05 2012 +0000 |
4 |
Commit: Nathan Phillip Brink <binki <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 24 21:26:05 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=c66924c2 |
7 |
|
8 |
app-emulation/emul-linux-x86-soundlibs: Import recent changes from gentoo-x86. Add pulseaudio useflag used by app-emulation/wine, try to add support for alsa useflag by adding /usr/bin/aoss32 binary like gentoo-x86's emul-linux-x86-soundlibs ebuild. |
9 |
|
10 |
(Portage version: 2.2.0_alpha95-r1/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6BA81050) |
11 |
|
12 |
--- |
13 |
app-emulation/emul-linux-x86-soundlibs/Manifest | 48 ++++++-------------- |
14 |
.../emul-linux-x86-soundlibs-99999999.ebuild | 26 +++++++++- |
15 |
2 files changed, 37 insertions(+), 37 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest |
18 |
index 420cabf..1edcdd8 100644 |
19 |
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest |
20 |
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest |
21 |
@@ -1,42 +1,22 @@ |
22 |
-----BEGIN PGP SIGNED MESSAGE----- |
23 |
Hash: SHA512 |
24 |
|
25 |
-- -----BEGIN PGP SIGNED MESSAGE----- |
26 |
-Hash: SHA512 |
27 |
- |
28 |
-EBUILD emul-linux-x86-soundlibs-99999999.ebuild 991 RMD160 ac57fbaeef0ee93a8ad25dc6cb11220fd2df2a2e SHA1 a9c9a4dff1ce29ac3fad2c1428a25bcbdaf77a1e SHA256 a32798ec3a7c8420cc03ac6eb7884677abbbb3f289fd83685c07e0b3ecb24e9d |
29 |
+EBUILD emul-linux-x86-soundlibs-99999999.ebuild 1578 RMD160 d4e2f1b9e277f0e8a1746c6ce77b5029ee354aa4 SHA1 482e92de578520e5f58a26180f359d7f35d3ae62 SHA256 f4e39c33518646ff4a9828bff827f3c3c46034944f7187c71b2e754fdf60475d |
30 |
MISC metadata.xml 496 RMD160 0abebf63c2f73e783f03c63bdbcfdd94a6f150f3 SHA1 db3066278c74024b30465f4beddb520d27b9b98f SHA256 0dd1028260a7672f73febd41b83f026ba6ecdc0614ccc425fb5ca139c905197c |
31 |
-- -----BEGIN PGP SIGNATURE----- |
32 |
-Version: GnuPG v2.0.14 (GNU/Linux) |
33 |
- |
34 |
-iQIcBAEBCgAGBQJPQWrfAAoJEHQ6UuhrqBBQvsIQALSZE2MsllekBBlikRZl3ZWA |
35 |
-aj5AWtrVZBKRbtW08hVIC8ZPzuHIgzQun5Jv+KR+wwQI8ORgnOciuCgG1actLciY |
36 |
-MNkZ24oJunGHG6Ohe+Ug3yT8Re9+9TAV0varRkufSf1x2Z3lx090Kh/MhbDY0OBW |
37 |
-MgzBiegULrtPnxcshDTegthXYfIl/tNc8HGmRM/CPD7Sj452G3vE5jlhqIeoSnI5 |
38 |
-LmNycYUPIsYcYeoP4Qk1u8ukO54lPmtzllfepCx5zPzw9C7uzQrdRtIzhLq7+m5/ |
39 |
-391Ug/Zg06mFInS5Of5O6gUtouX7cEmlbCCMBZYYl+r0yCMWVohpN+bfxK3mCXDN |
40 |
-+wljxlPNgjmY+01SxEyxTwYSR9sqNEKHCdzJ3iz88YLPSPGwPcir8xcsh2C+M8+H |
41 |
-to6cYRPsfMo3EusQbC8rWbsqJsSR7894Zd9Mwa7qFzlpO5PZKxg0TqWRddMSQqar |
42 |
-B9Wy8KCHJnHWioMfEVZVShhHnp/UKrFPASsxNyX8TdU95KNsnJZlPSRkw4fTwJt7 |
43 |
-KC0r8ZHrV7ZCvQnqectiQMBGD4dGB/RNTLzkOwmSwUoF6m71P1hpb7JZtEizm8H7 |
44 |
-+Dd0Tnx25AzrSZ7AmxlfvzETxQJJQ3WenXV4RTU2FvwvMYyuY9IdJYfL+x/h7Dee |
45 |
-TMOsFQ9kgXEQNWIj7mKW |
46 |
-=ZeAG |
47 |
-- -----END PGP SIGNATURE----- |
48 |
-----BEGIN PGP SIGNATURE----- |
49 |
Version: GnuPG v2.0.14 (GNU/Linux) |
50 |
|
51 |
-iQIcBAEBCgAGBQJPQXDCAAoJEHQ6UuhrqBBQDoQP/1JVuEYVu5PPRmJVmtRaZsPF |
52 |
-lqBRVA8cN+CinNFutdl3/Gn0EOgvPEuhmQBGTWTeW4Ll4mZRrTWcdryffJNp6/He |
53 |
-zrclyurls5Wtsc01iCuw2x6JuZXuZtXx15xBMwMkddOI6WO1SqFgyzoCia7dH2ld |
54 |
-zWkYyqV9epAcku9Kz/TvWmjGYx7sxEt6OlOBZI28RTjJkQi5uqbEN+ZJFx2RdMVV |
55 |
-G7InsGvd/bOUziKOv6kX1z2r8dyH7SdltkxZ+IKV3NbesBt071Qvqnp+04ZyS8H6 |
56 |
-MW0fbKt6QueVP0v5f3VH8xnUfmfvhpwgMz6UsSpjDbflydOTOApMGHtBhrKVqH98 |
57 |
-igUd12Gn4YOGOCdO7cKIXmMTJvNFiv67/hh07GEG30c2c7GP056JtI8XggIWZ1SV |
58 |
-4KC7guXB1Q7ZaGkx6fR2xOYzxmgNhNeQz2qE7BIVr6ewMzmdggU8gnRswxHSTnbi |
59 |
-cm9emXcFYADsfinRxmiHC8/8Oos5SgSEsYEZ5TgDReNkab/9Ljks8absrPAXmsDB |
60 |
-xMkCzX8HrxWD+vV8nDKtnD8pCuCf7loVbxoi6EP1gWzcCo+gHgVRwZY1lR+YWmuX |
61 |
-eU6WPyG6IOkJipGhLZiV7gL9vA0Lq16mR+iqh6lTrc+BWPYtde7osNCCPtym+Bk6 |
62 |
-T5LOeRES6e7Alu8ynlFV |
63 |
-=F4l8 |
64 |
+iQIcBAEBCgAGBQJPbjvsAAoJEHQ6UuhrqBBQCCcP/iKi6iBhtH92mLsFZJKZdZPs |
65 |
+eKkqTF9+WnQLFSLmwgKl7eOQ76Jk3Lamwqgin+3YbbA8AKAtz3a8fN8brUTJ6OV4 |
66 |
+iiPQd2jed0zyXAAPBGdtcc7L57KBozJHVFHpk6lM1bR+2aSJOXK3SRNrqlIJ6cL0 |
67 |
+gLun4HCd0awnqFjPBR1MC9eUWnC8BohMb9qzIWdu9bgMyiOV1oHIFXFzT7kggJC3 |
68 |
+0LN1X28REYxR1dsKbRtkreTRxqrh0mycbA2ua8MPGM3BkyJC/Kkz32JFC3v3WJ0Y |
69 |
+8xXLZQ7j4T9jSKLdv4zsXdJzZirFZUc1To4ZeF1TZdJO0DYgUK88VPVHFxP3PmWQ |
70 |
+7EN3pOE/r+KAGlEDZlErvBa74XQaHsk6D34GTFJKzEgmRo5B6ubTJqIVw3IfZmvy |
71 |
+Uc0NfxOnJ3a9xJOUY6Pv0Zy3Ku0gUzrzgwrVSdA85k1IEpNXuZSFAyvBG6W+CmGC |
72 |
+pbD5Bag+SlA0jcZgY4uX8M/QxwSX38nicnlIfxLQyiD2/mUE882LwIdmVt8SpOiK |
73 |
+0D40LGEEE2ZJdCZVSo5rtdsVM0P87QEiLY9+Lwp+z2OcxawYWY9KhPyqDoNc95eW |
74 |
+xuuNidVwmr97kOUMDax+ELk+om905rgJXjn3BW3f6DDKFVq0g5YGOCoRnX9N7waV |
75 |
+gsILS+02/imdvXTPcGqH |
76 |
+=so9Y |
77 |
-----END PGP SIGNATURE----- |
78 |
|
79 |
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-99999999.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-99999999.ebuild |
80 |
index d9caa9b..d412f12 100644 |
81 |
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-99999999.ebuild |
82 |
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-99999999.ebuild |
83 |
@@ -2,7 +2,7 @@ |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: $ |
86 |
|
87 |
-EAPI="2" |
88 |
+EAPI="4" |
89 |
|
90 |
DESCRIPTION="Metapackage to provide 32bit libraries via multilib" |
91 |
HOMEPAGE="http://www.gentoo.org/" |
92 |
@@ -10,7 +10,7 @@ LICENSE="GPL-2" |
93 |
|
94 |
KEYWORDS="-* ~amd64" |
95 |
SLOT="0" |
96 |
-IUSE="-nodep" |
97 |
+IUSE="alsa -nodep pulseaudio" |
98 |
|
99 |
RDEPEND="!nodep? ( =app-emulation/emul-linux-x86-baselibs-${PV} |
100 |
=app-emulation/emul-linux-x86-medialibs-${PV} |
101 |
@@ -27,4 +27,24 @@ RDEPEND="!nodep? ( =app-emulation/emul-linux-x86-baselibs-${PV} |
102 |
media-libs/libvorbis[multilib_abi_x86] |
103 |
media-libs/portaudio[multilib_abi_x86] |
104 |
media-sound/jack-audio-connection-kit[multilib_abi_x86] |
105 |
- media-sound/pulseaudio[multilib_abi_x86] )" |
106 |
+ pulseaudio? ( media-sound/pulseaudio[multilib_abi_x86] ) )" |
107 |
+ |
108 |
+S=${WORKDIR} |
109 |
+ |
110 |
+src_install() { |
111 |
+ if use alsa; then |
112 |
+ # Install /usr/bin/aoss32 like |
113 |
+ # emul-linux-x86-soundlibs-20120127. Assume that |
114 |
+ # media-libs/alsa-oss[multilib_abi_x86] has been (re)installed |
115 |
+ # after >=sys-apps/portage-2.2.0_alpha95-r1. |
116 |
+ dosym aoss-x86 /usr/bin/aoss32 |
117 |
+ fi |
118 |
+} |
119 |
+ |
120 |
+pkg_postinst() { |
121 |
+ if use alsa && ! [[ -e ${EROOT}usr/bin/aoss-x86 ]]; then |
122 |
+ ewarn "You need to reinstall media-libs/alsa-oss after upgrading" |
123 |
+ ewarn "to >=sys-apps/portage-2.2.0_alpha95-r1 in order to create" |
124 |
+ ewarn "${EROOT}usr/bin/aoss-x86 (used by aos32)." |
125 |
+ fi |
126 |
+} |