Workaround digest mismatch between our mirrored tarball and upstream tarball wrt #187535. Also x86 stable, for same reason.

(Portage version: 2.1.3.9)

5 files changed, 20 insertions, 31 deletions

diff --git a/x11-misc/read-edid/ChangeLog b/x11-misc/read-edid/ChangeLog
index 93e7641415d0..785021706d34 100644
--- a/x11-misc/read-edid/ChangeLog
+++ b/x11-misc/read-edid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/read-edid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/ChangeLog,v 1.8 2007/07/03 13:39:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/ChangeLog,v 1.9 2007/09/27 19:25:36 drac Exp $
+
+  27 Sep 2007; Samuli Suominen <drac@gentoo.org> -read-edid-1.4.1.ebuild,
+  read-edid-1.4.1-r1.ebuild:
+  Workaround digest mismatch between our mirrored tarball and upstream tarball
+  wrt #187535. Also x86 stable, for same reason.
 
   03 Jul 2007; Raúl Porcel <armin76@gentoo.org> read-edid-1.4.1-r1.ebuild:
   Add ~alpha wrt #144319
diff --git a/x11-misc/read-edid/files/digest-read-edid-1.4.1 b/x11-misc/read-edid/files/digest-read-edid-1.4.1
deleted file mode 100644
index 3d7fc5d0c467..000000000000
--- a/x11-misc/read-edid/files/digest-read-edid-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9faaa21c991bb48a5ba989a1413aa326 read-edid-1.4.1.tar.gz 63883
-RMD160 895a6fb216738676f1ebdf57289bc935ade596a6 read-edid-1.4.1.tar.gz 63883
-SHA256 2e39ea63f0be6fd74f43d2f5e62dd987c8ce57e02e848813d454f00beb5c5441 read-edid-1.4.1.tar.gz 63883
diff --git a/x11-misc/read-edid/files/digest-read-edid-1.4.1-r1 b/x11-misc/read-edid/files/digest-read-edid-1.4.1-r1
index 3d7fc5d0c467..ef331cb71965 100644
--- a/x11-misc/read-edid/files/digest-read-edid-1.4.1-r1
+++ b/x11-misc/read-edid/files/digest-read-edid-1.4.1-r1
@@ -1,3 +1,3 @@
-MD5 9faaa21c991bb48a5ba989a1413aa326 read-edid-1.4.1.tar.gz 63883
-RMD160 895a6fb216738676f1ebdf57289bc935ade596a6 read-edid-1.4.1.tar.gz 63883
-SHA256 2e39ea63f0be6fd74f43d2f5e62dd987c8ce57e02e848813d454f00beb5c5441 read-edid-1.4.1.tar.gz 63883
+MD5 aadc9a21ea4a1c9819757cda973372f4 read-edid-1.4.1.tar.gz 77252
+RMD160 0c7637b453ddb2a3785ff723b51dc9dc5c6994c8 read-edid-1.4.1.tar.gz 77252
+SHA256 bffac0107bf6a64a35291e4ca1afc8823996ca6b334f05e6debe9fa558934947 read-edid-1.4.1.tar.gz 77252
diff --git a/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild b/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild
index 07985c77fc2e..d39a5048b627 100644
--- a/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild,v 1.2 2007/07/03 13:39:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-1.4.1-r1.ebuild,v 1.3 2007/09/27 19:25:36 drac Exp $
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="program that can get information from a pnp monitor."
 HOMEPAGE="http://john.fremlin.de/programs/linux/read-edid/index.html"
 SRC_URI="http://john.fremlin.de/programs/linux/read-edid/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
 IUSE=""
 
+# Temporary solution for bug 187535 as upstream changed tarball without 
+# raising version number. Can be removed when our mirrors don't include
+# outdated tarball anymore.
+RESTRICT="mirror"
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
+	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-arch.patch
 	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog LRMI NEWS README
 }
diff --git a/x11-misc/read-edid/read-edid-1.4.1.ebuild b/x11-misc/read-edid/read-edid-1.4.1.ebuild
deleted file mode 100644
index f38f430d6661..000000000000
--- a/x11-misc/read-edid/read-edid-1.4.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-1.4.1.ebuild,v 1.6 2005/11/01 13:14:00 nelchael Exp $
-
-DESCRIPTION="program that can get information from a pnp monitor."
-HOMEPAGE="http://john.fremlin.de/programs/linux/read-edid/index.html"
-SRC_URI="http://john.fremlin.de/programs/linux/read-edid/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog LRMI NEWS README
-}