Add two new patches from Debian, fix up some QA issues, and add ~amd64 to KEYWORDS.

Package-Manager: portage-2.1.6.7/cvs/Linux mips64

5 files changed, 52 insertions, 13 deletions

diff --git a/sys-boot/dvhtool/ChangeLog b/sys-boot/dvhtool/ChangeLog
index ec5270efe9ba..d3540d69c77f 100644
--- a/sys-boot/dvhtool/ChangeLog
+++ b/sys-boot/dvhtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-boot/dvhtool
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.10 2008/03/27 16:41:50 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.11 2009/03/01 22:37:10 kumba Exp $
+
+*dvhtool-1.0.1-r2 (01 Mar 2009)
+
+  01 Mar 2009; Joshua Kinard <kumba@gentoo.org>
+  +files/dvhtool-1.0.1-debian-warn_type_guess.diff,
+  +files/dvhtool-1.0.1-debian-xopen_source.diff, -dvhtool-1.0.1-r1.ebuild,
+  +dvhtool-1.0.1-r2.ebuild:
+  Add two new patches from Debian, fix up some QA issues, and add ~amd64 to
+  KEYWORDS.
 
   27 Mar 2008; Raúl Porcel <armin76@gentoo.org> dvhtool-1.0.1-r1.ebuild:
   Fix debian HOMEPAGE
diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest
index d22bd103a81f..4c1d2b70f505 100644
--- a/sys-boot/dvhtool/Manifest
+++ b/sys-boot/dvhtool/Manifest
@@ -1,6 +1,8 @@
 AUX dvhtool-1.0.1-add-raid-lvm-parttypes.patch 1067 RMD160 0b69970604469984c7261526dc36a98fa23441ca SHA1 7c01547395c81b4b2be30b63420475e833769bad SHA256 09b0358113c7a83b3c94f0f55849654e47a85a686daf53d55ed8dacecb89206a
+AUX dvhtool-1.0.1-debian-warn_type_guess.diff 296 RMD160 a0bd3998920f5f38e14b9dcd49ed519fa36d65e9 SHA1 15a20ed805fb17a279c91ed9ec2d1fee6fc8d998 SHA256 b5601df82ad723651ac72116f8fbaddc61c744be2988a4a10f41b523aa2dbd2a
+AUX dvhtool-1.0.1-debian-xopen_source.diff 208 RMD160 1f5121c81e88d54a0d9b4a33ddb476db42a71d94 SHA1 9b07bfc34b29f1c66fa14f0260eadb081c429e07 SHA256 2b147a4564a206d98c466857207bac4a43985c1fd4651b2a423be908b5ce48ae
 AUX dvhtool-1.0.1-debian.diff 5271 RMD160 f15462771e12c48b7bc6dbe2d679dfe6fa170028 SHA1 9f971fe66862e1fe8435075b94c20161dc34608a SHA256 081d8155ee5b155343a9c8530becd83cb41955fbb344b886b67ff4189a74dfa9
 DIST dvhtool_1.0.1.orig.tar.gz 53283 RMD160 6e9096ac0dc81c2e1a93b7891ec25e373f3c4b40 SHA1 3d371f3e17c3d0af117f86dfc4be1736ce6ef01b SHA256 3596c74c08ee8f2f19712e8f0ab1f7ff8c483de7bfc2f50d205a186f52896f02
-EBUILD dvhtool-1.0.1-r1.ebuild 932 RMD160 108e8713cc77f60f564e8d73e9062dc682d1b1fd SHA1 cf615664e0e72ec4f8c7713b6176efd36d9a551e SHA256 e9b079c12a968d6f81ab6bf46bfed525d3aa81c6685ebe9a97b97e8d393a6f29
-MISC ChangeLog 1770 RMD160 569c7998d7ff0ea3acbad5750bce60142a1e6bbf SHA1 90acf50e2082432aa0900d118f6d52daceaa0df5 SHA256 cbe172d8ffc308e2f2aa249ff34b09f093081a885771991b06730ad923b45dec
+EBUILD dvhtool-1.0.1-r2.ebuild 1101 RMD160 f14bed3b863c969a1725265247d4da55737f04a5 SHA1 934eea074f61c728ce977a678ebd4b2ccb7b8bca SHA256 bd7d3fa031b1e6436c068cad1997e018946227dfd23ea99a29c7ef02551afed9
+MISC ChangeLog 2093 RMD160 7aedd483e68082020acd3e7161d490a23a9a0c47 SHA1 a3f2dcc2d830370d779d1cca06cb00d21f8aafb3 SHA256 4998dce8fadefd968306c58818aedc735955e599bb2af6bdbff5ee362e622d72
 MISC metadata.xml 157 RMD160 0ac2d8532124fa8abeb7b2cdeb4a980a63448ed0 SHA1 08e1838ad5d8737c3255d39f582261a4535757f5 SHA256 4d611693c6a98b16de7a5c6ca73f3c809f24019563a364abafb59216082bc42f
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
index c3e2eaad8a1a..569e9950de04 100644
--- a/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild,v 1.4 2008/03/27 16:41:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild,v 1.1 2009/03/01 22:37:10 kumba Exp $
 
 inherit eutils
 
-DESCRIPTION="Dvhtool is the tool responsible for writing MIPS kernel(s) into the SGI volume header"
+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="-* ~x86 mips"
+KEYWORDS="-* ~mips ~x86 ~amd64"
 IUSE=""
 DEPEND=""
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}.orig
+	cd "${S}.orig"
 
 	# several applicable hunks from a debian patch
-	epatch ${FILESDIR}/${P}-debian.diff
+	epatch "${FILESDIR}"/${P}-debian.diff
+
+	# Newer minor patches from Debian
+	epatch "${FILESDIR}"/${P}-debian-warn_type_guess.diff
+	epatch "${FILESDIR}"/${P}-debian-debian-xopen_source.diff
 
 	# Allow dvhtool to recognize Linux RAID and Linux LVM partitions
-	epatch ${FILESDIR}/${P}-add-raid-lvm-parttypes.patch
+	epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch
 }
 
 src_compile() {
-	cd ${S}.orig
+	cd "${S}.orig"
 	econf || die "econf failed"
 	emake || die "Failed to compile"
 }
 
 src_install() {
-	cd ${S}.orig
+	cd "${S}.orig"
 	einstall
 }
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>