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

Package-Manager: portage-2.1_pre5-r4

7 files changed, 68 insertions, 68 deletions

diff --git a/media-libs/libclthreads/ChangeLog b/media-libs/libclthreads/ChangeLog
index 0a3b5295b8d7..cdf1e7f11628 100644
--- a/media-libs/libclthreads/ChangeLog
+++ b/media-libs/libclthreads/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libclthreads
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/ChangeLog,v 1.7 2005/07/25 12:41:22 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/ChangeLog,v 1.8 2006/03/06 14:41:16 flameeyes Exp $
+
+  06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/libclthreads-1.0.2-makefile.patch, metadata.xml,
+  -libclthreads-1.0.0.ebuild, libclthreads-1.0.2.ebuild:
+  Respect multilib libdir, don't run ldconfig, use CXX to build, drop
+  virtual/libc dependency.
 
   25 Jul 2005; David Holm <dholm@gentoo.org> libclthreads-1.0.2.ebuild:
   Added to ~ppc.
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
index e5c55478f118..05923e54ce32 100644
--- a/media-libs/libclthreads/Manifest
+++ b/media-libs/libclthreads/Manifest
@@ -1,8 +1,28 @@
-MD5 dc1270ab4c13db095d55c912a2a97e68 ChangeLog 1142
-MD5 d0e5b062302b8068ca164a760b85211b libclthreads-1.0.0.ebuild 756
-MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227
-MD5 7bf705e801ddea99b2f7a05bf8dba22e libclthreads-1.0.2.ebuild 753
-MD5 d2fd270bc43b10320feef7399cfb76c5 files/digest-libclthreads-1.0.0 66
-MD5 15457e6804d7144803490194460b485d files/libclthreads-1.0.0-makefile.patch 863
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e4d27a03a6d67e545ce855e7931c1f32 ChangeLog 1411
+RMD160 1d2378ecb752d3c05d3fde844caa0bcc5688dcdc ChangeLog 1411
+SHA256 b5620e05b1fa28b193def1228dc74c76df526c7cdcd5222bd44c57968c1a9b6a ChangeLog 1411
 MD5 d0458125d55cbfb8197e9ea29fec821a files/digest-libclthreads-1.0.2 66
