Replace dos2unix with edos2unix for bug 162841 and fix missing asm/io.h.

Package-Manager: portage-2.1.2.3

4 files changed, 27 insertions, 34 deletions

diff --git a/media-video/vstrip/ChangeLog b/media-video/vstrip/ChangeLog
index 3c48ddc03e5d..155a63e66490 100644
--- a/media-video/vstrip/ChangeLog
+++ b/media-video/vstrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vstrip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/ChangeLog,v 1.4 2007/02/03 21:14:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/ChangeLog,v 1.5 2007/03/31 19:26:38 drac Exp $
+
+  31 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  files/vstrip-0.8f-gentoo.patch, vstrip-0.8f.ebuild:
+  Change dos2unix to edos2unix and fix include location from patch.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
index a3e3db4e7f5f..7cdf84d544c1 100644
--- a/media-video/vstrip/Manifest
+++ b/media-video/vstrip/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX vstrip-0.8f-gentoo.patch 2027 RMD160 84d086d3fad1e9a6fb9b395977f3f2ec135e3408 SHA1 3609937faab82b8b8fac30f0fff8caefe28d9a3f SHA256 d2900053b202525a27b13b9748b8aa89433fca97dcb2ddf1916c79ccaa7819dd
-MD5 5e8b0123e4210ad51352ae95aca5832e files/vstrip-0.8f-gentoo.patch 2027
-RMD160 84d086d3fad1e9a6fb9b395977f3f2ec135e3408 files/vstrip-0.8f-gentoo.patch 2027
-SHA256 d2900053b202525a27b13b9748b8aa89433fca97dcb2ddf1916c79ccaa7819dd files/vstrip-0.8f-gentoo.patch 2027
+AUX vstrip-0.8f-gentoo.patch 2027 RMD160 c36ea3738d2445445514e98f735102b1568e6e6a SHA1 c8893d0bba9aec1a523965efb092a038b196bed1 SHA256 6b9d3372f5470095850e84347941501e47664393f7865688a4459d0665b0e7f0
+MD5 53d74067e7c5e0c903218b5fad5f1eb3 files/vstrip-0.8f-gentoo.patch 2027
+RMD160 c36ea3738d2445445514e98f735102b1568e6e6a files/vstrip-0.8f-gentoo.patch 2027
+SHA256 6b9d3372f5470095850e84347941501e47664393f7865688a4459d0665b0e7f0 files/vstrip-0.8f-gentoo.patch 2027
 DIST vStrip_08f.zip 409157 RMD160 ad98ce87a97da98878711d5e14e9e33d270fce8f SHA1 5d8176b1c649188ab428513d0f30d837c8ae25ac SHA256 0813be0b20ab7eeacd7213df7fe1704ef6070471c953a705391d82bba78e8fff
