Version bump. Respect LDFLAGS (bug #334759) and update to EAPI 4.

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

3 files changed, 118 insertions, 2 deletions

diff --git a/sys-block/smp_utils/ChangeLog b/sys-block/smp_utils/ChangeLog
index 36c9258bd358..b83f1390cc82 100644
--- a/sys-block/smp_utils/ChangeLog
+++ b/sys-block/smp_utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/smp_utils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/smp_utils/ChangeLog,v 1.5 2009/02/11 02:52:48 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/smp_utils/ChangeLog,v 1.6 2011/08/30 09:31:54 radhermit Exp $
+
+*smp_utils-0.96 (30 Aug 2011)
+
+  30 Aug 2011; Tim Harder <radhermit@gentoo.org> +smp_utils-0.96.ebuild,
+  +files/smp_utils-0.96-make.patch:
+  Version bump. Respect LDFLAGS (bug #334759) and update to EAPI 4.
 
   11 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> smp_utils-0.91.ebuild,
   smp_utils-0.93.ebuild:
diff --git a/sys-block/smp_utils/files/smp_utils-0.96-make.patch b/sys-block/smp_utils/files/smp_utils-0.96-make.patch
new file mode 100644
index 000000000000..5adcce429f0f
--- /dev/null
+++ b/sys-block/smp_utils/files/smp_utils-0.96-make.patch
@@ -0,0 +1,75 @@
+--- smp_utils-0.96.orig/Makefile
++++ smp_utils-0.96/Makefile
+@@ -39,15 +39,11 @@
+ 
+ INCLUDES = -I include
+ 
+-# may be overridden by 'make -e'
+-CFLAGS = -g -O2
+-
+ MY_CFLAGS = -Wall -W $(EXTRA_FLAGS)
+ # MY_CFLAGS = -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
+ 
+ CFLAGS_PTHREADS = -D_REENTRANT
+ 
+-LDFLAGS = 
+ # LDFLAGS = -v -lm
+ 
+ # $(SDIRS):
+@@ -65,8 +61,8 @@
+ sub_sgv4:
+ 	cd sgv4 && $(MAKE)
+ 
+-libsmp.a : sub_mpt sub_sgv4 smp_lib.o smp_interface_sel.o
+-	ar r libsmp.a smp_lib.o smp_interface_sel.o mpt/smp_mptctl_io.o  \
++libsmp.a: sub_mpt sub_sgv4 smp_lib.o smp_interface_sel.o
++	$(AR) $(ARFLAGS) libsmp.a smp_lib.o smp_interface_sel.o mpt/smp_mptctl_io.o  \
+ 	sgv4/smp_sgv4_io.o
+ 
+ depend dep:
+@@ -167,15 +163,14 @@
+ smp_rep_self_conf_stat: smp_rep_self_conf_stat.o libsmp.a
+ 	$(LD) -o $@ $(LDFLAGS) $^
+ 
+-install: $(EXECS)
++install:
+ 	install -d $(INSTDIR)
+-	for name in $^; \
++	for name in $(EXECS); \
+ 	 do install -m 755 $$name $(INSTDIR); \
+ 	done
+ 	install -d $(MANDIR)/$(MAN_PREF)
+ 	for mp in $(MAN_PGS); \
+ 	 do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \
+-	 gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
+ 	done
+ 
+ uninstall:
+--- smp_utils-0.96.orig/mpt/Makefile
++++ smp_utils-0.96/mpt/Makefile
+@@ -18,10 +18,9 @@
+ INCLUDES = -I ../include
+ 
+ # CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
+-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
++CFLAGS += -Wall -W $(EXTRA_FLAGS)
+ # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
+ 
+-LDFLAGS = 
+ # LDFLAGS = -v -lm
+ 
+ .c.o:
+--- smp_utils-0.96.orig/sgv4/Makefile
++++ smp_utils-0.96/sgv4/Makefile
+@@ -21,10 +21,9 @@
+ # INCLUDES = -I ../include -idirafter ../include/dummy
+ 
+ # CFLAGS =  -O2 -Wall -W $(EXTRA_FLAGS)
+-CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
++CFLAGS += -Wall -W $(EXTRA_FLAGS)
+ # CFLAGS = -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
+ 
+-LDFLAGS = 
+ # LDFLAGS = -v -lm
+ 
+ .c.o:
diff --git a/sys-block/smp_utils/smp_utils-0.96.ebuild b/sys-block/smp_utils/smp_utils-0.96.ebuild
new file mode 100644
index 000000000000..398aaadaea15
--- /dev/null
+++ b/sys-block/smp_utils/smp_utils-0.96.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/smp_utils/smp_utils-0.96.ebuild,v 1.1 2011/08/30 09:31:54 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Utilities for SAS management protocol (SMP)"
+HOMEPAGE="http://sg.danny.cz/sg/smp_utils.html"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+
+	sed -i \
+		-e '/^INSTDIR=/s:/bin:/sbin:' \
+		-e 's:$(DESTDIR)/:$(DESTDIR):' \
+		-e 's:install -s :install :' \
+		Makefile */Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc AUTHORS ChangeLog COVERAGE CREDITS README
+}