Query value of udevdir from udev.pc pkg-config file wrt #430900 by Nikolay S. Rybaloff

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

4 files changed, 187 insertions, 1 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 125f0f5be75c..be92d84be95f 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.151 2012/05/24 04:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.152 2012/08/12 15:21:49 ssuominen Exp $
+
+*mdadm-3.2.5-r1 (12 Aug 2012)
+*mdadm-3.2.3-r2 (12 Aug 2012)
+
+  12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +mdadm-3.2.3-r2.ebuild,
+  +mdadm-3.2.5-r1.ebuild, +files/mdadm-3.2.x-udevdir.patch:
+  Query value of udevdir from udev.pc pkg-config file wrt #430900 by Nikolay S.
+  Rybaloff
 
 *mdadm-3.2.5 (24 May 2012)
 
diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
new file mode 100644
index 000000000000..f0dcb6d09f5f
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/430900
+
+--- Makefile
++++ Makefile
+@@ -98,6 +98,15 @@
+ MAN5DIR = $(MANDIR)/man5
+ MAN8DIR = $(MANDIR)/man8
+ 
++ifndef PKG_CONFIG
++  PKG_CONFIG = pkg-config
++endif
++
++UDEVDIR = $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
++ifndef UDEVDIR
++  UDEVDIR = lib/udev
++endif
++
+ OBJS =  mdadm.o config.o policy.o mdstat.o  ReadMe.o util.o maps.o lib.o \
+ 	Manage.o Assemble.o Build.o \
+ 	Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \
+@@ -253,7 +262,7 @@
+ 	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+ 
+ install-udev: udev-md-raid.rules
+-	$(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules
++	$(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/$(UDEVDIR)/rules.d/64-md-raid.rules
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
diff --git a/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild b/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
new file mode 100644
index 000000000000..ea1036c45093
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild,v 1.1 2012/08/12 15:21:49 ssuominen Exp $
+
+EAPI="2"
+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="virtual/pkgconfig"
+RDEPEND="!<sys-apps/baselayout-2
+	>=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_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.2.3-segv-assemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.2.x-udevdir.patch #430900
+}
+
+mdadm_emake() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	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}
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+	newinitd "${FILESDIR}"/mdraid.rc 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 you're not relying on kernel auto-detect of your RAID devices,"
+	elog "you need to add 'mdraid' to your 'boot' runlevel:"
+	elog "rc-update add mdraid boot"
+}
diff --git a/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..b80a7a85e39f
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild,v 1.1 2012/08/12 15:21:49 ssuominen Exp $
+
+EAPI="4"
+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="virtual/pkgconfig"
+RDEPEND="!<sys-apps/baselayout-2
+	>=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_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
+	sed -i 's:/run/mdadm:/var/run/mdadm:g' *.[ch] Makefile || die
+	epatch "${FILESDIR}"/${PN}-3.2.x-udevdir.patch #430900
+}
+
+mdadm_emake() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	into /
+	dosbin mdassemble
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s:/lib/rcscripts/:/$(get_libdir)/rcscripts/:" \
+		"${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "If you're not relying on kernel auto-detect of your RAID devices,"
+	elog "you need to add 'mdraid' to your 'boot' runlevel:"
+	elog "rc-update add mdraid boot"
+}