-MD5 15457e6804d7144803490194460b485d files/libclthreads-1.0.2-makefile.patch 863
+RMD160 71b8488d59b741f39252a992d95ee9fbe2b5b628 files/digest-libclthreads-1.0.2 66
+SHA256 1dca9765e96a2ecd10521a8171785a6b3413a93d68c2c36c514ea2068d6b928d files/digest-libclthreads-1.0.2 66
+MD5 15457e6804d7144803490194460b485d files/libclthreads-1.0.0-makefile.patch 863
+RMD160 d99364dfb53a8309d8b71b1b4dc34aefb5253256 files/libclthreads-1.0.0-makefile.patch 863
+SHA256 1895ef3414b49256a349960003ed9d2a3dfc2b252acf803d730acb8b04eda3b5 files/libclthreads-1.0.0-makefile.patch 863
+MD5 5e337a4dc1bb530a362e90a2caf1ffb7 files/libclthreads-1.0.2-makefile.patch 917
+RMD160 4323934eeaf35aad7747ad6b25fda85aa591eeaa files/libclthreads-1.0.2-makefile.patch 917
+SHA256 f166ab5534682912b1c341a5cb0988d9dc4137e77b2ab5e00e1eacfbf62bb0a2 files/libclthreads-1.0.2-makefile.patch 917
+MD5 0d597af93df8f96217e2a77b4e714193 libclthreads-1.0.2.ebuild 863
+RMD160 b08aae6e68ebcbf53f2037cca4df7ae931623a43 libclthreads-1.0.2.ebuild 863
+SHA256 2ed5841ba55b786d2d07748c6e798dbabedc0855685d6431e72b172e7d6f331c libclthreads-1.0.2.ebuild 863
+MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217
+RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217
+SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDEn7AiZjviIA2XgRAlKKAKDFb8POKy0TCsFz7NemHIVBX1r/qACfRy1G
+3a8HbpwOeE3CX6IYjkbKpVU=
+=iF6U
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libclthreads/files/digest-libclthreads-1.0.0 b/media-libs/libclthreads/files/digest-libclthreads-1.0.0
deleted file mode 100644
index 9761c6f73dd7..000000000000
--- a/media-libs/libclthreads/files/digest-libclthreads-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c9ac7061d5cf99a90ec1b43523710eb clthreads-1.0.0.tar.bz2 5661
diff --git a/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch b/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
index 4a6eb6e606ad..f4604f34b300 100644
--- a/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
+++ b/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
@@ -1,26 +1,23 @@
---- clthreads-1.0.0.orig/Makefile	2004-08-24 00:33:18.572183288 +0200
-+++ clthreads-1.0.0/Makefile	2004-08-24 00:35:13.527707392 +0200
-@@ -3,10 +3,8 @@
- LDLIBS +=
+Index: clthreads-1.0.2/Makefile
+===================================================================
+--- clthreads-1.0.2.orig/Makefile
++++ clthreads-1.0.2/Makefile
+@@ -16,14 +16,13 @@ CLTHREADS_H = clthreads.h
  
  
--#CLTHREADS_LIBDIR = /usr/local/lib
--#CLTHREADS_INCDIR = /usr/local/include
--CLTHREADS_LIBDIR = /usr/lib
--CLTHREADS_INCDIR = /usr/include
-+CLTHREADS_LIBDIR = ${DESTDIR}/usr/lib
-+CLTHREADS_INCDIR = ${DESTDIR}/usr/include
- CLTHREADS_SO = libclthreads.so
- CLTHREADS_MAJ = $(CLTHREADS_SO).1
- CLTHREADS_MIN = $(CLTHREADS_MAJ).0.0
-@@ -20,8 +18,8 @@
+ $(CLTHREADS_MIN): $(CLTHREADS_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
  
  
  install:	$(CLTHREADS_MIN)
 -	cp -f $(CLTHREADS_H) $(CLTHREADS_INCDIR)
 -	cp -f $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)
-+	install -D $(CLTHREADS_H) $(CLTHREADS_INCDIR)/$(CLTHREADS_H)
-+	install -D $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
- 	/sbin/ldconfig -n $(CLTHREADS_LIBDIR)
- 	ln -sf $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
+-	/sbin/ldconfig -n $(CLTHREADS_LIBDIR)
+-	ln -sf $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
++	install -D $(CLTHREADS_H) $(DESTDIR)$(CLTHREADS_INCDIR)/$(CLTHREADS_H)
++	install -D $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
++	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
  
+ 
+ clean:
diff --git a/media-libs/libclthreads/libclthreads-1.0.0.ebuild b/media-libs/libclthreads/libclthreads-1.0.0.ebuild
deleted file mode 100644
index c0b03d031668..000000000000
--- a/media-libs/libclthreads/libclthreads-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/libclthreads-1.0.0.ebuild,v 1.4 2004/11/26 13:59:43 josejx Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/clthreads-${PV}"
-
-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/clthreads-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~ppc"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/media-libs/libclthreads/libclthreads-1.0.2.ebuild b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
index 0710117e74d6..78c6cb46ccff 100644
--- a/media-libs/libclthreads/libclthreads-1.0.2.ebuild
+++ b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
@@ -1,28 +1,34 @@
-# 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/libclthreads/libclthreads-1.0.2.ebuild,v 1.3 2005/07/25 12:41:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/libclthreads-1.0.2.ebuild,v 1.4 2006/03/06 14:41:16 flameeyes Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils multilib toolchain-funcs
 
-S="${WORKDIR}/clthreads-${PV}"
+MY_P="clthreads-${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/clthreads-${PV}.tar.bz2"
+SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
 
 src_compile() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	tc-export CC CXX
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	make CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
index 0edf584ed3a0..d8913263a79e 100644
--- a/media-libs/libclthreads/metadata.xml
+++ b/media-libs/libclthreads/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>