reinit the tree, so we can have metadata

7 files changed, 242 insertions, 0 deletions

diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest
new file mode 100644
index 000000000000..9c2863d7ff5a
--- /dev/null
+++ b/sys-boot/dvhtool/Manifest
@@ -0,0 +1,9 @@
+AUX dvhtool-1.0.1-add-raid-lvm-parttypes.patch 1067 SHA256 09b0358113c7a83b3c94f0f55849654e47a85a686daf53d55ed8dacecb89206a SHA512 d5ac48abaca65937831a71cc24a7da28211a30fc700d2a955b8c1aed04667e9f34ca058ecc7a1da5b3d73377895dfa3327bf3d723247377a26da7805b2adf036 WHIRLPOOL bc0498019313b91977271fe8a6be0e5c6ecac025cda7e83e2f102391220bb67fabbde7a0d9e597bd18464f0932f0a7b24faa070640270203b00a4d2d27173bfe
+AUX dvhtool-1.0.1-debian-warn_type_guess.diff 296 SHA256 b5601df82ad723651ac72116f8fbaddc61c744be2988a4a10f41b523aa2dbd2a SHA512 0eed46bc6e49854bb4396d516c6e1879043a987e96066c33e519d295e09601b0f95e5b7667b5ea40d05ff8861f64f3446ef84b6bca225288f46f3f93c8dbec65 WHIRLPOOL aecf705051ed95994542c033d08087c7e6a87c86801eab305206631eddddaf8558f031d772eb1a3a533856fabb23fcdb1e14dc3b8bf96c7a2d73a65eb2331bd5
+AUX dvhtool-1.0.1-debian-xopen_source.diff 208 SHA256 2b147a4564a206d98c466857207bac4a43985c1fd4651b2a423be908b5ce48ae SHA512 500a25a70f94af2911387729cc7fc4320904049f15c437b85030b3bb8694d798dd55a839df141823947b53758888a8e47eb02d24643209401406e50d68196ab1 WHIRLPOOL 2d9aba604dc3a01eba0ffc7670001e3fb1b997288ca6829b5f6c5f3bcd5ab7dc81c4a55337d4a5be509044354801fc0e59852886dd11703c3459934acb1bef2c
+AUX dvhtool-1.0.1-debian.diff 4724 SHA256 e5f385d7ae53b2c150f2a042ddf2bae249ddf7a7baf186b3b0665c1129afafb8 SHA512 e495f03249b9b026cee2caa68653630216e7884bd7cb441d7d3939f9cf1d9a48892bad15416cdd205c5e28e6d0a31442aba888cf1cc4900b2c098decdce5ac14 WHIRLPOOL c2744ff78eebf7d8d01f75ba184e31e41dc12077e16fd3d67d11bb32553fbca1f80aeb5ee99e0f371a779395a36c3188fe0e53e5d0e107ea2f7dda4e2ba8ac2f
+DIST dvhtool_1.0.1.orig.tar.gz 53283 SHA256 3596c74c08ee8f2f19712e8f0ab1f7ff8c483de7bfc2f50d205a186f52896f02 SHA512 e81c4427f98a7aa79b9e8cee6fad35822d5fa48fda17f656407d1d6de50658ff2c8b6c3a890ae07afafebf126b5388c98ebf63af4a93bf1091161a27ea09d140 WHIRLPOOL b70cb0170252bc9709aa7ced89ca8efd30721670688940f9e1cedb5deef18018da50762d79e7ea7c63ee1a2dcd63ed8d84708d4a80a3bb5105a9dd5fc7ffc140
+EBUILD dvhtool-1.0.1-r2.ebuild 989 SHA256 a211145152736ee1136680d335e5e2704fe7a26db3904b31aa12eae13708562d SHA512 be38e8ac66f39ba8700d7c4783cec12fa6bfcbde7fd3ee922386b9daa3b760f5119a2688c38eaa75a8993e927460962398cbb261b40fa100b2e962d043666652 WHIRLPOOL afb3dd91fb2825034dccde765a54f4a84b4ed5d1995c198767b4dfa4ac03fb2614b7af880f79a295af5a628bd030955bea5660cea6721166563f570e47cb5157
+MISC ChangeLog 2621 SHA256 b3ca08b489334960ec54be65fbfb661572f37342281a3ef3255014e4e5491016 SHA512 ffa2ee5647472fd6632252924eab98004986216dbe845076f382be53c7ebc31b55ef8834056db79a47573751d00e14c8a96b02efb829eb68a4af0c5f25c31655 WHIRLPOOL 00cfe5d3e2a6f0ea93689a4661bc89417ccfad0e33f327f07830b3a0cacfefaa80e6c3c41c1d42b1b61445a6538a4c1d6fd2dd753394d211494727c652d39dc5
+MISC ChangeLog-2015 2627 SHA256 d8c8eec3271f8de01596e12ef860adc9ee0a2fbf77d6ee89322749f5b2c7bf86 SHA512 525a5e43d6fcad4b5ccf7b944444ef5cd82083dfc8a5979a1cf5f430e1744664ccb4313b05084792183b533ac87b5230c968e26f980566c8f9fc495834596ab3 WHIRLPOOL 811b6f35a0a3993810e6cc9d460c0fea9ec229383256ba8d658795ea62edb59ee27f8654459eff4b39b680e2acf62cd4d06288f3125168d9d4d8276199cc9a6a
+MISC metadata.xml 244 SHA256 45137d4c0d67babcbe5e68d0ae2bd162db10bcbdbb7a3c0c4c2a63e6952a5330 SHA512 c95e0438b39ea88f5522fa5cb8c9b37168e9d6da9c4b9ce2b5e4952117e5dbc74efbf6e21e055a3b9c8c483870386d84a2950611dac33d4239ba559c2aa57362 WHIRLPOOL b650bc145a04c907ca29d22d41b0dc217cca1e4ae85cab8bb4471179703a7affa83b921008acf3745b2e4c678e30592b59db332db16686afb79db37070bf71f5
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..784aecf4b352
--- /dev/null
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations"
+HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool"
+SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+S="${S}.orig"
+
+src_prepare() {
+	# several applicable hunks from a debian patch
+	epatch "${FILESDIR}"/${P}-debian.diff
+
+	# Newer minor patches from Debian
+	epatch "${FILESDIR}"/${P}-debian-warn_type_guess.diff
+	epatch "${FILESDIR}"/${P}-debian-xopen_source.diff
+
+	# Allow dvhtool to recognize Linux RAID and Linux LVM partitions
+	epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	CC=$(tc-getCC) LD=$(tc-getLD) \
+		econf
+}
+
+src_compile() {
+	CC=$(tc-getCC) LD=$(tc-getLD) \
+		emake
+}
diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch b/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch
new file mode 100644
index 000000000000..2a3cd753252b
--- /dev/null
+++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch
@@ -0,0 +1,24 @@
+diff -Naurp dvhtool-1.0.1.orig-A/dvh.h dvhtool-1.0.1.orig/dvh.h
+--- dvhtool-1.0.1.orig-A/dvh.h	2005-09-28 02:45:56 -0400
++++ dvhtool-1.0.1.orig/dvh.h	2005-09-28 02:41:15 -0400
+@@ -129,6 +129,8 @@ struct partition_table {		/* one per log
+ #define	PTYPE_XVM	13		/* partition is sgi XVM */
+ #define	PTYPE_LSWAP	0x82		/* partition is Linux swap */
+ #define	PTYPE_LINUX	0x83		/* partition is Linux native */
++#define PTYPE_LLVM	0x8e		/* partition is Linux LVM */
++#define PTYPE_LRAID	0xfd		/* partition is Linux RAID */
+ #define NPTYPES		16
+ 
+ #define	VHMAGIC		0xbe5a941	/* randomly chosen value */
+diff -Naurp dvhtool-1.0.1.orig-A/dvhlib.c dvhtool-1.0.1.orig/dvhlib.c
+--- dvhtool-1.0.1.orig-A/dvhlib.c	2005-09-28 02:45:56 -0400
++++ dvhtool-1.0.1.orig/dvhlib.c	2005-09-28 02:41:45 -0400
+@@ -52,6 +52,8 @@ ptype2str(int ptype)
+ 	case PTYPE_XVM:		return "XVM Volume";
+ 	case PTYPE_LSWAP:	return "Linux Swap";
+ 	case PTYPE_LINUX:	return "Linux Native";
++	case PTYPE_LLVM:	return "Linux LVM";
++	case PTYPE_LRAID:	return "Linux RAID";
+ 	}
+ 	return "Unknown Partition Type";
+ }
diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-warn_type_guess.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-warn_type_guess.diff
new file mode 100644
index 000000000000..bab2a305be92
--- /dev/null
+++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-warn_type_guess.diff
@@ -0,0 +1,12 @@
+--- a/dvhlib.h
++++ b/dvhlib.h
+@@ -3,7 +3,8 @@ #include "config.h"
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #else
+-typedef unsigned int uint32_t;		/* A guess ...  */
++    #warning Guessing type of uint32_t
++    typedef unsigned int uint32_t;		/* A guess ...  */
+ #endif
+ 
+ #include "dvh.h"
diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-xopen_source.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-xopen_source.diff
new file mode 100644
index 000000000000..333eb2a74064
--- /dev/null
+++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian-xopen_source.diff
@@ -0,0 +1,11 @@
+diff --git a/dvhlib.c b/dvhlib.c
+--- a/dvhlib.c
++++ b/dvhlib.c
+@@ -1,6 +1,7 @@
+ /*
+  * Disk Volume Header Library
+  */
++#define _XOPEN_SOURCE 500
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff
new file mode 100644
index 000000000000..43f33ffc2596
--- /dev/null
+++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff
@@ -0,0 +1,135 @@
+--- dvhtool-1.0.1.orig/dvh.h
++++ dvhtool-1.0.1/dvh.h
+@@ -127,6 +127,8 @@
+ #define	PTYPE_XFSLOG	11		/* partition is sgi XFS log */
+ #define	PTYPE_XLV	12		/* partition is part of an XLV vol */
+ #define	PTYPE_XVM	13		/* partition is sgi XVM */
++#define	PTYPE_LSWAP	0x82		/* partition is Linux swap */
++#define	PTYPE_LINUX	0x83		/* partition is Linux native */
+ #define NPTYPES		16
+ 
+ #define	VHMAGIC		0xbe5a941	/* randomly chosen value */
+--- dvhtool-1.0.1.orig/dvhlib.c
++++ dvhtool-1.0.1/dvhlib.c
+@@ -50,6 +50,8 @@
+ 	case PTYPE_XFSLOG:	return "XFS Log";
+ 	case PTYPE_XLV:		return "XLV Volume";
+ 	case PTYPE_XVM:		return "XVM Volume";
++	case PTYPE_LSWAP:	return "Linux Swap";
++	case PTYPE_LINUX:	return "Linux Native";
+ 	}
+ 	return "Unknown Partition Type";
+ }
+@@ -325,8 +327,10 @@
+ 	if (res == -1)
+ 		die("Couldn't stat source file");
+ 
+-	/* XXX pad to blocksize? */
+-	size = vh->vh_pt[8].pt_nblks * blksize - istat.st_size;
++	/* calculate free blocks in vh */
++	size = vh->vh_pt[8].pt_nblks				/* total vh size */
++		- ( vh->vh_pt[8].pt_firstlbn + 4 )		/* reserved area */
++		- (( istat.st_size + blksize - 1 ) / blksize );	/* pad to blocksize */
+ 	/*
+ 	 * Are we replacing an existing file, check for enough space and free
+ 	 * entry in volume header
+@@ -336,16 +340,15 @@
+ 			/* It's an existing file, delete it.  */
+ 			memset(vd->vd_name, 0, VDNAMESIZE);
+ 			vd->vd_nbytes = 0;
+-			break;
+ 		}
+ 		if ( vd->vd_nbytes ) {
+-			size -= vd->vd_nbytes;
++			size -= (vd->vd_nbytes + blksize - 1 ) / blksize; /* pad to blocksize */
+ 			num++;
+ 		}
+ 		vd++;
+ 	}
+ 
+-	if ( num == NVDIR ) 
++	if ( num == NVDIR )
+ 		die("No more free entries in volume header");
+ 	if ( size <= 0 )
+ 		die("Not enough space left in volume header");
+@@ -403,7 +406,7 @@
+ 				die("Short write");
+ 			}
+ 		}
+-		dest += (vd->vd_nbytes + 511) / 512;	/* XXX Blocksize  */
++		dest += (vd->vd_nbytes + blksize - 1) / blksize;
+ 		vd++;
+ 	}
+ 
+--- dvhtool-1.0.1.orig/dvhtool.8
++++ dvhtool-1.0.1/dvhtool.8
+@@ -1,4 +1,4 @@
+-.TH DVHTOOL 1 "July 2000"
++.TH DVHTOOL 8 "July 2000"
+ .UC 4
+ .SH NAME
+ dvhtool \- Disk volume header manipulation tool
+@@ -85,4 +85,4 @@
+ .PP
+ .I dvhtool
+ was written by Ralf Baechle <ralf@oss.sgi.com>, Keith M. Wesolowski <wesolows@foobazco.org>,
+-Tor Arntsen <tor@spacetec.no>, Guido Guenther <guido.guenther@gmx.net>. 
++Tor Arntsen <tor@spacetec.no>, Guido Guenther <agx@debian.org>. 
+--- dvhtool-1.0.1.orig/Makefile.in
++++ dvhtool-1.0.1/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+ 
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -104,7 +103,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES =  .deps/dvhlib.P .deps/dvhtool.P .deps/getopt.P \
+ .deps/getopt1.P .deps/pread.P
+@@ -124,7 +123,7 @@
+ $(ACLOCAL_M4):  configure.in  acinclude.m4
+ 	cd $(srcdir) && $(ACLOCAL)
+ 
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ 	cd $(srcdir) && $(AUTOCONF)
+@@ -173,8 +172,8 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -382,7 +381,7 @@
+ all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h
+ all-redirect: all-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
+ 
diff --git a/sys-boot/dvhtool/metadata.xml b/sys-boot/dvhtool/metadata.xml
new file mode 100644
index 000000000000..4c41df3d6e65
--- /dev/null
+++ b/sys-boot/dvhtool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mips@gentoo.org</email>
+	<name>Gentoo/MIPS Port</name>
+</maintainer>
+</pkgmetadata>