Respect multilib libdir, don't run ldconfig, use CXX to build, drop virtual/libc dependency.

(Portage version: 2.1_pre5-r4)

4 files changed, 38 insertions, 33 deletions

diff --git a/media-libs/libclalsadrv/ChangeLog b/media-libs/libclalsadrv/ChangeLog
index f72d299308dc..c1a42d816ed0 100644
--- a/media-libs/libclalsadrv/ChangeLog
+++ b/media-libs/libclalsadrv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libclalsadrv
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.8 2005/09/04 12:22:36 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.9 2006/03/06 14:46:58 flameeyes Exp $
+
+  06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/libclalsadrv-1.0.1-makefile.patch, metadata.xml,
+  libclalsadrv-1.0.1.ebuild:
+  Respect multilib libdir, don't run ldconfig, use CXX to build, drop
+  virtual/libc dependency.
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   libclalsadrv-1.0.1.ebuild:
diff --git a/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch b/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch
index 57ee29a20748..74b6d5debf12 100644
--- a/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch
+++ b/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch
@@ -1,26 +1,23 @@
---- clalsadrv-1.0.1.orig/Makefile	2004-08-24 01:22:35.904600424 +0200
-+++ clalsadrv-1.0.1/Makefile	2004-08-24 01:25:40.084600808 +0200
-@@ -3,10 +3,8 @@
- LDLIBS += -lclalsadrv -lclthreads -lrt
+Index: clalsadrv-1.0.1/Makefile
+===================================================================
+--- clalsadrv-1.0.1.orig/Makefile
++++ clalsadrv-1.0.1/Makefile
+@@ -16,14 +16,13 @@ CLALSADRV_H = clalsadrv.h
  
  
--#CLALSADRV_LIBDIR = /usr/local/lib
--#CLALSADRV_INCDIR = /usr/local/include
--CLALSADRV_LIBDIR = /usr/lib
--CLALSADRV_INCDIR = /usr/include
-+CLALSADRV_LIBDIR = ${DESTDIR}/usr/lib
-+CLALSADRV_INCDIR = ${DESTDIR}/usr/include
- CLALSADRV_SO = libclalsadrv.so
- CLALSADRV_MAJ = $(CLALSADRV_SO).1
- CLALSADRV_MIN = $(CLALSADRV_MAJ).0.1
-@@ -20,8 +18,8 @@
+ $(CLALSADRV_MIN): $(CLALSADRV_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
  
  
  install:	$(CLALSADRV_MIN)
 -	cp -f $(CLALSADRV_H) $(CLALSADRV_INCDIR)
 -	cp -f $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)
-+	install -D $(CLALSADRV_H) $(CLALSADRV_INCDIR)/$(CLALSADRV_H)
-+	install -D $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_MIN)
- 	/sbin/ldconfig -n $(CLALSADRV_LIBDIR)
- 	ln -sf $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_SO)
+-	/sbin/ldconfig -n $(CLALSADRV_LIBDIR)
+-	ln -sf $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_SO)
++	install -D $(CLALSADRV_H) $(DESTDIR)$(CLALSADRV_INCDIR)/$(CLALSADRV_H)
++	install -D $(CLALSADRV_MIN) $(DESTDIR)$(CLALSADRV_LIBDIR)/$(CLALSADRV_MIN)
++	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(CLALSADRV_LIBDIR)/$(CLALSADRV_SO)
  
+ 
+ loopback:	loopback.cc
diff --git a/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild b/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild
index 6b42dcd74348..ab2c9350fa54 100644
--- a/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild
+++ b/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild,v 1.9 2005/09/04 12:22:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild,v 1.10 2006/03/06 14:46:58 flameeyes Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils multilib toolchain-funcs
 
-S="${WORKDIR}/clalsadrv-${PV}"
+MY_P="clalsadrv-${PV}"
+
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
 HOMEPAGE="http://users.skynet.be/solaris/linuxaudio"
-SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/clalsadrv-${PV}.tar.bz2"
+SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 sparc x86 ~ppc"
 
-DEPEND="virtual/libc
-	>=media-libs/libclthreads-1.0.0
+DEPEND=">=media-libs/libclthreads-1.0.0
 	media-libs/alsa-lib"
 
 src_unpack() {
@@ -27,10 +28,11 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	tc-export CC CXX
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	make CLALSADRV_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS
 }
diff --git a/media-libs/libclalsadrv/metadata.xml b/media-libs/libclalsadrv/metadata.xml
index 0edf584ed3a0..d8913263a79e 100644
--- a/media-libs/libclalsadrv/metadata.xml
+++ b/media-libs/libclalsadrv/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <maintainer>
-    <email>sound@gentoo.org</email>
-  </maintainer>
+<herd>sound</herd>
+<maintainer>
+<email>sound@gentoo.org</email>
+</maintainer>
 </pkgmetadata>