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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog
index 3071f6e576219339145549329398cfef32cc9790..cc9f5865fe7d06a6ea3901463f3833d17a4e5999 100644 (file)
--- 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/Manifest b/sys-fs/mtd-utils/Manifest
index 4ec975cfbbf6058031d5392aa0e084164e3fcd77..fa4e0097aef225569b349cacdfd73862c500ea0f 100644 (file)
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 AUX mtd-utils-fixup.patch 1172 RMD160 3372bedd828485d2edd6cf9ea61d3896d3e929f7 SHA1 fdfe1799fc2a4479b09e07d0df9f5e7c054960f4 SHA256 994c98f2866826c592a300a95304822f6453ea8cdc8ba6a20c26d5f07c92b0c8
 DIST mtd-utils-snapshot-20080907-41c53b6f2d756ae995c3ffa4455576515427c5e0.tar.gz 400957 RMD160 da8b2b632a33db084b735683b1fbf00dd55de611 SHA1 83c5ab77504cb9f09bf15d3d92a23122817a7339 SHA256 9d26274299de7722ee2d3080e16d3fced04fd0d428a84c20ea6a628e180953e9
 DIST mtd-utils-snapshot-20090630-22494a8d105936785af53235b088fa38112128fc.tar.bz2 323899 RMD160 b4f3814e41ca4e942189c0a1615e875567558e1e SHA1 e11125edd1840a83f6a5a77e541bd2c2f85379c1 SHA256 8510b6bed46c30e595166eeafa9dd5493c4d77403c5cacf7a54ba4b7e77a8b76
+DIST mtd-utils-snapshot-20100718-02ae0aac87576d07202a62d11294ea55b56f450b.tar.xz 304580 RMD160 a8cdecab24b5ff9ad1e2570e5acf6166edd9c042 SHA1 b1447b5278b9bce5e438628d25c0f414247457e9 SHA256 e69d163662f64af4d3e78a84fe0ad9b2f0e7b1bc90ec1fcf792986a62a126a18
 EBUILD mtd-utils-20080907.ebuild 1608 RMD160 dfc45e5d3542879129e1bc85e80458814d23d86e SHA1 8bed687f40840961fb5237fbb722264ab7427189 SHA256 510882ebe871a112e523ec8e2156c4a1b25822bd0231380152a74f3c617f74e1
 EBUILD mtd-utils-20090630.ebuild 1609 RMD160 bf4c109ee8dad6eca079bc2b8431749575c9a20c SHA1 f9cf1e2696a986c64d4cd35b2587b990c85d7f1c SHA256 6de641b8aba90baa65aa07dc7533f7d35321b78fa457152ff2eaf0e1ed09cc0c
-EBUILD mtd-utils-99999999.ebuild 1252 RMD160 9fabcddb38ee8ee7723ff5fd381fe09a340463b1 SHA1 502d264a8929c314844cfffd697a3af71bcb7796 SHA256 7c06cde617946db25d762f7b4ffd56a73c9ea94d9e355af1cd78a3197082d589
-MISC ChangeLog 4440 RMD160 1f0832707a2e3a1715b9b606996c4ddd2ddb84b4 SHA1 edf32bf9064a6c7baa0711da495dfb5daa0494ee SHA256 644e65fc8265e9e856d99f1c264ac82d570af6911301c4527ddd39f11395d3a7
+EBUILD mtd-utils-20100718.ebuild 1222 RMD160 06c8f8380bb1d029d547ecf2d69a0a0d213565ba SHA1 2a3482ec279357d56205d8f54b1ac37cec19f8fc SHA256 2f2e4f64965ec90c93aa2067b411f7b955fbf09763882d2b2523059580783b8c
+EBUILD mtd-utils-99999999.ebuild 1222 RMD160 752ad23a5a948c9cd3cb4383260a2de37f91692d SHA1 c8db0d316e37ec4b40bb0d035a34ede4d14feca4 SHA256 69977f11ad5f838b2123de076130f082d272527b7529e96be1b8848bde06a6eb
+MISC ChangeLog 4657 RMD160 3ce4db1c9612b1b5c0479eaf314a867c19876b8c SHA1 c2e5be81f411668cf3622b8f7721ef3a4182806a SHA256 621e470d7a1251ada61bc703d55b1713e93298d70667cf004fb1a0085e1a35f5
 MISC metadata.xml 249 RMD160 17bb23a33d6d3f30d98add1bb64dded5a0fde760 SHA1 d172f42fc79136ad548e4662ce60b4a6c03c61a4 SHA256 badfb914d33de984b5268b8761e0648601efce96b880f1463397b27ef93638b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkt5xyIACgkQTwhj9JtAlp53LQEAh2nPpBqfEjE4aL4j4nOsqBmZ
-w+X6vVpB7mKbtYb9NRgA/0yoHdUwXY0JIpaZ2NfLHo3ydQw0n6b4Rcv/grN0kKuD
-=9KGH
+iF4EAREIAAYFAkxDXyMACgkQTwhj9JtAlp4KqQD7BBb81vQ02Xu2jDSE3AVToPy0
+TPeCn0mopg+VDH+oUhoBALrMiF8KdX5bWSAlCuqmiQ8U03CjcGx/63g+tv755Ugi
+=u1d5
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/mtd-utils/mtd-utils-20100718.ebuild b/sys-fs/mtd-utils/mtd-utils-20100718.ebuild
new file mode 100644 (file)
index 0000000..3b4e852
--- /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 c1f41f6d5813832adcc9291c4ae9a3a76cc2b45f..6161a191aa7b456a2519e84e3de90a2da1cbc749 100644 (file)
--- 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
 }