revert

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

4 files changed, 12 insertions, 37 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 6c7dcdcb14e1..2704b5ca7285 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,6 @@
 # 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.154 2012/08/12 15:25:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.155 2012/08/12 15:40:26 ssuominen Exp $
 
   12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.1.4.ebuild,
   mdadm-3.1.5.ebuild, mdadm-3.2.3-r2.ebuild, mdadm-3.2.5-r1.ebuild:
@@ -14,7 +14,7 @@
 *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:
+  +mdadm-3.2.5-r1.ebuild:
   Query value of udevdir from udev.pc pkg-config file wrt #430900 by Nikolay S.
   Rybaloff
 
diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
deleted file mode 100644
index f0dcb6d09f5f..000000000000
--- a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
index 4cd74fc9f0d8..61d49810e5d0 100644
--- a/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/08/12 15:25:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild,v 1.3 2012/08/12 15:40:26 ssuominen Exp $
 
 EAPI="2"
 inherit multilib eutils flag-o-matic toolchain-funcs
@@ -25,12 +25,14 @@ 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
+
+	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s:/lib/udev:${udevdir}:" Makefile || die #430900
 }
 
 mdadm_emake() {
 	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
diff --git a/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild
index f100023f9745..52f788f423bb 100644
--- a/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/08/12 15:25:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild,v 1.3 2012/08/12 15:40:26 ssuominen Exp $
 
 EAPI="4"
 inherit multilib eutils flag-o-matic toolchain-funcs
@@ -25,12 +25,14 @@ 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
+
+	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s:/lib/udev:${udevdir}:" Makefile || die #430900
 }
 
 mdadm_emake() {
 	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \