Respect LDFLAGS (bug #337870). Use emake instead of make. Remove empty DEPEND assignment (1.3.0). Remove old.

(Portage version: 2.2_rc84/cvs/Linux i686)

4 files changed, 23 insertions, 45 deletions

diff --git a/dev-libs/mm/ChangeLog b/dev-libs/mm/ChangeLog
index 1bebf18d3351..5ae4db5e0ab7 100644
--- a/dev-libs/mm/ChangeLog
+++ b/dev-libs/mm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/mm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/ChangeLog,v 1.33 2009/09/23 17:25:00 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/ChangeLog,v 1.34 2010/09/20 02:43:50 jer Exp $
+
+*mm-1.4.2-r1 (20 Sep 2010)
+
+  20 Sep 2010; Jeroen Roovers <jer@gentoo.org> -mm-1.2.1.ebuild,
+  mm-1.3.0.ebuild, -mm-1.4.0.ebuild, +mm-1.4.2-r1.ebuild:
+  Respect LDFLAGS (bug #337870). Use emake instead of make. Remove empty
+  DEPEND assignment (1.3.0). Remove old.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> mm-1.2.1.ebuild,
   mm-1.3.0.ebuild:
diff --git a/dev-libs/mm/mm-1.2.1.ebuild b/dev-libs/mm/mm-1.2.1.ebuild
deleted file mode 100644
index 75dcf42ba82d..000000000000
--- a/dev-libs/mm/mm-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/mm-1.2.1.ebuild,v 1.19 2009/09/23 17:25:00 patrick Exp $
-
-inherit libtool
-
-DESCRIPTION="Shared Memory Abstraction Library"
-HOMEPAGE="http://www.ossp.org/pkg/lib/mm/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
-
-DEPEND=""
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	elibtoolize
-	econf --host=${CHOST} || die "bad ./configure"
-	make || die "compile problem"
-	make test || die "testing problem"
-}
-
-src_install() {
-	einstall || die
-	dodoc README LICENSE ChangeLog INSTALL PORTING THANKS
-
-	dosym /usr/lib/libmm.so /usr/lib/libmm.so.1
-}
diff --git a/dev-libs/mm/mm-1.3.0.ebuild b/dev-libs/mm/mm-1.3.0.ebuild
index cc917a2ec26b..0ca80d7108da 100644
--- a/dev-libs/mm/mm-1.3.0.ebuild
+++ b/dev-libs/mm/mm-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/mm-1.3.0.ebuild,v 1.21 2009/09/23 17:25:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/mm-1.3.0.ebuild,v 1.22 2010/09/20 02:43:50 jer Exp $
 
 inherit libtool
 
@@ -13,8 +13,6 @@ SLOT="1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND=""
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-libs/mm/mm-1.4.0.ebuild b/dev-libs/mm/mm-1.4.2-r1.ebuild
index 8dcbb16c78c7..e5cc3bd5380f 100644
--- a/dev-libs/mm/mm-1.4.0.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/mm-1.4.0.ebuild,v 1.4 2006/12/08 23:38:44 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mm/mm-1.4.2-r1.ebuild,v 1.1 2010/09/20 02:43:50 jer Exp $
+
+EAPI="2"
 
 inherit multilib
 
@@ -13,12 +15,18 @@ SLOT="1.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
+src_prepare() {
+	sed -i Makefile.in \
+		-e '/--mode=link/s| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile.in"
+}
+
 src_test() {
-	make test || die "testing problem"
+	emake test || die "testing problem"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die
 	dodoc README ChangeLog INSTALL PORTING THANKS
 }