Remove forced -O2 from CXXFLAGS wrt #376619 by Agostino Sarubbo. Install missing soname symlink.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 34 insertions, 20 deletions

diff --git a/media-libs/libclalsadrv/ChangeLog b/media-libs/libclalsadrv/ChangeLog
index 7a2f72a56c2b..f50629710859 100644
--- a/media-libs/libclalsadrv/ChangeLog
+++ b/media-libs/libclalsadrv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libclalsadrv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.14 2010/04/12 08:53:04 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.15 2012/01/20 22:32:19 ssuominen Exp $
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libclalsadrv-2.0.0.ebuild, files/libclalsadrv-2.0.0-makefile.patch:
+  Remove forced -O2 from CXXFLAGS wrt #376619 by Agostino Sarubbo. Install
+  missing soname symlink.
 
 *libclalsadrv-2.0.0 (12 Apr 2010)
 
diff --git a/media-libs/libclalsadrv/files/libclalsadrv-2.0.0-makefile.patch b/media-libs/libclalsadrv/files/libclalsadrv-2.0.0-makefile.patch
index d1f936928555..a90d64b6953d 100644
--- a/media-libs/libclalsadrv/files/libclalsadrv-2.0.0-makefile.patch
+++ b/media-libs/libclalsadrv/files/libclalsadrv-2.0.0-makefile.patch
@@ -1,8 +1,15 @@
-Index: clalsadrv-2.0.0/libs/Makefile
-===================================================================
---- clalsadrv-2.0.0.orig/libs/Makefile
-+++ clalsadrv-2.0.0/libs/Makefile
-@@ -41,13 +41,12 @@ CLALSADRV_H = clalsadrv.h
+--- libs/Makefile
++++ libs/Makefile
+@@ -27,7 +27,7 @@
+ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ 
+-CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
++CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ LDLFAGS +=
+ LDLIBS += -lclalsadrv -lclthreads -lrt 
+ 
+@@ -41,14 +41,14 @@
  
  
  $(CLALSADRV_MIN): $(CLALSADRV_O)
@@ -15,5 +22,7 @@ Index: clalsadrv-2.0.0/libs/Makefile
  	install -Dm 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MIN)
 -	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
  	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
++	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MAJ)
  
  clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild b/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild
index fe8d0c85de9c..9bcf0c5e6682 100644
--- a/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild
+++ b/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild,v 1.1 2010/04/12 08:53:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild,v 1.2 2012/01/20 22:32:19 ssuominen Exp $
 
+EAPI=4
 inherit eutils multilib toolchain-funcs
 
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${P/lib/}/libs"
+MY_P=${P/lib}
 
 DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
 HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
@@ -17,20 +16,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="media-libs/alsa-lib"
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/lib/}/libs
 
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
+	tc-export CXX
+	emake
 }
 
 src_install() {
-	emake LIBDIR="$(get_libdir)" PREFIX="${D}/usr" install || die "make install failed"
+	emake LIBDIR="$(get_libdir)" PREFIX="${D}/usr" install
 	dodoc ../AUTHORS
 }