-EBUILD vstrip-0.8f.ebuild 828 RMD160 29561c44b480cad36b5b0bbd6b27b823ffb7a4ac SHA1 6ded2921af0bc5413712f7a45f06dd73d23d6b40 SHA256 665eadc95de08ac4e3b3324a8394df2dc8d858a66eeaf5317157f652d540704f
-MD5 8a820d0f758bdfd74cbb1c8aeb6f82c0 vstrip-0.8f.ebuild 828
-RMD160 29561c44b480cad36b5b0bbd6b27b823ffb7a4ac vstrip-0.8f.ebuild 828
-SHA256 665eadc95de08ac4e3b3324a8394df2dc8d858a66eeaf5317157f652d540704f vstrip-0.8f.ebuild 828
-MISC ChangeLog 744 RMD160 e094c1a3c4fb70ab26d85b1d8b5ea963e54f400c SHA1 67fe145dc0c39d990cc20c5e83fdad6f3d7db003 SHA256 3f085ca43c480ecd605063447de1aba9246d6bed56216528aed0e9a9ce3f8c93
-MD5 5bd931d159db46153f1f8b494519cc87 ChangeLog 744
-RMD160 e094c1a3c4fb70ab26d85b1d8b5ea963e54f400c ChangeLog 744
-SHA256 3f085ca43c480ecd605063447de1aba9246d6bed56216528aed0e9a9ce3f8c93 ChangeLog 744
+EBUILD vstrip-0.8f.ebuild 776 RMD160 ca88aae4dfd7b520c383078ac34a337db01e9198 SHA1 99c6c654049a9643a23a9965cf2ee9f495e19b7f SHA256 984cfb1520b0b66d0c13cb75e412a8cdd2eb6894600a7b59c8e0ef6b60b196c4
+MD5 2a6cce42f55cb0be548ef17e502704cc vstrip-0.8f.ebuild 776
+RMD160 ca88aae4dfd7b520c383078ac34a337db01e9198 vstrip-0.8f.ebuild 776
+SHA256 984cfb1520b0b66d0c13cb75e412a8cdd2eb6894600a7b59c8e0ef6b60b196c4 vstrip-0.8f.ebuild 776
+MISC ChangeLog 911 RMD160 e690a0f19f291636d98b3a9569f0ca5909b4959b SHA1 0675e6004389729c008506bd14173de27da8c87d SHA256 e54a971cd645db1e80f28f310baa81bef2b67d0ece835acae6b81899c986cf26
+MD5 257b7819ddfe85d8c32b6939c860989a ChangeLog 911
+RMD160 e690a0f19f291636d98b3a9569f0ca5909b4959b ChangeLog 911
+SHA256 e54a971cd645db1e80f28f310baa81bef2b67d0ece835acae6b81899c986cf26 ChangeLog 911
 MISC metadata.xml 336 RMD160 7bf16222a19c5cb25be22e87d3c3f0a74ac99f6c SHA1 1f4d89a0c4b4f1c83e2b2754bac70e059b119706 SHA256 7b3a83c5ce8b2156cb4f9329ab7490a978314bb2c7fd3ff45bc977a3644fdacc
 MD5 b17a6cf6781d80c556e5d84f3327ddc5 metadata.xml 336
 RMD160 7bf16222a19c5cb25be22e87d3c3f0a74ac99f6c metadata.xml 336
@@ -21,10 +18,3 @@ SHA256 7b3a83c5ce8b2156cb4f9329ab7490a978314bb2c7fd3ff45bc977a3644fdacc metadata
 MD5 e19aed3d9d9e8e903cd4968e5c65c247 files/digest-vstrip-0.8f 223
 RMD160 3787f16901e958594fdf74b15fb9008de97ec4c0 files/digest-vstrip-0.8f 223
 SHA256 9cc4411a0eae04f0c964e701504c919699c43e218b1c6010daae93977270ed2e files/digest-vstrip-0.8f 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxPs8AiZjviIA2XgRApQ1AKCY5G2WAG7ZkBIzrF/acYZDl2TW7ACg8N+9
-echR46vPEmhTRW8ra6yCv3U=
-=vHCK
------END PGP SIGNATURE-----
diff --git a/media-video/vstrip/files/vstrip-0.8f-gentoo.patch b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
index e6551b9dc1e3..e157fea1734f 100644
--- a/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
+++ b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
@@ -30,7 +30,7 @@
 +#include <stdlib.h>

  #include <stdio.h>

 -#include <io.h>

-+#include <asm/io.h>

++#include <sys/io.h>

  #include <fcntl.h>

  #include "s_types.h"

  #include "vstrip.h"

diff --git a/media-video/vstrip/vstrip-0.8f.ebuild b/media-video/vstrip/vstrip-0.8f.ebuild
index 31ce469f386c..bf73ab98fb40 100644
--- a/media-video/vstrip/vstrip-0.8f.ebuild
+++ b/media-video/vstrip/vstrip-0.8f.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/vstrip-0.8f.ebuild,v 1.3 2005/09/16 02:36:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/vstrip-0.8f.ebuild,v 1.4 2007/03/31 19:26:38 drac Exp $
 
 inherit eutils
 
@@ -13,28 +13,27 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND="app-text/dos2unix
-	app-arch/unzip"
+DEPEND="app-arch/unzip"
 RDEPEND=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/vstrip-0.8f-gentoo.patch
-	dos2unix -q -o *.c *.h
-
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	edos2unix *.c *.h
+	
 	for file in *.c *.h ; do
 		echo >>$file
 	done
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {
-	dobin vstrip || die "dobin failed"
+	dobin vstrip
 }