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

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 11 insertions, 42 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/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
 }