Fix owner of humfsify; bug #364531

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 63 insertions, 2 deletions

diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog
index 877d55d493f5..43e141220618 100644
--- a/sys-apps/usermode-utilities/ChangeLog
+++ b/sys-apps/usermode-utilities/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/usermode-utilities
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.33 2010/08/05 02:31:51 dang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.34 2011/05/02 15:09:18 dang Exp $
+
+*usermode-utilities-20070815-r3 (02 May 2011)
+
+  02 May 2011; Daniel Gryniewicz <dang@gentoo.org>
+  +usermode-utilities-20070815-r3.ebuild,
+  +files/usermode-utilities-20070815-humfsify-owner.patch:
+  Fix owner of humfsify; bug #364531
 
 *usermode-utilities-20070815-r2 (05 Aug 2010)
 
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch
new file mode 100644
index 000000000000..9d02498052f0
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch
@@ -0,0 +1,12 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile
+--- tools-20070815.orig/humfsify/Makefile	2006-05-25 14:37:01.000000000 -0400
++++ tools-20070815/humfsify/Makefile	2011-05-02 11:04:32.531034342 -0400
+@@ -4,7 +4,7 @@ all:
+ 
+ install:
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR)
+ 
+ clean:
+ 	rm -f *~
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
new file mode 100644
index 000000000000..981a8e705a1f
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/05/02 15:09:18 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}"
+	# Merge previous patches with fix for bug #331099
+	epatch "${FILESDIR}"/${P}-rollup.patch
+	# Fix owner of humfsify; bug #364531
+	epatch "${FILESDIR}"/${P}-humfsify-owner.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"
+}