Don't patch generated autotools files, bug 226827. Bump to EAPI4.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 34 insertions, 38 deletions

diff --git a/sys-boot/dvhtool/ChangeLog b/sys-boot/dvhtool/ChangeLog
index 0fd1c987689f..f115137e4a6f 100644
--- a/sys-boot/dvhtool/ChangeLog
+++ b/sys-boot/dvhtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/dvhtool
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.13 2009/03/01 23:26:14 kumba Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.14 2011/08/18 03:35:05 mattst88 Exp $
+
+  18 Aug 2011; Matt Turner <mattst88@gentoo.org> dvhtool-1.0.1-r2.ebuild,
+  files/dvhtool-1.0.1-debian.diff:
+  Don't patch generated autotools files, bug 226827. Bump to EAPI4.
 
   01 Mar 2009; Joshua Kinard <kumba@gentoo.org> dvhtool-1.0.1-r2.ebuild:
   Make dvhtool cross-compilable via toolchain-funcs
diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest
index 5697824bfb30..cf399853584e 100644
--- a/sys-boot/dvhtool/Manifest
+++ b/sys-boot/dvhtool/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+AUX dvhtool-1.0.1-debian.diff 4724 RMD160 53281061417e82f497cb627ed08daf91dbd123c9 SHA1 bf68e7b2173d4ea7eb27a562d869c3b2c16fa759 SHA256 e5f385d7ae53b2c150f2a042ddf2bae249ddf7a7baf186b3b0665c1129afafb8
 DIST dvhtool_1.0.1.orig.tar.gz 53283 RMD160 6e9096ac0dc81c2e1a93b7891ec25e373f3c4b40 SHA1 3d371f3e17c3d0af117f86dfc4be1736ce6ef01b SHA256 3596c74c08ee8f2f19712e8f0ab1f7ff8c483de7bfc2f50d205a186f52896f02
-EBUILD dvhtool-1.0.1-r2.ebuild 1179 RMD160 70e506ae5ee6cde52c80aead1a895d785178a281 SHA1 c7536329d4139448c9572ef5259be2938ec51c01 SHA256 09b0bd41d45faa8574d827062739e445b0f57effe43b28afa14040f4b42bd205
-MISC ChangeLog 2327 RMD160 fe2e13e55c11d2b53de38a4ebae48d7bfe2f4eb7 SHA1 7582b87c3b1cfc01d527b4fbee0476ae438c2140 SHA256 b0c773c4b972709b97ab434009200c182f242389f59c0c24681e6e34ecc7a757
+EBUILD dvhtool-1.0.1-r2.ebuild 1107 RMD160 8ee9d3f3f0112287b7581d389af9c6d83ef230c7 SHA1 61cc348321087307fb54d3c1ed334bee29d50787 SHA256 655c9eecc68458178b2abeeaaf855ddfb671e86b8b5a5b706117f753d5f6ef00
+MISC ChangeLog 2508 RMD160 a3ccada50980a5beb3b080e13b5ab626d7535a1c SHA1 4ada230ae7c383665afe0de91d4014dfa92238e8 SHA256 6a9702796232d4865249683f23d6c515569e0c572f7e34d57902b6cc4f6bc264
 MISC metadata.xml 157 RMD160 0ac2d8532124fa8abeb7b2cdeb4a980a63448ed0 SHA1 08e1838ad5d8737c3255d39f582261a4535757f5 SHA256 4d611693c6a98b16de7a5c6ca73f3c809f24019563a364abafb59216082bc42f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5MiHcACgkQTVUdg23rv53eRwCfTsDQFW1YBI1o8qx2efHtoJW/
+dgsAn13i4BZ5eVFE4PkS108WIBjrkPKL
+=419f
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
index 5a7cd7cc51ce..ca963a6245e7 100644
--- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.3 2009/03/01 23:26:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild,v 1.4 2011/08/18 03:35:05 mattst88 Exp $
 
-inherit eutils toolchain-funcs
+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"
@@ -10,15 +12,14 @@ SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~mips ~x86 ~amd64"
+KEYWORDS="~amd64 ~mips ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}.orig"
+S="${S}.orig"
 
+src_prepare() {
 	# several applicable hunks from a debian patch
 	epatch "${FILESDIR}"/${P}-debian.diff
 
@@ -28,18 +29,16 @@ src_unpack() {
 
 	# Allow dvhtool to recognize Linux RAID and Linux LVM partitions
 	epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch
-}
 
-src_compile() {
-	cd "${S}.orig"
-	CC=$(tc-getCC) LD=$(tc-getLD) \
-		econf || die "econf failed"
+	eautoreconf
+}
 
+src_configure() {
 	CC=$(tc-getCC) LD=$(tc-getLD) \
-		emake || die "Failed to compile"
+		econf
 }
 
-src_install() {
-	cd "${S}.orig"
-	einstall
+src_compile() {
+	CC=$(tc-getCC) LD=$(tc-getLD) \
+		emake
 }
diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff
index 68a402008f74..43f33ffc2596 100644
--- a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff
+++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff
@@ -133,20 +133,3 @@
  installdirs:
  	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
  
---- dvhtool-1.0.1.orig/aclocal.m4
-+++ dvhtool-1.0.1/aclocal.m4
-@@ -1,4 +1,4 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4a
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -51,8 +51,6 @@
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
- [AC_REQUIRE([AC_PROG_INSTALL])
--dnl We require 2.13 because we rely on SHELL being computed by configure.
--AC_PREREQ([2.13])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]