Pull in util-linux for libuuid.

4 files changed, 17 insertions, 7 deletions

diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog
index 3021018f8360..28037fb7e70b 100644
--- a/sys-fs/mtd-utils/ChangeLog
+++ b/sys-fs/mtd-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/mtd-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.25 2009/12/04 21:23:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.26 2009/12/29 06:23:04 vapier Exp $
+
+  29 Dec 2009; Mike Frysinger <vapier@gentoo.org> mtd-utils-20080907.ebuild,
+  mtd-utils-20090630.ebuild, mtd-utils-99999999.ebuild:
+  Pull in util-linux for libuuid.
 
   04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mtd-utils-20090630.ebuild:
diff --git a/sys-fs/mtd-utils/mtd-utils-20080907.ebuild b/sys-fs/mtd-utils/mtd-utils-20080907.ebuild
index 6d3760ad4eb3..6ec2e3c8ccc3 100644
--- a/sys-fs/mtd-utils/mtd-utils-20080907.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-20080907.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20080907.ebuild,v 1.7 2009/12/01 03:27:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20080907.ebuild,v 1.8 2009/12/29 06:23:04 vapier Exp $
 
 inherit toolchain-funcs eutils
 
@@ -31,11 +31,13 @@ src_unpack() {
 	sed -i 's:-Werror::' $(find . -name Makefile)
 	epatch "${FILESDIR}"/mtd-utils-fixup.patch
 	sed -i -e 's:\<ar\>:$(AR):' tests/ubi-tests/Makefile || die
+	sed -i -e 's:\<ranlib\>:$(RANLIB):' ubi-utils/new-utils/Makefile || die
 }
 
 src_compile() {
 	tc-export AR RANLIB
-	emake \
+	# -j1 for #276374
+	emake -j1 \
 		CC="$(tc-getCC)" \
 		OPTFLAGS="${CFLAGS}" \
 		$(use xattr || echo WITHOUT_XATTR=1) \
diff --git a/sys-fs/mtd-utils/mtd-utils-20090630.ebuild b/sys-fs/mtd-utils/mtd-utils-20090630.ebuild
index 2d2ee5cd1a24..a73ce63c21b2 100644
--- a/sys-fs/mtd-utils/mtd-utils-20090630.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-20090630.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20090630.ebuild,v 1.3 2009/12/04 21:23:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20090630.ebuild,v 1.4 2009/12/29 06:23:04 vapier Exp $
 
 inherit eutils
 
@@ -15,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 IUSE="xattr"
 
+# We need libuuid
 RDEPEND="!sys-fs/mtd
 	dev-libs/lzo
-	sys-libs/zlib"
+	sys-libs/zlib
+	>=sys-apps/util-linux-2.16"
 # ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
 # And ACL brings in Attr as well.
 DEPEND="${RDEPEND}
diff --git a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
index a8ad670556f7..c1f41f6d5813 100644
--- a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-99999999.ebuild,v 1.2 2009/12/01 03:13:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-99999999.ebuild,v 1.3 2009/12/29 06:23:04 vapier Exp $
 
 ECVS_USER="anoncvs"
 ECVS_PASS="anoncvs"
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="xattr"
 
+# We need libuuid
 RDEPEND="!sys-fs/mtd
 	dev-libs/lzo
-	sys-libs/zlib"
+	sys-libs/zlib
+	>=sys-apps/util-linux-2.16"
 # ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
 # And ACL brings in Attr as well.
 DEPEND="xattr? ( sys-apps/acl )