5 files changed, 37 insertions, 87 deletions
diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog
index af0910e55c34..bceba38270f9 100644
--- a/sys-apps/mtree/ChangeLog
+++ b/sys-apps/mtree/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mtree
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.14 2009/03/14 11:54:05 nixnut Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.15 2012/07/01 16:44:39 ryao Exp $
+
+*mtree-1.0 (01 Jul 2012)
+
+  01 Jul 2012; Richard Yao <ryao@gentoo.org> +mtree-1.0.ebuild,
+  -mtree-1.5.ebuild, -mtree-2007.4.ebuild, metadata.xml:
+  Rebase on mtree-port to fix build issues. Approved by Flameeyes in IRC. Drop
+  keywords on untested architectures.
 
   14 Mar 2009; nixnut <nixnut@gentoo.org> mtree-2007.4.ebuild:
   ppc stable #258256
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 96a2d586367d..659da0ca93c2 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/mtree/mtree-1.0.ebuild b/sys-apps/mtree/mtree-1.0.ebuild
new file mode 100644
index 000000000000..973457aedafe
--- /dev/null
+++ b/sys-apps/mtree/mtree-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.0.ebuild,v 1.1 2012/07/01 16:44:39 ryao Exp $
+
+EAPI=4
+
+DESCRIPTION="Directory hierarchy mapping tool from FreeBSD"
+HOMEPAGE="http://code.google.com/p/mtree-port/"
+SRC_URI="http://mtree-port.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install()
+{
+
+	default_src_install
+
+	# Avoid conflict with app-arch/libarchive
+	rm "${ED}usr/share/man/man5/mtree.5"
+
+}
diff --git a/sys-apps/mtree/mtree-1.5.ebuild b/sys-apps/mtree/mtree-1.5.ebuild
deleted file mode 100644
index 62057c8add66..000000000000
--- a/sys-apps/mtree/mtree-1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.9 2007/12/22 11:50:39 dertobi123 Exp $
-
-inherit eutils
-
-DESCRIPTION="check the permissions of a file system against a spec file"
-HOMEPAGE="http://www.netbsd.org/"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/packages/bootstrap-pkgsrc.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc s390 x86"
-IUSE=""
-DEPEND=""
-
-S=${WORKDIR}/bootstrap-pkgsrc
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-}
-
-src_compile() {
-	cd digest
-	chmod +x configure
-	econf || die "econf failed"
-	emake || die
-	cd ../mtree
-	chmod +x configure
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	cd mtree
-	dosbin mtree || die
-	doman mtree.8
-}
diff --git a/sys-apps/mtree/mtree-2007.4.ebuild b/sys-apps/mtree/mtree-2007.4.ebuild
deleted file mode 100644
index 474b80f3e1ef..000000000000
--- a/sys-apps/mtree/mtree-2007.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-2007.4.ebuild,v 1.5 2009/03/14 11:54:05 nixnut Exp $
-
-inherit flag-o-matic eutils
-
-MY_PV=${PV/./Q}
-DESCRIPTION="check the permissions of a file system against a spec file"
-HOMEPAGE="http://www.netbsd.org/"
-SRC_URI="ftp://ftp.netbsd.org/pub/pkgsrc/pkgsrc-${MY_PV}/pkgsrc-${MY_PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~s390 x86"
-IUSE=""
-
-S=${WORKDIR}/pkgsrc/pkgtools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}+glibc-2.8.patch"
-}
-
-src_compile() {
-	cd "${S}"/libnbcompat/files
-	econf || die "econf libnbcompat failed"
-	# workaround weak makefile dependencies
-	emake nbcompat/nbtypes.h || die "emake nbcompat/nbtypes.h failed"
-	emake || die "emake libnbcompat failed"
-	cd "${S}"/mtree/files
-	append-cppflags -I../../libnbcompat/files
-	LIBS=../../libnbcompat/files/libnbcompat.a \
-	econf || die "econf mtree failed"
-	emake || die "emake mtree failed"
-}
-
-src_install() {
-	cd mtree/files
-	dosbin mtree || die
-	doman mtree.8
-}