Version bump #338467 by Michaelian Ennis. Respect env build settings #336022 by Diego Elio Pettenò.

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

4 files changed, 75 insertions, 11 deletions

diff --git a/sys-block/aoetools/ChangeLog b/sys-block/aoetools/ChangeLog
index c5ef25e013ea..6594b0da1e3b 100644
--- a/sys-block/aoetools/ChangeLog
+++ b/sys-block/aoetools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/aoetools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/aoetools/ChangeLog,v 1.37 2010/06/02 07:04:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/aoetools/ChangeLog,v 1.38 2010/12/13 10:30:37 vapier Exp $
+
+*aoetools-32 (13 Dec 2010)
+
+  13 Dec 2010; Mike Frysinger <vapier@gentoo.org> +aoetools-32.ebuild,
+  +files/aoetools-32-build.patch:
+  Version bump #338467 by Michaelian Ennis. Respect env build settings
+  #336022 by Diego Elio Pettenò.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove caleb from metadata.xml (#317071)
diff --git a/sys-block/aoetools/Manifest b/sys-block/aoetools/Manifest
index 4688842800b1..3327589ad60d 100644
--- a/sys-block/aoetools/Manifest
+++ b/sys-block/aoetools/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST aoetools-24.tar.gz 26335 RMD160 d476b7e59f41c1c88ac5b69e27fe004c81284eb3 SHA1 7ebb67b301770c1d78e8ab466c01e2be60ea2f89 SHA256 6f97ed3413b9bb612c64c979edde3217cac85091d2e3434f7963c1fd37d93908
+AUX aoetools-32-build.patch 1095 RMD160 18b7a5a3f8b00e93c7590c8764c79d7ef6025e39 SHA1 6226f55f326c5bf3ad0989120905b812e3ccfa24 SHA256 993c5427f2b96efe00540031952c92cc7e1fa2a149115d3ab2a7df584ac8ed0c
 DIST aoetools-27.tar.gz 28368 RMD160 15b91cb4706c8f252ff19066291a2d435656915e SHA1 91645514605d0f539b352616733f965588719e01 SHA256 ba216052442b9af38dd6238db23f3a65e3ef58da93cb37378b85ee88173f7dee
-DIST aoetools-29.tar.gz 28530 RMD160 632ff3bc0616902b3af29eb32124f884c83d0ea1 SHA1 7c30e37357c84e9fcb437802f47c2e2f6c6e47b4 SHA256 caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3
 DIST aoetools-30.tar.gz 28799 RMD160 b1724a988f79d1c48db500291c73c7eb502d5a6f SHA1 6cba4a722ff3c90532910fdfe687dbbe87f0eb48 SHA256 2132d04efbe86705843a0a9dcfc57828c94e5990a71974b33846088e2478022b
-EBUILD aoetools-24.ebuild 819 RMD160 fcec0555ef6246ee70255716e4079c92291bfcb8 SHA1 4112edffb88a477157705f929b425ba941a6b5ea SHA256 748b7efa959d07ff2c125f80a9930c1ea57c6f58cc3387379186162dd6baa6c9
+DIST aoetools-32.tar.gz 34923 RMD160 5e6a2cdaee044a1713d12c77ea6de5a90845a810 SHA1 ea7fecd7ee9828a898b234abe9b3d55f296f8b66 SHA256 283acd4554db892702c8213485f01ea79c432e1540f68e0ad02a523d7590da37
 EBUILD aoetools-27.ebuild 824 RMD160 64973de368ccb7f19b6b318649bc4da001ad6440 SHA1 4e2dc040650755044ff2fcc696d73923363e3b0a SHA256 ef722308e6c5b424f1442d636b918f86fb66bb4829c58938204131df4f8073a1
-EBUILD aoetools-29.ebuild 770 RMD160 bb2bf3f38afcfc5d5df12b69809640e6bde61dd6 SHA1 fc6b10a37824ebf0b28db2d97d3bfe13c46d024c SHA256 f13af753d21099edfe8a97a2a30fc64cd44c102ea6c5e7a9fb14ca5a57483c45
 EBUILD aoetools-30.ebuild 771 RMD160 23a706d6b3f42e36e2742afac22626f3d69cd615 SHA1 c1d61676e00d49debeb518d265b11587c9138814 SHA256 3b655b59e3ac3e132f551582d45ee13bba1c8b779c69324e78b779ac18e4bdaa
