Change SRC_URI to Gentoo mirrors wrt #303136, thanks to Juan Welthagen for reporting.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 13 insertions, 45 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index 1d2f12371df9..6ce3ce0fa1ab 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/eject
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.80 2010/01/16 19:12:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.81 2010/02/01 19:35:44 ssuominen Exp $
+
+  01 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> eject-2.1.5-r2.ebuild:
+  Change SRC_URI to Gentoo mirrors wrt #303136, thanks to Juan Welthagen for
+  reporting.
 
   16 Jan 2010; Raúl Porcel <armin76@gentoo.org> eject-2.1.5-r2.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #296429
diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index 586768dcc4d6..fcd82b5bd360 100644
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -4,7 +4,6 @@ AUX eject-2.1.5-handle-spaces.patch 1729 RMD160 3289afd3c47b9f599825bc6dcfd0290e
 AUX eject-2.1.5-man-typo.patch 700 RMD160 3d8e1cc9b532d233dc351fdcf35a91dd01b5157f SHA1 5261281d9d184dc9652fb9805c81b89b659e7e23 SHA256 2f83ea28ea71115d5b64a77f8e02a7788cbc089720fd58a0dd018b00a0171a60
 AUX eject-2.1.5-toggle.patch 660 RMD160 6cf98ca5da33238a313a10e0603e80bca223b33e SHA1 6f3807862930cff8d71e076573c12fc14a61dea5 SHA256 ee321229d6fadbb1222710b9c164e7e0e9add53c18d7cb4051db2652e89cf837
 DIST eject-2.1.5.tar.gz 123585 RMD160 6e2f161e1399f9f01f376e56593d6ca586c4c8ea SHA1 17986aa4732f1c33ecae15db32d1e379bbbd99f8 SHA256 ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
-EBUILD eject-2.1.5-r1.ebuild 1056 RMD160 7834095dd1a8cdf9dfef7411ee7c1dee4098d93a SHA1 6caa2d7a66ab884b6152331ae8a45028e3a61760 SHA256 40ce19da34e16436230257344a7cc70df2fb4d544f2c3c2ea62879e4e0c72815
-EBUILD eject-2.1.5-r2.ebuild 1109 RMD160 c4c052eef2fe8485b2b54aeb2f60666ef3cc997a SHA1 4826b2b8b150b802b5fbe68f8fdef14326a6159c SHA256 f35144dd6fd1caf859de9cca086e0355ff86c2ed8ba934d84f5f8e9365a27ff5
-MISC ChangeLog 10964 RMD160 f99e463c1a395dd7fb6c98bcd7056c74b975d801 SHA1 e6b2cc1a417796d2cdd83de483f2145d697ed0bf SHA256 e47ed9a3b408f6215e6f7078709f93f89d982ae9c99c54f89c76d1d6faaec9ff
+EBUILD eject-2.1.5-r2.ebuild 1006 RMD160 ff90946578119c3acee860928579c920405fe689 SHA1 84a01c9a9d97c4a3dd51cdf53f3f4927a45ceb31 SHA256 a4dc48ba854caa61a4f5924047b692c74c9c70ff10f955fa26266a75db787a32
+MISC ChangeLog 11134 RMD160 c52365f60fdf1628553969ea52fbfb9be2c0a06d SHA1 2dc89eaa9f59ec18e1512f13055f7513408a8b5d SHA256 71c3b33d8ff6c05796c3a4a5a9af8340e89e93e7e446f5f426da3146253b8f7d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/eject/eject-2.1.5-r1.ebuild b/sys-apps/eject/eject-2.1.5-r1.ebuild
deleted file mode 100644
index aa51167a30cc..000000000000
--- a/sys-apps/eject/eject-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.5-r1.ebuild,v 1.13 2009/12/15 16:35:14 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}"-2.0.13-xmalloc.patch
-	epatch "${FILESDIR}/${PN}"-2.1.4-scsi-rdwr.patch
-	epatch "${FILESDIR}/${PN}"-2.1.5-handle-spaces.patch #151257
-	epatch "${FILESDIR}/${PN}"-2.1.5-man-typo.patch #165248
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.1.5-r2.ebuild b/sys-apps/eject/eject-2.1.5-r2.ebuild
index 1e25c35f32d9..106a0f35eb78 100644
--- a/sys-apps/eject/eject-2.1.5-r2.ebuild
+++ b/sys-apps/eject/eject-2.1.5-r2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.5-r2.ebuild,v 1.9 2010/01/16 19:12:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.5-r2.ebuild,v 1.10 2010/02/01 19:35:44 ssuominen Exp $
 
 inherit eutils
 
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
 HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,11 +26,13 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable nls) || die
+	econf \
+		$(use_enable nls)
+
 	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
 }