From 077951c23f56436105cab4b0224fdd68cc529fc2 Mon Sep 17 00:00:00 2001 From: Simon Stelling Date: Wed, 21 Feb 2007 10:40:28 +0000 Subject: emul-libs are no longer installed to /emul/linux/x86/ (Portage version: 2.1.2-r9) --- kde-base/arts/ChangeLog | 6 +++- kde-base/arts/arts-3.5.5.ebuild | 6 +++- kde-base/arts/files/arts-1.5.4-multilib.patch | 47 +++------------------------ 3 files changed, 15 insertions(+), 44 deletions(-) (limited to 'kde-base') diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index 8558b3fb4e44..487d3bd67326 100644 --- a/kde-base/arts/ChangeLog +++ b/kde-base/arts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/arts # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.250 2007/02/05 11:44:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.251 2007/02/21 10:40:28 blubb Exp $ + + 21 Feb 2007; Simon Stelling + files/arts-1.5.4-multilib.patch, arts-3.5.5.ebuild: + emul-libs are no longer installed to /emul/linux/x86/ 05 Feb 2007; Diego Pettenò -files/1.3.0-jack-configure.in.in.patch, -files/arts-1.2.x.diff, diff --git a/kde-base/arts/arts-3.5.5.ebuild b/kde-base/arts/arts-3.5.5.ebuild index 16a160880181..452aecf4ceb1 100644 --- a/kde-base/arts/arts-3.5.5.ebuild +++ b/kde-base/arts/arts-3.5.5.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/kde-base/arts/arts-3.5.5.ebuild,v 1.10 2007/01/05 16:54:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.5.ebuild,v 1.11 2007/02/21 10:40:28 blubb Exp $ inherit kde flag-o-matic eutils versionator set-kdedir 3.5 @@ -40,6 +40,10 @@ PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch src_unpack() { kde_src_unpack + sed -i -e "s:GENTOO_LIB64:$(get_abi_LIBDIR amd64):" \ + -e "s:GENTOO_LIB32:$(get_abi_LIBDIR x86):" artsc/artsdsp.in \ + || die "multilib-sed failed" + # Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported # before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers local nosspflags diff --git a/kde-base/arts/files/arts-1.5.4-multilib.patch b/kde-base/arts/files/arts-1.5.4-multilib.patch index fca790ff973e..8fca0e9d2d97 100644 --- a/kde-base/arts/files/arts-1.5.4-multilib.patch +++ b/kde-base/arts/files/arts-1.5.4-multilib.patch @@ -1,52 +1,15 @@ ---- artsc/artsdsp.in.orig 2006-08-23 16:30:16.000000000 +0200 -+++ artsc/artsdsp.in 2006-08-23 16:50:07.000000000 +0200 -@@ -94,6 +94,9 @@ - binary=`which $1` - machine=`uname -m` - -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+ - set `file -L $binary` - - case $2 in -@@ -106,10 +109,16 @@ +--- artsc/artsdsp.in.orig 2007-02-21 10:23:40.000000000 +0000 ++++ artsc/artsdsp.in 2007-02-21 10:24:00.000000000 +0000 +@@ -106,10 +106,10 @@ case $3 in 32-bit) - arch_libdir=lib -+ artsd=`which artsd` -+ set `file -L $artsd` -+ if test "$3" == "32-bit"; then -+ libdir=${prefix}/lib -+ else -+ libdir=/emul/linux/x86/usr/lib -+ fi ++ arch_libdir=GENTOO_LIB32 ;; 64-bit) - arch_libdir=lib64 -+ libdir=${prefix}/lib64 ++ arch_libdir=GENTOO_LIB64 ;; *) exit 1 -@@ -117,10 +126,6 @@ - - set $origargs - --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=${prefix}/${arch_libdir} -- - if test "$single_thread" = 1; then - LD_PRELOAD=${libdir}/libartsdsp_st.so.0 - else -@@ -129,6 +134,9 @@ - if test -f ${libdir}/libdl.so.2; then - LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2 - fi -+if test -f ${libdir}/libaoss.so.0; then -+ LD_PRELOAD=$LD_PRELOAD:${libdir}/libaoss.so.0 -+fi - export LD_PRELOAD - - # invoke the program with the args given -- cgit v1.2.3-65-gdbad