reinit the tree, so we can have metadata

6 files changed, 200 insertions, 0 deletions

diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
new file mode 100644
index 000000000000..fb47c1cc54c7
--- /dev/null
+++ b/sys-apps/usermode-utilities/Manifest
@@ -0,0 +1,8 @@
+AUX usermode-utilities-20070815-headers.patch 551 SHA256 0f02af949a5692953212dc8eabd70bd67d22b1cdbfa79a8fe0b6e6dc8afdd59e SHA512 b22bf1d77b209996c24b400b3c27d37cef1fe8deddb07391394f5307fa5f0c41e36f78e5c09c6a40bc6618e7801220bdb139ef413fb712d68d73e54ed201a101 WHIRLPOOL 0bfbaec711ab4a63416e3194460505f3a80cd072778066df5ae0fe367cb70c82383f95a6242b31cfe5b12903d5914acdefa4608a91615343f99033c32bd0b282
+AUX usermode-utilities-20070815-humfsify-owner.patch 460 SHA256 e5118622f158da465e5e8a03b89f8993aecd7a3bd786b6912f81f0953ff05a4a SHA512 f048d1fde80a5fae33a67c99aad5927f64343a1bec15cdab94bb5c8798b96192fccedda66a9aa8f14fb90de803cba031ddec4d9bc6eec236b8245aaa7b74115f WHIRLPOOL f6161be0748f3258f9ce20443b1c7246528b138e4ac0383ac1765a0489f755be6234c92ff8e90fc3b4d342337d4e211fffa549c0945d8c6c414e75e8a5c76d7a
+AUX usermode-utilities-20070815-rollup.patch 4619 SHA256 06b9b613d94006cc4bda2baabf371e8de352593262417373bbd23698dd4710db SHA512 9cfc5a2fa98b7aff45c732629812ab691d3a56e5526f70d9ddb93dd666b9bf743296914f63043a94611e045915ed8046c87507a451deebc3d889d0827dc76439 WHIRLPOOL 8712020dbc151891e1c0ec0f2a5a9f595a38b99a6c7b68a11d4eb50d7af72574fdb960b87eaa403a8451947b68e8feef251523dbc8822e62108dbd4d310ec2e8
+DIST uml_utilities_20070815.tar.bz2 50159 SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a WHIRLPOOL 343e755da98d3d6a714a7c26cc917b01af7fc737c4a24806ad04c902e5a919cfdd831c3b18d7a2c5c7a271266f58d167ab9a788543b5a0f5671b9a6b639a37b1
+EBUILD usermode-utilities-20070815-r3.ebuild 1269 SHA256 45b2ff16f9bd033386d9ac403235509b4d52ac4d1566aa2afd21fb0b4a3831ca SHA512 21db6e3680315826e40397c9f9703de051ccd6db856afd48093ce5fa7a31d730e32030bcd9385c641830f9a07497cc638f4f1dd131333c9af926cdd726c9330f WHIRLPOOL fd8fcd3b1b9dca372809010d8bd48b4ecf7ce35005b7ef6a35b5383004c737329b1de7d260f36837caaaab4efc844c8d52e74f582195db7f8aeb2294fcb99f08
+MISC ChangeLog 3401 SHA256 778c9b00b49b87ec2cedfd3fd6f66eceb5ca3ce2356b2eee72e5e11633a79139 SHA512 7ca5f1413ffb87616d6c9762705f98415985d49a05a3cb3d60611ebd7e645f77cd32fecf1a3e2c102b81d673c19c0f6121431da71cae4c4c3f54c59f9019258b WHIRLPOOL d8d7715b6434ae879397bf6b3ac9be9f3b24ee8bdd44048e4900a55c88b83608766bf32b18630e1bfd121e38ede163d6c88ead0e87fe07d5f068995e493a9f71
+MISC ChangeLog-2015 7263 SHA256 ed2a66b85a69846aa200c2806aba12c87d9bc7be4e50a71cc6e5c8b68b1519f6 SHA512 3d7bff1dfba4d2353232a33bfc757a4c53ba2a216436671492e0788dc99f480a9aa8401e9ff472a0612bba92fac1d2ab35ef5bff778a02c40484f9e1e9a6b7da WHIRLPOOL 7976de219dbed33a2e65e1aeb9880df1d5ba047fef6d1785439a3280e38db16302a3bac3e87e4478848e7e9f5f65107b22e11b0fe1d30f2a21b8db9de818be7a
+MISC metadata.xml 340 SHA256 2769e2efea3686ded17f998579a6fefa901df1f04d208ee28adc882c86786de4 SHA512 cd72a8e80c3b9410363e3e9d3ddb194f858138598e3fd0375b38ab43d4ce82d29309aba07b71c3d2756e871168fbf1c8bb3f3ba87c00d0b27f1f3add2627734d WHIRLPOOL 8ec853fc14514ca58ae078fab6774accb043ce87fc715b0c8f5673bf930930f1cbccf8cbd6756bfc214893fadba5a4e9b7f5969c49a6cfd9d631b854c2205951
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
new file mode 100644
index 000000000000..13fd556ec98d
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/580816
+
+include headers needed by targets
+
+--- b/tools-20070815/uml_net/ethertap.c
++++ a/tools-20070815/uml_net/ethertap.c
+@@ -13,6 +13,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
++#include <sys/select.h>
+ #include "host.h"
+ #include "output.h"
+ 
+
+for major/minor macros
+
+--- b/tools-20070815/uml_net/host.c
++++ a/tools-20070815/uml_net/host.c
+@@ -10,6 +10,7 @@
+ #include <ctype.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include "output.h"
+ #include "host.h"
+ 
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/files/usermode-utilities-20070815-rollup.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
new file mode 100644
index 000000000000..f88e20663f5b
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
@@ -0,0 +1,101 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jail/Makefile tools-20070815/jail/Makefile
+--- tools-20070815.orig/jail/Makefile	2006-02-27 14:51:46.000000000 -0500
++++ tools-20070815/jail/Makefile	2010-08-04 22:17:56.869103217 -0400
+@@ -11,7 +11,7 @@ $(BIN) : $(OBJS)
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(SBIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
++	install $(BIN) $(DESTDIR)$(SBIN_DIR)
+ 
+ clean :
+ 	rm -rf *~ $(BIN) $(OBJS) cell[0-9]* core* tty_log_cell*
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jailtest/Makefile tools-20070815/jailtest/Makefile
+--- tools-20070815.orig/jailtest/Makefile	2006-02-27 14:52:53.000000000 -0500
++++ tools-20070815/jailtest/Makefile	2010-08-04 22:17:56.870032258 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/mconsole/Makefile tools-20070815/mconsole/Makefile
+--- tools-20070815.orig/mconsole/Makefile	2006-02-27 15:03:01.000000000 -0500
++++ tools-20070815/mconsole/Makefile	2010-08-04 22:17:56.916031770 -0400
+@@ -15,4 +15,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/moo/Makefile tools-20070815/moo/Makefile
+--- tools-20070815.orig/moo/Makefile	2006-02-27 15:08:49.000000000 -0500
++++ tools-20070815/moo/Makefile	2010-08-04 22:17:56.938282085 -0400
+@@ -23,4 +23,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/port-helper/Makefile tools-20070815/port-helper/Makefile
+--- tools-20070815.orig/port-helper/Makefile	2006-02-27 15:18:40.000000000 -0500
++++ tools-20070815/port-helper/Makefile	2010-08-04 22:17:56.938282085 -0400
+@@ -15,4 +15,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(LIB_DIR)
+-	install -s $(BIN) $(DESTDIR)$(LIB_DIR)
++	install $(BIN) $(DESTDIR)$(LIB_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/tunctl/Makefile tools-20070815/tunctl/Makefile
+--- tools-20070815.orig/tunctl/Makefile	2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/tunctl/Makefile	2010-08-04 22:17:56.939282225 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/umlfs/Makefile tools-20070815/umlfs/Makefile
+--- tools-20070815.orig/umlfs/Makefile	2006-02-27 16:11:25.000000000 -0500
++++ tools-20070815/umlfs/Makefile	2010-08-04 22:17:56.940282085 -0400
+@@ -16,4 +16,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_net/Makefile tools-20070815/uml_net/Makefile
+--- tools-20070815.orig/uml_net/Makefile	2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/uml_net/Makefile	2010-08-04 22:23:40.459151826 -0400
+@@ -2,6 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux
+ 
+ BIN = uml_net
+ CFLAGS ?= -g -Wall
++LDFLAGS += -Wl,-z,now
+ override CFLAGS += $(TUNTAP)
+ 
+ BIN_DIR ?= /usr/bin
+@@ -22,4 +23,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_switch/Makefile tools-20070815/uml_switch/Makefile
+--- tools-20070815.orig/uml_switch/Makefile	2006-02-27 15:20:26.000000000 -0500
++++ tools-20070815/uml_switch/Makefile	2010-08-04 22:17:56.942283133 -0400
+@@ -21,4 +21,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/watchdog/Makefile tools-20070815/watchdog/Makefile
+--- tools-20070815.orig/watchdog/Makefile	2006-02-27 15:55:34.000000000 -0500
++++ tools-20070815/watchdog/Makefile	2010-08-04 22:17:56.943282225 -0400
+@@ -14,4 +14,4 @@ clean :
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --git a/sys-apps/usermode-utilities/metadata.xml b/sys-apps/usermode-utilities/metadata.xml
new file mode 100644
index 000000000000..2ffcb96e8fe0
--- /dev/null
+++ b/sys-apps/usermode-utilities/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="fuse">Build tools (currently umlmount) needing fuse</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">user-mode-linux</remote-id>
+	</upstream>
+</pkgmetadata>
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..86a15526f28f
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="fuse"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+src_prepare() {
+	# 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
+	epatch "${FILESDIR}"/${P}-headers.patch #580816
+
+	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() {
+	tc-export AR CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
+}