diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-06-03 13:30:11 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-06-03 13:30:11 +0000 |
| commit | f5809640ded779ed0dd585cf86c36ca90004a24e (patch) | |
| tree | 794700e5a2e91ef8a5c9ce5612b9e09a01f90980 /app-emulation | |
| parent | sci-biology/ncbi-tools++: Fix for gcc-4.7; add rpath on prefix (diff) | |
| download | gentoo-2-f5809640ded779ed0dd585cf86c36ca90004a24e.tar.gz gentoo-2-f5809640ded779ed0dd585cf86c36ca90004a24e.tar.bz2 gentoo-2-f5809640ded779ed0dd585cf86c36ca90004a24e.zip | |
Restore -r1 and drop -r2 as it caused annoying problems
(Portage version: 2.1.10.64/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/emul-linux-x86-soundlibs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild (renamed from app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r2.ebuild) | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog index b393c0ee4487..c36e45954b6c 100644 --- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-soundlibs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.78 2012/06/03 09:19:40 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.79 2012/06/03 13:30:11 hwoarang Exp $ + + 03 Jun 2012; Markos Chandras <hwoarang@gentoo.org> + +emul-linux-x86-soundlibs-20120520-r1.ebuild, + -emul-linux-x86-soundlibs-20120520-r2.ebuild: + Restore -r1 and drop -r2 as it caused annoying problems *emul-linux-x86-soundlibs-20120520-r2 (03 Jun 2012) diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r2.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild index 263c3a4f4adb..fdf597895d9c 100644 --- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r2.ebuild +++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 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-20120520-r2.ebuild,v 1.1 2012/06/03 09:19:40 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild,v 1.3 2012/06/03 13:30:11 hwoarang Exp $ EAPI="4" -inherit emul-linux-x86 toolchain-funcs +inherit emul-linux-x86 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain" KEYWORDS="-* ~amd64" @@ -28,10 +28,8 @@ src_prepare() { fi # libs without the rest of pulseaudio cause problems, bug 302003 + # See bug 416751 to understand this way to disable pulseaudio if ! use pulseaudio; then - rm -f "${S}"/usr/lib32/libpulse{,-simple}.so* - echo 'int main() { }' > "${T}"/tmp.c - $(tc-getCC) -m32 -shared -Wl,-soname -Wl,libpulse.so.0 "${T}"/tmp.c -o "${S}"/usr/lib32/libpulse.so.0 - $(tc-getCC) -m32 -shared -Wl,-soname -Wl,libpulse-simple.so.0 "${T}"/tmp.c -o "${S}"/usr/lib32/libpulse-simple.so.0 + chmod a-r "${S}"/usr/lib32/libpulse{,-simple}.so.* || die fi } |