Remove old versions, use tc-getCC instead of gcc (see bug #213019).

(Portage version: 2.1.4.4)

4 files changed, 7 insertions, 155 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 7fff9ebacb46..d4364daac5bc 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/elvis
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.40 2008/03/11 08:53:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.41 2008/03/11 11:24:56 nelchael Exp $
+
+  11 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org> -elvis-2.2.0-r1.ebuild,
+  -elvis-2.2.0-r2.ebuild, elvis-2.2.0-r3.ebuild:
+  Remove old versions, use tc-getCC instead of gcc (see bug #213019).
 
   11 Mar 2008; Markus Rothe <corsair@gentoo.org> elvis-2.2.0-r3.ebuild:
   Stable on ppc64; bug #205722
diff --git a/app-editors/elvis/elvis-2.2.0-r1.ebuild b/app-editors/elvis/elvis-2.2.0-r1.ebuild
deleted file mode 100644
index 392c5bf07d7e..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r1.ebuild,v 1.9 2007/10/10 06:16:37 opfer Exp $
-
-inherit eutils
-
-MY_P="${PN}-2.2_0"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="X"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	X? ( >=x11-proto/xproto-7.0.4
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2 )"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--bindur=/usr/bin \
-		--datadir=/usr/share/elvis \
-		--docdir=/usr/share/doc/${PF} \
-		`use_with X x` || die 'configure failed'
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-	make install \
-		PREFIX="${D}"/usr \
-		BINDIR="${D}"/usr/bin \
-		DATADIR="${D}"/usr/share/elvis \
-		DOCDIR="${D}"/usr/share/doc/${PF} || die 'make install failed'
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1
-	mv doc/elvtags.man doc/elvtags.1
-	mv doc/ref.man doc/ref.1
-	doman doc/*.1 || die 'doman failed'
-
-	# Fixup some READMEs
-	sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${D},,g" "${D}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r2.ebuild b/app-editors/elvis/elvis-2.2.0-r2.ebuild
deleted file mode 100644
index a981c09101b0..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r2.ebuild,v 1.5 2007/10/10 06:16:37 opfer Exp $
-
-inherit eutils versionator
-
-MY_PV="$(replace_version_separator 2 '_')"
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	X? ( >=x11-proto/xproto-7.0.4
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2 )
-	app-admin/eselect-vi"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share/elvis \
-		--docdir=/usr/share/doc/"${PF}" \
-		$(use_with X x) \
-		|| die "configure failed"
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/"${PF}"
-	dodir /etc
-	make install \
-		PREFIX="${D}"/usr \
-		BINDIR="${D}"/usr/bin \
-		DATADIR="${D}"/usr/share/elvis \
-		DOCDIR="${D}"/usr/share/doc/"${PF}" || die 'make install failed'
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1
-	mv doc/elvtags.man doc/elvtags.1
-	mv doc/ref.man doc/ref.1
-	doman doc/*.1 || die 'doman failed'
-
-	# Fixup some READMEs
-	sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${D},,g" "${D}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r3.ebuild b/app-editors/elvis/elvis-2.2.0-r3.ebuild
index 829fb42c4a49..e3cdd0416b3e 100644
--- a/app-editors/elvis/elvis-2.2.0-r3.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.9 2008/03/11 08:53:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.10 2008/03/11 11:24:56 nelchael Exp $
 
 inherit eutils versionator
 
@@ -43,7 +43,7 @@ src_compile() {
 
 	# Some Makefile fixups (must happen after configure)
 	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed"
+	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
 
 	# We'll install the man-pages ourselves
 	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"