diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2010-04-10 13:20:48 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2010-04-10 13:20:48 +0000 |
commit | 7e1900d9ee20d259bb68d970ca87a269dc1be8e9 (patch) | |
tree | 087c7bb02a7663e8748fd479cdc832c6e802d0df | |
parent | Set SUPPORT_PYTHON_ABIS. (diff) | |
download | gentoo-2-7e1900d9ee20d259bb68d970ca87a269dc1be8e9.tar.gz gentoo-2-7e1900d9ee20d259bb68d970ca87a269dc1be8e9.tar.bz2 gentoo-2-7e1900d9ee20d259bb68d970ca87a269dc1be8e9.zip |
Add fuse USE flag; bug #314451
(Portage version: 2.2_rc67/cvs/Linux x86_64)
6 files changed, 53 insertions, 102 deletions
diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog index c7665e0311be..8ce8ecd94166 100644 --- 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/metadata.xml b/sys-apps/usermode-utilities/metadata.xml index bc2fc87f9557..64b48039fc77 100644 --- 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 index bcb941481118..000000000000 --- 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 index 1caaa8894c29..000000000000 --- 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 index a3b740acc5be..000000000000 --- 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 index 000000000000..80795ca7ef20 --- /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" +} |