Add fuse USE flag; bug #314451

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

diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog
index c7665e0311be7281e7d1ae3ba1101519d3e40215..8ce8ecd9416600892557d1659da35935ad87e8d1 100644 (file)
--- a/sys-apps/usermode-utilities/ChangeLog
+++ b/sys-apps/usermode-utilities/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/usermode-utilities
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.31 2009/09/23 20:28:36 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.32 2010/04/10 13:20:48 dang Exp $
+
+*usermode-utilities-20070815-r1 (10 Apr 2010)
+
+  10 Apr 2010; Daniel Gryniewicz <dang@gentoo.org>
+  -usermode-utilities-20040406-r1.ebuild,
+  -usermode-utilities-20060216.ebuild, -usermode-utilities-20060323.ebuild,
+  +usermode-utilities-20070815-r1.ebuild, metadata.xml:
+  Add fuse USE flag; bug #314451
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   usermode-utilities-20040406-r1.ebuild, usermode-utilities-20060216.ebuild,

diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index 8916ab572006b638b926769135c7508e657911f1..643ae33cc8eba77043fa5610dcc26b88763c32ba 100644 (file)
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -1,14 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20040406-CAN-2004-1295.patch 668 RMD160 34a3fa4a5994acef97be62149acdaeacf97aa71d SHA1 8c315f56cbed27e48fd92f76a2429ae19d2f0d73 SHA256 0fcf6b1d3d7af58749b22c2cae139c2f51aa3dc1a90e59bbeba7c7ae9e3feefc
 AUX usermode-utilities-20060216-unlazy.patch 566 RMD160 9939b86aec08c96fd16defd11adb9d4d2e5535f1 SHA1 4916dd7afbd9221ddbe87dbaf26f0dfb6ec8a608 SHA256 8fa28878ef85f531cf385fb8b6724978a805ba44c4d54bd5a2d6b3c519e2c972
 AUX usermode-utilities-20060323-nostrip.patch 4013 RMD160 8cd09aa46bda25c5f064a9e13fb6805d5330d85c SHA1 f9aa69460ee7ad7f678358abc433f4b8d1ff1762 SHA256 c7fb2502012f959f908d1e62684d8afe4cd20ff39541475e37c6a051c0f21de2
 AUX usermode-utilities-20070815-nostrip.patch 4438 RMD160 7e471979b63676187e78f7c7ad894c870d11c7a0 SHA1 51ad783e58ccab5bb26e5b9e222abdb3d54c39cb SHA256 ba90c88f4d7f4f296154aceacbcbec64c8bbe62c3a632896f00c88ad28151c14
-DIST uml_utilities_20040406.tar.bz2 60201 RMD160 7408636b8bba767867356a404f6c2bb2298d56b5 SHA1 6a2eb9df9fd37ee367af71c11a27e9ee14733517 SHA256 4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41
-DIST uml_utilities_20060216.tar.bz2 56887 RMD160 fb85f1a65c4783f4da86f345be795592e8e8d4ad SHA1 a11487923c7e6203dcdd142c0468ba4e6ef3e240 SHA256 bebc98d40679eac36d98a2b603247df48f4d4495c03440d34c915cab1c94bf9f
-DIST uml_utilities_20060323.tar.bz2 45718 RMD160 9e077843dd8f4736cf560f5d333fcec536a22285 SHA1 7c5569338097808818b9c99b4c413e5fb09ef285 SHA256 10e471edfad724675e8eea80c66cc77e550ef66454767a1a9f11c7dc65d813cf
 DIST uml_utilities_20070815.tar.bz2 50159 RMD160 f231ae4ebe5892a6acdd725fec446692b04dddcb SHA1 4e10de8e0f5bf681fa295572009518b77fd8a1dd SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e
-EBUILD usermode-utilities-20040406-r1.ebuild 798 RMD160 6292239fd22cde46addfe4529ed13b6058aa5a3b SHA1 b7ae57b5198b295f15ebb61539b651d4985035f1 SHA256 e23e7ef8b7ef5bcf5cf487e74d54d1a6d4df026521f8e50f428f8c522f01159b
-EBUILD usermode-utilities-20060216.ebuild 801 RMD160 33d820816cc82d43e451c1aa5bd4df1cc82ea103 SHA1 c5425f974f3f3925fea054e05e98b80e6a2e80e0 SHA256 801190251f92fd53e7cc989c70f878e47b98e78f9bc70f7350221d4a88429492
-EBUILD usermode-utilities-20060323.ebuild 850 RMD160 3138008e3409b441ed8bf942321f84dd487e0fd0 SHA1 110c5e69320d1ca8073dcf9ef32a3e62ed7c23ee SHA256 23888b7672a55e64605bdf903bb3f3465906b48730667036470c34a7c8f2478d
+EBUILD usermode-utilities-20070815-r1.ebuild 1319 RMD160 10b2d5efd6ad105a5c76b8d501d5d46a82be7f76 SHA1 93a3fa7d9ba77734ea9ae228a34c4c6982564ffb SHA256 991c71c3bec44f56ac1209bd2bd114ba1977a5175bb4cf5a84fae365beb1bb8b
 EBUILD usermode-utilities-20070815.ebuild 1118 RMD160 eb8f487c65420e4ebd3a3a5227f16281cfce6b33 SHA1 ed99f01ad78af318bb01daeada788f299a088d82 SHA256 1014a4987d22b781df156189e69baa6676715f458ab18e01680e0c8125d7d46f
