Bump, remove old

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

6 files changed, 11 insertions, 159 deletions

diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog
index 8b939e51cd55..5d426389a12c 100644
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/mksh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.26 2011/08/01 15:49:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.27 2011/12/12 03:23:17 patrick Exp $
+
+*mksh-40d (12 Dec 2011)
+
+  12 Dec 2011; Patrick Lauer <patrick@gentoo.org> +mksh-40d.ebuild,
+  -mksh-36b.ebuild, -mksh-38c.ebuild, -mksh-39.ebuild, -mksh-39b.ebuild,
+  -mksh-40.ebuild:
+  Bump, remove old
 
   01 Aug 2011; Patrick Lauer <patrick@gentoo.org> mksh-40b.ebuild:
   Adding lto and build system fix as suggested by upstream
diff --git a/app-shells/mksh/mksh-36b.ebuild b/app-shells/mksh/mksh-36b.ebuild
deleted file mode 100644
index 4e71d66d8047..000000000000
--- a/app-shells/mksh/mksh-36b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-36b.ebuild,v 1.1 2008/12/21 01:41:27 hanno Exp $
-
-inherit eutils
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.12"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz
-	http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c.${ARC4_VERSION}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
-	cp "${DISTDIR}/arc4random.c.${ARC4_VERSION}" "${S}/arc4random.c" || die
-}
-
-src_compile() {
-	tc-export CC
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
-}
-
-src_test() {
-	./test.sh || die
-}
diff --git a/app-shells/mksh/mksh-38c.ebuild b/app-shells/mksh/mksh-38c.ebuild
deleted file mode 100644
index 66c242977790..000000000000
--- a/app-shells/mksh/mksh-38c.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-38c.ebuild,v 1.1 2009/06/26 11:23:06 hanno Exp $
-
-inherit eutils
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz
-	http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c.${ARC4_VERSION}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
-	cp "${DISTDIR}/arc4random.c.${ARC4_VERSION}" "${S}/arc4random.c" || die
-}
-
-src_compile() {
-	tc-export CC
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
-}
-
-src_test() {
-	./test.sh || die
-}
diff --git a/app-shells/mksh/mksh-39.ebuild b/app-shells/mksh/mksh-39.ebuild
deleted file mode 100644
index 5e3ad79749ac..000000000000
--- a/app-shells/mksh/mksh-39.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-39.ebuild,v 1.1 2009/08/26 22:16:50 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz
-	http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c.${ARC4_VERSION}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
-	cp "${DISTDIR}/arc4random.c.${ARC4_VERSION}" "${S}/arc4random.c" || die
-}
-
-src_compile() {
-	tc-export CC
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
-}
-
-src_test() {
-	./test.sh || die
-}
diff --git a/app-shells/mksh/mksh-39b.ebuild b/app-shells/mksh/mksh-39b.ebuild
deleted file mode 100644
index fab6aaad55ff..000000000000
--- a/app-shells/mksh/mksh-39b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-39b.ebuild,v 1.1 2010/02/23 14:51:34 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-ARC4_VERSION="1.14"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz
-	http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c.${ARC4_VERSION}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/cpio"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	gzip -dc "${DISTDIR}/${PN}-R${PV}.cpio.gz" | cpio -mid
-	cp "${DISTDIR}/arc4random.c.${ARC4_VERSION}" "${S}/arc4random.c" || die
-}
-
-src_compile() {
-	tc-export CC
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh || die
-	doman mksh.1 || die
-	dodoc dot.mkshrc || die
-}
-
-src_test() {
-	./test.sh || die
-}
diff --git a/app-shells/mksh/mksh-40.ebuild b/app-shells/mksh/mksh-40d.ebuild
index 0b1d9d0e7e89..246c0720d555 100644
--- a/app-shells/mksh/mksh-40.ebuild
+++ b/app-shells/mksh/mksh-40d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40.ebuild,v 1.1 2011/06/12 20:24:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-40d.ebuild,v 1.1 2011/12/12 03:23:17 patrick Exp $
 
 inherit eutils
 
@@ -24,7 +24,8 @@ src_unpack() {
 
 src_compile() {
 	tc-export CC
-	sh Build.sh -r || die
+	# we can't assume lto existing/enabled, so we add a fallback
+	sh Build.sh -r -c lto || sh Rebuild.sh || die
 }
 
 src_install() {