-MISC ChangeLog 4355 RMD160 0dc54d9844609226dbf7b62d9152817eb392669b SHA1 0b784c311169f4358f460149d86cb079ab65d720 SHA256 7018f40bab82718aff287923059f1929d7ca7b289d6105ee0e0eea46da286c04
+EBUILD aoetools-32.ebuild 658 RMD160 d12a28f1673a0a9b3565c6f0a5b40b5186bef027 SHA1 679d2e6ba3c9c0345e4e19148a31264de2051c78 SHA256 2d095e1dbdc2ec8af0b63e8c44736fb1e6a6cf5e81fbaf1865fb65d04090e7ad
+MISC ChangeLog 4596 RMD160 349b5edf3b049982d153bd3a9548f80ab3e90138 SHA1 238c95500be36f68b8eebb1d34c4b4e74717436a SHA256 ad37e6e9d23cdcad542f2e2c4da28c7bc566ffeb999527c0c30918df9549586b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwGAqAACgkQV3J2n04Eaux/PACgr2Vqf8ChEkMrDCVB3BsWok0q
-sq8AoL/gS34TVtMtFChdRHjUhSWR5TsE
-=rtuX
+iF4EAREIAAYFAk0F9bUACgkQTwhj9JtAlp6aRgD/ajEohnvOfqH+BmHA+fp1KT5y
+k85wjLeh3mhNnNKB3GwBAJDCPyPJcQM0sL19n+0qeOb1loi2jW1YGPNhIc+jKa84
+=Zj5i
 -----END PGP SIGNATURE-----
diff --git a/sys-block/aoetools/aoetools-32.ebuild b/sys-block/aoetools/aoetools-32.ebuild
new file mode 100644
index 000000000000..a22a24ad9600
--- /dev/null
+++ b/sys-block/aoetools/aoetools-32.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/aoetools/aoetools-32.ebuild,v 1.1 2010/12/13 10:30:37 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tools for ATA over Ethernet (AoE) network storage protocol"
+HOMEPAGE="http://aoetools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aoetools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-32-build.patch
+	tc-export CC
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc NEWS README
+}
diff --git a/sys-block/aoetools/files/aoetools-32-build.patch b/sys-block/aoetools/files/aoetools-32-build.patch
new file mode 100644
index 000000000000..abd2cce3d847
--- /dev/null
+++ b/sys-block/aoetools/files/aoetools-32-build.patch
@@ -0,0 +1,32 @@
+--- Makefile
++++ Makefile
+@@ -40,7 +40,7 @@
+ CONF_SCRIPTS = aoe-discover aoe-interfaces aoe-mkshelf aoe-revalidate aoe-flush aoe-stat
+ PROGS = aoeping aoecfg aoe-sancheck
+ COMMANDS := ${CONF_SCRIPTS} aoe-mkdevs aoe-version coraid-update ${PROGS}
+-CFLAGS = -Wall -O -g
++CFLAGS += $(CPPFLAGS)
+ SANCHECKLIBS = -lpthread
+ 
+ AOE_PING_OBJ = aoeping.o linux.o
+@@ -68,17 +68,17 @@
+ 	rm -f ${CONF_SCRIPTS} ${AOE_PING_OBJ} ${AOE_CFG_OBJ} ${SANCHECK_OBJ} ${PROGS}
+ 
+ aoeping : ${AOE_PING_OBJ}
+-	${CC} ${CFLAGS} -o $@ ${AOE_PING_OBJ}
++	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_PING_OBJ}
+ aoeping.o : aoeping.c dat.h fns.h
+ 	${CC} ${CFLAGS} -o $@ -c $<
+ linux.o : linux.c config.h
+ 	${CC} ${CFLAGS} -o $@ -c $<
+ aoecfg: ${AOE_CFG_OBJ}
+-	${CC} ${CFLAGS} -o $@ ${AOE_CFG_OBJ}
++	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_CFG_OBJ}
+ aoecfg.o : aoecfg.c dat.h fns.h
+ 	${CC} ${CFLAGS} -o $@ -c $<
+ aoe-sancheck : ${SANCHECK_OBJ}
+-	-$(CC) $(CFLAGS) -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
++	-$(CC) $(CFLAGS) ${LDFLAGS} -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
+ aoe-sancheck.o : aoe-sancheck.c
+ 	-$(CC) $(CFLAGS) -o $@ -c $<
+