Version bump.

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

3 files changed, 114 insertions, 1 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 9d0e3cde9c97..1ea411fd9511 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.141 2011/03/27 03:35:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.142 2011/03/27 03:35:45 vapier Exp $
+
+*mdadm-3.1.5 (27 Mar 2011)
+
+  27 Mar 2011; Mike Frysinger <vapier@gentoo.org> +mdadm-3.1.5.ebuild,
+  +files/mdadm-3.1.5-cflags.patch:
+  Version bump.
 
   27 Mar 2011; Mike Frysinger <vapier@gentoo.org> mdadm-3.1.4.ebuild,
   +files/mdadm-3.1.4-cflags.patch:
diff --git a/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch b/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch
new file mode 100644
index 000000000000..36005b919fbf
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch
@@ -0,0 +1,27 @@
+by Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+
+Use CFLAGS when using the compiler driver during the linking stage.
+Fixes Gentoo portage-multilib compilation failure.
+
+http://bugs.gentoo.org/336175
+
+--- a/Makefile
++++ b/Makefile
+@@ -144,7 +144,7 @@
+ # mdadm.tcc doesn't work..
+ 
+ mdadm : $(OBJS)
+-	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+ 
+ mdadm.static : $(OBJS) $(STATICOBJS)
+ 	$(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
+@@ -167,7 +167,7 @@
+ 
+ # use '' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+-	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+ 
+ test_stripe : restripe.c mdadm.h
diff --git a/sys-fs/mdadm/mdadm-3.1.5.ebuild b/sys-fs/mdadm/mdadm-3.1.5.ebuild
new file mode 100644
index 000000000000..a08ef431e178
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.1.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.5.ebuild,v 1.1 2011/03/27 03:35:45 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://neil.brown.name/blog/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND=""
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.1.5-cflags.patch #336175
+	use static && append-ldflags -static
+}
+
+mdadm_emake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+	newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
+	newconfd "${FILESDIR}"/mdraid.confd mdraid || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s:/lib/rcscripts/:/$(get_libdir)/rcscripts/:" \
+		"${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}