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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 136 insertions, 3 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/Manifest b/sys-block/smp_utils/Manifest
index 430bad625ffb..54699ce92ab2 100644
--- a/sys-block/smp_utils/Manifest
+++ b/sys-block/smp_utils/Manifest
@@ -1,8 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX smp_utils-0.96-make.patch 1836 RMD160 d7b04b428486967ab22cebaa16278e8ad5483f7a SHA1 3b73cb3f66c76c181ffe8b044180ee2db256f79a SHA256 bbb2e49f85aababbaef099e5e05058c743b85e245898f299b593b3469fee34d4
 DIST smp_utils-0.91.tgz 89848 RMD160 045f2923a9fe1133d25a822adc3e012affbed9c2 SHA1 031155993f8a1e4d0e0c6a8a02ced7a24e1818e1 SHA256 64d054916cc1c6645c53d3746d2fbf27d6f25052f46cad683ca166b898781d23
 DIST smp_utils-0.93.tgz 100207 RMD160 5d36e7d2e7771854cc7bdb5178ee9746bd699447 SHA1 a4f69454870653d060a70d5323f3e4a575a83785 SHA256 e83e24ec2f605197c05eef8a7ecff7db99f4238e16ada361a2f20035c3d427f0
 DIST smp_utils-0.94.tgz 108325 RMD160 32a92c1f698052943f7742f1d41ca32f8c522525 SHA1 62902195845af652fc338be19bef67a5423dea53 SHA256 84085f2df0411309d589e015ff3a1770a2af8166a640f23319b3b150b4dd45e1
+DIST smp_utils-0.96.tgz 144231 RMD160 08251377bbadd3e3a52470b2d416df3998ded661 SHA1 c99ab3e663296a7769cba833abb25ccb35bf8d30 SHA256 993e7aba9ff5c11fb736cfcde2f484a9cc66b9968d42966cddf7315466d7f64b
 EBUILD smp_utils-0.91.ebuild 1080 RMD160 27bfc7822499aa88a8d963e2f4b294ec0d539bfb SHA1 b4509f6cf94cdcd03535aa2a53ac739f88ccfcf8 SHA256 e8d5cb23ee68f92b33c2268df91353a7767b5047334109d18555dc6c57d06b88
 EBUILD smp_utils-0.93.ebuild 1057 RMD160 cb99427ed12ffed35f04ee0765761104bd603859 SHA1 07878b6a2d02785ddad777bef5322ce44982e1fa SHA256 e0534232fb417374c7a31441a3c1f41c0e8d439a0cc879a480c0a0bb793ee37f
 EBUILD smp_utils-0.94.ebuild 1057 RMD160 176579c9f8b14ac64a980167b5bca9d7acf09361 SHA1 73fac6d456a4cfa848ae9cb80a79a0bf3b3a7c6e SHA256 21fbf50e3419768526e597d274c3307a6b3ae37dfd4eff1ed76e2ee9daac66c9
-MISC ChangeLog 926 RMD160 1a61c76e964ae288e7a91c0103ecaf1f11c84cf6 SHA1 29a2731e43807dacfcca04f9b1eeea19674d2d09 SHA256 15aa940a5aa6c5047bd40ab760e5af1ff99da5e0806bd05970ebd871e30c0616
+EBUILD smp_utils-0.96.ebuild 854 RMD160 06ee6c797e3374d878cd8d8163272fe03c42ab88 SHA1 78e084813fb66c61bca14baaed3f0a660cb1c7dc SHA256 1bb50866b71e017e35da9afc5b298382aa59ccbc2552eefd0149658ed3724670
+MISC ChangeLog 1137 RMD160 8d818953c3cb9c4d4066a83d3cfa77d44a71a24f SHA1 f874b0935ad3b81d4b862685fe5744c4c5b8869d SHA256 2059fbf9d01de46ffe8a7da3caff31a655ededec0db3906bd08f7a7b64da8c52
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOXK4QAAoJEEqz6FtPBkyjg14H/3nMj/4v9KIeUZNRULVCllHW
+AsY+56+RqPuOaZoLZGZgVjrrb5L14EMEedvMxvGn1dr3gYcwxbPTxKb/0V33bv87
+qdipwjhHcBUEjKmXCNjAJE+r1cBdTCJsLPphvGDWr6uK00SAurcLwOtfo7uBI+0s
+EGvpsF1Ic+BecMahK0jsCksPMNOIh83rKGi5638l9DW9RUq5tbNtEQGBlTun4Z30
+mxiszAQmHInxMdm70F6h56ZmG80QaChZqWdyMvx9l0rNnG4yZ+Nza9HdOn2yHND1
+J+wpecFwJCRVLeGJTIQ+BT2mCKge2xpXUQIaSUNeuy7+wI4kpsjRGL75PHdE6CE=
+=iKcP
+-----END PGP SIGNATURE-----
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
+}