-MISC ChangeLog 5342 RMD160 fe3f1f0c06ea888e7f09a8c1ac8271c9c465583f SHA1 faba62c9678481171a1706dd9a9583196735d9bc SHA256 596b464b8f481499fbdb1c9d902b8ee18474807fd4eb1af20fc693bd5ee8d12d
-MISC metadata.xml 251 RMD160 1069216a5c850c42b866cad9d2957b2ac5663282 SHA1 a0a8e3f888c4040c99f2171f60862aca5e872ba2 SHA256 fabba472710dbd68a6e6bfc1cd4a41c0ed98ad02bebee900b2dd01d52a599031
+MISC ChangeLog 5645 RMD160 15d19e5cba2e929f5c2f8bef47487c5a12734f3b SHA1 e838286876884a5882dd34f4827957df698da8e4 SHA256 496ef24ef73fcbfe2410d865c82f0caa52c6fb3c1f2a277e1b13d8750416aa62
+MISC metadata.xml 336 RMD160 4e386b707a12089941830c6af733742fafe9c3bd SHA1 83d274af40fdbdfbe5afee5ca2df3f6c265302b4 SHA256 294be96abec9f27d9bdf05bc0fe460da3bbc4cf50952f08ec0547972d934116f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvAexMACgkQomPajV0RnrGbJACfcAB/1wuHxEKfnWZcjoysgE7J
+zIcAnj0yiotwGPWMY85cRIInGLoKDMnU
+=2Uwp
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/usermode-utilities/metadata.xml b/sys-apps/usermode-utilities/metadata.xml
index bc2fc87f95577acf7f5ef09176fe51f8898705b4..64b48039fc779da0d5179f73e949c1fadd4b520c 100644 (file)
--- a/sys-apps/usermode-utilities/metadata.xml
+++ b/sys-apps/usermode-utilities/metadata.xml
@@ -6,4 +6,7 @@
        <name>Daniel Gryniewicz</name>
 </maintainer>
 <herd>no-herd</herd>
+<use>
+       <flag name='fuse'>Build tools (currently umlmount) needing fuse</flag>
+</use>
 </pkgmetadata>

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild
deleted file mode 100644 (file)
index bcb9414..0000000
--- a/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild
+++ /dev/null
@@ -1,33 +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/usermode-utilities/usermode-utilities-20040406-r1.ebuild,v 1.2 2009/09/23 20:28:36 patrick Exp $
-
-inherit eutils
-
-S=${WORKDIR}/tools
-DESCRIPTION="Tools for use with Usermode Linux virtual machines"
-SRC_URI="mirror://sourceforge/user-mode-linux/uml_utilities_${PV}.tar.bz2"
-HOMEPAGE="http://user-mode-linux.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc -sparc -alpha"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${PV}-CAN-2004-1295.patch
-}
-
-src_compile() {
-       emake CFLAGS="${CFLAGS} -DTUNTAP -D_LARGEFILE64_SOURCE -g -Wall" all
-}
-
-src_install () {
-       make DESTDIR=${D} install
-
-       dodoc COPYING
-}

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20060216.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20060216.ebuild
deleted file mode 100644 (file)
index 1caaa88..0000000
--- a/sys-apps/usermode-utilities/usermode-utilities-20060216.ebuild
+++ /dev/null
@@ -1,33 +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/usermode-utilities/usermode-utilities-20060216.ebuild,v 1.2 2009/09/23 20:28:36 patrick Exp $
-
-inherit eutils
-
-S=${WORKDIR}/tools-${PV}
-DESCRIPTION="Tools for use with Usermode Linux virtual machines"
-SRC_URI="http://www.user-mode-linux.org/~blaisorblade/uml-utilities/uml_utilities_${PV}.tar.bz2"
-HOMEPAGE="http://user-mode-linux.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${P}-unlazy.patch
-}
-
-src_compile() {
-       emake CFLAGS="${CFLAGS} -DTUNTAP -D_LARGEFILE64_SOURCE -g -Wall" all
-}
-
-src_install () {
-       make DESTDIR=${D} install
-
-       dodoc COPYING
-}

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20060323.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20060323.ebuild
deleted file mode 100644 (file)
index a3b740a..0000000
--- a/sys-apps/usermode-utilities/usermode-utilities-20060323.ebuild
+++ /dev/null
@@ -1,34 +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/usermode-utilities/usermode-utilities-20060323.ebuild,v 1.2 2009/09/23 20:28:36 patrick Exp $
-
-inherit eutils
-
-S=${WORKDIR}/tools-${PV}
-DESCRIPTION="Tools for use with Usermode Linux virtual machines"
-SRC_URI="http://www.user-mode-linux.org/~blaisorblade/uml-utilities/uml_utilities_${PV}.tar.bz2"
-HOMEPAGE="http://user-mode-linux.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${PN}-20060216-unlazy.patch
-       epatch ${FILESDIR}/${P}-nostrip.patch
-}
-
-src_compile() {
-       emake CFLAGS="${CFLAGS} -DTUNTAP -D_LARGEFILE64_SOURCE -g -Wall" all
-}
-
-src_install () {
-       make DESTDIR=${D} install
-
-       dodoc COPYING
-}

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r1.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r1.ebuild
new file mode 100644 (file)
index 0000000..80795ca
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20070815-r1.ebuild,v 1.1 2010/04/10 13:20:48 dang Exp $
+
+inherit eutils
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="fuse"
+
+RDEPEND="fuse? ( sys-fs/fuse )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-20060216-unlazy.patch
+       epatch "${FILESDIR}"/${P}-nostrip.patch
+       sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+       sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+       if ! use fuse; then
+               einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+               sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+       fi
+}
+
+src_compile() {
+       emake CFLAGS="${CFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all || die "Compilation failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "Install failed"
+}