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

Package-Manager: portage-2.1.3.9

6 files changed, 32 insertions, 50 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/Manifest b/x11-misc/read-edid/Manifest
index 3f9b4c543598..92a6417fc2a6 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -2,26 +2,19 @@ AUX read-edid-arch.patch 1094 RMD160 95955180287be331ac245aec903134027abbad24 SH
 MD5 5588b5a45e032beea3a9a7fb81cfbd35 files/read-edid-arch.patch 1094
 RMD160 95955180287be331ac245aec903134027abbad24 files/read-edid-arch.patch 1094
 SHA256 082c754fd1ae3f38a48cc05af5af489e59f21425bd4fbe63e0ab158c3736c159 files/read-edid-arch.patch 1094
-DIST read-edid-1.4.1.tar.gz 63883 RMD160 895a6fb216738676f1ebdf57289bc935ade596a6 SHA1 8db0c6f6d38205926a7e5433e2db3bda1edac2c0 SHA256 2e39ea63f0be6fd74f43d2f5e62dd987c8ce57e02e848813d454f00beb5c5441
-EBUILD read-edid-1.4.1-r1.ebuild 720 RMD160 023e55476d9ac20e0ca51e6a9ce99b00877bcad0 SHA1 ed8090b3f55ee7975dcbfd743ccaa8eb55f6db7f SHA256 b2cd1e3d30b4c8f3876322b3505e4313b618c117001fa649e375cb437fa4b4bc
-MD5 15abf98a1af2b8e11e56fbc2e2dd0c60 read-edid-1.4.1-r1.ebuild 720
-RMD160 023e55476d9ac20e0ca51e6a9ce99b00877bcad0 read-edid-1.4.1-r1.ebuild 720
-SHA256 b2cd1e3d30b4c8f3876322b3505e4313b618c117001fa649e375cb437fa4b4bc read-edid-1.4.1-r1.ebuild 720
-EBUILD read-edid-1.4.1.ebuild 579 RMD160 6b776f5d7f878470871513748c28bf175a7328a0 SHA1 796b76957488f082ea9f5717d54f6ae1d019f415 SHA256 91fbea6d0306e6edd1e26a18f14b612200db2b763d167c5321c472d655084132
-MD5 59a498f5079dd244a44b7d3c974b534e read-edid-1.4.1.ebuild 579
-RMD160 6b776f5d7f878470871513748c28bf175a7328a0 read-edid-1.4.1.ebuild 579
-SHA256 91fbea6d0306e6edd1e26a18f14b612200db2b763d167c5321c472d655084132 read-edid-1.4.1.ebuild 579
-MISC ChangeLog 1484 RMD160 ac942d3a5dacb641e8cd96a55b25aeb02ca30bd9 SHA1 fe1f2afacf289d72f11aba557586df645eca9110 SHA256 0dbe32aa729caa7287b57e48c8d73e605e9d427606254e0bad27487da374fd37
-MD5 c0cf9c9bcde2d89c4215919a33a503e9 ChangeLog 1484
-RMD160 ac942d3a5dacb641e8cd96a55b25aeb02ca30bd9 ChangeLog 1484
-SHA256 0dbe32aa729caa7287b57e48c8d73e605e9d427606254e0bad27487da374fd37 ChangeLog 1484
+DIST read-edid-1.4.1.tar.gz 77252 RMD160 0c7637b453ddb2a3785ff723b51dc9dc5c6994c8 SHA1 df9807e2caa82998d11fd3207e120b2229f69814 SHA256 bffac0107bf6a64a35291e4ca1afc8823996ca6b334f05e6debe9fa558934947
+EBUILD read-edid-1.4.1-r1.ebuild 934 RMD160 3c391696123c4fe85d92b41ced1253602ccbbca7 SHA1 206d0d585b1e5a1c8fcf1a916855a8575b7a86a4 SHA256 153096ed83d43502bba76439283c60918e0636b4559da520045971f8b99554e3
+MD5 ca013bc40d00943ff116192c8e580070 read-edid-1.4.1-r1.ebuild 934
+RMD160 3c391696123c4fe85d92b41ced1253602ccbbca7 read-edid-1.4.1-r1.ebuild 934
+SHA256 153096ed83d43502bba76439283c60918e0636b4559da520045971f8b99554e3 read-edid-1.4.1-r1.ebuild 934
+MISC ChangeLog 1713 RMD160 8c669183cd1f01aa06bf9453e6b0618c568771bd SHA1 09b89fe69be27db10950bd3b34ee63141b956c6a SHA256 2ff112ab2eb341d6fd3607e428147c3e1b095ee504e025a75dfc8341007ed249
+MD5 4f3aa1f4aae5732d796d23dcbe76bb8b ChangeLog 1713
+RMD160 8c669183cd1f01aa06bf9453e6b0618c568771bd ChangeLog 1713
+SHA256 2ff112ab2eb341d6fd3607e428147c3e1b095ee504e025a75dfc8341007ed249 ChangeLog 1713
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata.xml 173
-MD5 56160dcf92ef5cb9c540d3ca6aeab5e4 files/digest-read-edid-1.4.1 244
-RMD160 43d8368068ce9dc6af9f7708a0f3466ec6e779ad files/digest-read-edid-1.4.1 244
-SHA256 95157603d33e6dc8cc9eb6d77022762753af90278bf303e371b63eb8e36f505a files/digest-read-edid-1.4.1 244
-MD5 56160dcf92ef5cb9c540d3ca6aeab5e4 files/digest-read-edid-1.4.1-r1 244
-RMD160 43d8368068ce9dc6af9f7708a0f3466ec6e779ad files/digest-read-edid-1.4.1-r1 244
-SHA256 95157603d33e6dc8cc9eb6d77022762753af90278bf303e371b63eb8e36f505a files/digest-read-edid-1.4.1-r1 244
+MD5 73d4be314ed7fde6c8d26baf4d8b161e files/digest-read-edid-1.4.1-r1 244
+RMD160 1199d0eb4e5cc281289177258892f6aaee551aad files/digest-read-edid-1.4.1-r1 244
+SHA256 260f68bff213bdafeafbbdfa7bab1c7d93fffb4a8a8db55482330b504217e736 files/digest-read-edid-1.4.1-r1 244
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
-}