Pull in lzo since we use it #208428 by Mart Raudsepp.

(Portage version: 2.1.4)

4 files changed, 13 insertions, 45 deletions

diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog
index 202a6f45441d..7963f2cc05f8 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.9 2008/01/26 08:45:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.10 2008/02/01 13:58:30 vapier Exp $
+
+  01 Feb 2008; Mike Frysinger <vapier@gentoo.org> mtd-utils-9999.ebuild,
+  -mtd-utils-20060606.ebuild, mtd-utils-20080102.ebuild:
+  Pull in lzo since we use it #208428 by Mart Raudsepp.
 
   26 Jan 2008; Mike Frysinger <vapier@gentoo.org> mtd-utils-20060907.ebuild:
   Move to mips stable #203855.
diff --git a/sys-fs/mtd-utils/mtd-utils-20060606.ebuild b/sys-fs/mtd-utils/mtd-utils-20060606.ebuild
deleted file mode 100644
index 8aa7fe77d47d..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-20060606.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20060606.ebuild,v 1.4 2006/09/08 01:02:10 robbat2 Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="MTD userspace tools, based on GIT snapshot from upstream"
-HOMEPAGE="http://sources.redhat.com/jffs2/"
-SRC_URI="mirror://gentoo/${PN}-snapshot-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DEPEND="sys-libs/zlib
-		sys-apps/acl
-		!sys-fs/mtd"
-
-src_unpack() {
-	unpack ${A}
-	sed -i.orig \
-		-e 's!^MANDIR.*!MANDIR = /usr/share/man!g' \
-		-e 's!-include.*!!g' \
-		"${S}"/Makefile
-}
-
-src_compile() {
-	append-flags -I./include -Wall
-	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc *.txt
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-20080102.ebuild b/sys-fs/mtd-utils/mtd-utils-20080102.ebuild
index 7d1a7dd6890c..c31d0054f927 100644
--- a/sys-fs/mtd-utils/mtd-utils-20080102.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-20080102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20080102.ebuild,v 1.1 2008/01/02 21:36:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20080102.ebuild,v 1.2 2008/02/01 13:58:30 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -19,11 +19,12 @@ IUSE="xattr"
 S=${WORKDIR}/${PN}.git
 
 RDEPEND="!sys-fs/mtd
-		sys-libs/zlib"
+	dev-libs/lzo
+	sys-libs/zlib"
 # 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 )
-		${DEPEND}"
+	${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/mtd-utils/mtd-utils-9999.ebuild b/sys-fs/mtd-utils/mtd-utils-9999.ebuild
index a5e81af7acaf..809e6f912065 100644
--- a/sys-fs/mtd-utils/mtd-utils-9999.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-9999.ebuild,v 1.2 2008/01/02 21:36:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-9999.ebuild,v 1.3 2008/02/01 13:58:30 vapier Exp $
 
 ECVS_USER="anoncvs"
 ECVS_PASS="anoncvs"
@@ -17,11 +17,12 @@ KEYWORDS=""
 IUSE="xattr"
 
 RDEPEND="!sys-fs/mtd
-		sys-libs/zlib"
+	dev-libs/lzo
+	sys-libs/zlib"
 # 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 )
-		${DEPEND}"
+	${DEPEND}"
 
 src_unpack() {
 	git_src_unpack