Update snapshot and merge the live/snap ebuilds #327775 by Raúl Porcel.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 85 insertions, 28 deletions

diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog
index 3071f6e57621..cc9f5865fe7d 100644
--- a/sys-fs/mtd-utils/ChangeLog
+++ b/sys-fs/mtd-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mtd-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.29 2010/02/14 18:38:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.30 2010/07/18 20:10:57 vapier Exp $
+
+*mtd-utils-20100718 (18 Jul 2010)
+
+  18 Jul 2010; Mike Frysinger <vapier@gentoo.org>
+  +mtd-utils-20100718.ebuild, mtd-utils-99999999.ebuild:
+  Update snapshot and merge the live/snap ebuilds #327775 by Raúl Porcel.
 
   14 Feb 2010; Robin H. Johnson <robbat2@gentoo.org>
   mtd-utils-20090630.ebuild:
diff --git a/sys-fs/mtd-utils/mtd-utils-20100718.ebuild b/sys-fs/mtd-utils/mtd-utils-20100718.ebuild
new file mode 100644
index 000000000000..3b4e8520079d
--- /dev/null
+++ b/sys-fs/mtd-utils/mtd-utils-20100718.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20100718.ebuild,v 1.1 2010/07/18 20:10:57 vapier Exp $
+
+EAPI="3"
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
+
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
+	SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="MTD userspace tools"
+HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="xattr"
+
+# We need libuuid
+RDEPEND="!sys-fs/mtd
+	dev-libs/lzo
+	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}
+	xattr? ( sys-apps/acl )"
+
+S=${WORKDIR}/${PN}
+
+makeopts() {
+	echo CROSS=${CHOST}-
+	use xattr || echo WITHOUT_XATTR=1
+}
+
+src_compile() {
+	emake $(makeopts) || die
+}
+
+src_install() {
+	emake $(makeopts) install DESTDIR="${D}" || die
+	dodoc *.txt
+	newdoc mkfs.ubifs/README README.mkfs.ubifs
+	# TODO: check ubi-utils for docs+scripts
+}
diff --git a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
index c1f41f6d5813..6161a191aa7b 100644
--- a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.3 2009/12/29 06:23:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-99999999.ebuild,v 1.4 2010/07/18 20:10:57 vapier Exp $
 
-ECVS_USER="anoncvs"
-ECVS_PASS="anoncvs"
-EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-inherit git
+EAPI="3"
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
+
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
+	SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
 
 DESCRIPTION="MTD userspace tools"
 HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="xattr"
 
 # We need libuuid
@@ -23,31 +30,23 @@ RDEPEND="!sys-fs/mtd
 	>=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 )
-	${DEPEND}"
-
-src_unpack() {
-	git_src_unpack
-	sed -i \
-		-e 's!^MANDIR.*!MANDIR = /usr/share/man!g' \
-		-e 's!-include.*!!g' \
-		-e '/make -C/s,make,$(MAKE),g' \
-		"${S}"/Makefile
+DEPEND="${RDEPEND}
+	xattr? ( sys-apps/acl )"
+
+S=${WORKDIR}/${PN}
+
+makeopts() {
+	echo CROSS=${CHOST}-
+	use xattr || echo WITHOUT_XATTR=1
 }
 
 src_compile() {
-	local myflags="-j1"
-	use xattr || myflags+=" WITHOUT_XATTR=1"
-	emake DESTDIR="${D}" \
-		CROSS=${CHOST}- \
-		OPTFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		${myflags} || die
+	emake $(makeopts) || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/include || die
+	emake $(makeopts) install DESTDIR="${D}" || die
 	dodoc *.txt
+	newdoc mkfs.ubifs/README README.mkfs.ubifs
 	# TODO: check ubi-utils for docs+scripts
 }