From f78e45793fa130a4e7c69d0755890626b58827cd Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Sun, 1 Mar 2009 22:37:10 +0000 Subject: Add two new patches from Debian, fix up some QA issues, and add ~amd64 to KEYWORDS. (Portage version: 2.1.6.7/cvs/Linux mips64) --- sys-boot/dvhtool/ChangeLog | 13 +++++-- sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild | 37 ------------------- sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild | 42 ++++++++++++++++++++++ .../dvhtool-1.0.1-debian-warn_type_guess.diff | 12 +++++++ .../files/dvhtool-1.0.1-debian-xopen_source.diff | 11 ++++++ 5 files changed, 76 insertions(+), 39 deletions(-) delete mode 100644 sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild create mode 100644 sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild create mode 100644 sys-boot/dvhtool/files/dvhtool-1.0.1-debian-warn_type_guess.diff create mode 100644 sys-boot/dvhtool/files/dvhtool-1.0.1-debian-xopen_source.diff 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 + +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 dvhtool-1.0.1-r1.ebuild: Fix debian HOMEPAGE diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild deleted file mode 100644 index c3e2eaad8a1a..000000000000 --- a/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2008 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 $ - -inherit eutils - -DESCRIPTION="Dvhtool is the tool responsible for writing MIPS kernel(s) into the SGI volume header" -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" -IUSE="" -DEPEND="" - -src_unpack() { - unpack ${A} - cd ${S}.orig - - # several applicable hunks from a debian patch - epatch ${FILESDIR}/${P}-debian.diff - - # Allow dvhtool to recognize Linux RAID and Linux LVM partitions - epatch ${FILESDIR}/${P}-add-raid-lvm-parttypes.patch -} - -src_compile() { - cd ${S}.orig - econf || die "econf failed" - emake || die "Failed to compile" -} - -src_install() { - cd ${S}.orig - einstall -} 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..569e9950de04 --- /dev/null +++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild @@ -0,0 +1,42 @@ +# 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-r2.ebuild,v 1.1 2009/03/01 22:37:10 kumba Exp $ + +inherit eutils + +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="-* ~mips ~x86 ~amd64" +IUSE="" +DEPEND="" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}.orig" + + # 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-debian-xopen_source.diff + + # Allow dvhtool to recognize Linux RAID and Linux LVM partitions + epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch +} + +src_compile() { + cd "${S}.orig" + econf || die "econf failed" + emake || die "Failed to compile" +} + +src_install() { + 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 + #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 + #include + #include -- cgit v1.2.3-65-gdbad