Config file bump to hopefully fix the tail of bug #167948.

(Portage version: 2.1.2.9)

6 files changed, 23 insertions, 95 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 433ba8f433bf..6a9509e08e17 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.74 2007/07/03 16:49:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.75 2007/07/24 20:53:13 grobian Exp $
+
+*tcsh-6.15-r2 (24 Jul 2007)
+
+  24 Jul 2007; Fabian Groffen <grobian@gentoo.org> -tcsh-6.14-r33.ebuild,
+  -tcsh-6.15-r1.ebuild, +tcsh-6.15-r2.ebuild:
+  Config file bump to hopefully fix the tail of bug #167948.
 
 *tcsh-6.15-r1 (03 Jul 2007)
 
diff --git a/app-shells/tcsh/files/digest-tcsh-6.14-r33 b/app-shells/tcsh/files/digest-tcsh-6.14-r33
deleted file mode 100644
index ad6b9e38156f..000000000000
--- a/app-shells/tcsh/files/digest-tcsh-6.14-r33
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 353d1bb7d2741bf8de602c7b6f0efd79 tcsh-6.14.00.tar.gz 859780
-RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 tcsh-6.14.00.tar.gz 859780
-SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e tcsh-6.14.00.tar.gz 859780
-MD5 6a4f913dba5bfb71a6b84da43510acb5 tcsh-config-1.4.tar.bz2 2388
-RMD160 30ee8c3957fe1bd83534c06ea0ae634e12f9a683 tcsh-config-1.4.tar.bz2 2388
-SHA256 76500542856e69f66412735cd45c4022d95c713460e4008a215fbe4c2cbafd84 tcsh-config-1.4.tar.bz2 2388
diff --git a/app-shells/tcsh/files/digest-tcsh-6.15-r1 b/app-shells/tcsh/files/digest-tcsh-6.15-r1
deleted file mode 100644
index 0cefbe779489..000000000000
--- a/app-shells/tcsh/files/digest-tcsh-6.15-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 67a0611620b080bd0eb032b1774382b6 tcsh-6.15.00.tar.gz 870886
-RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c tcsh-6.15.00.tar.gz 870886
-SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc tcsh-6.15.00.tar.gz 870886
-MD5 6a4f913dba5bfb71a6b84da43510acb5 tcsh-config-1.4.tar.bz2 2388
-RMD160 30ee8c3957fe1bd83534c06ea0ae634e12f9a683 tcsh-config-1.4.tar.bz2 2388
-SHA256 76500542856e69f66412735cd45c4022d95c713460e4008a215fbe4c2cbafd84 tcsh-config-1.4.tar.bz2 2388
diff --git a/app-shells/tcsh/files/digest-tcsh-6.15-r2 b/app-shells/tcsh/files/digest-tcsh-6.15-r2
new file mode 100644
index 000000000000..26e92d4170be
--- /dev/null
+++ b/app-shells/tcsh/files/digest-tcsh-6.15-r2
@@ -0,0 +1,6 @@
+MD5 67a0611620b080bd0eb032b1774382b6 tcsh-6.15.00.tar.gz 870886
+RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c tcsh-6.15.00.tar.gz 870886
+SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc tcsh-6.15.00.tar.gz 870886
+MD5 629f6b6e65f7afa61dc709f475cad6e8 tcsh-config-1.5.tar.bz2 2347
+RMD160 e426c395e46273186767b7bcf41712e53e8315fd tcsh-config-1.5.tar.bz2 2347
+SHA256 e53a4ee129433be823288895dd9af23b5156f1350f6b831aba14f984832b74b6 tcsh-config-1.5.tar.bz2 2347
diff --git a/app-shells/tcsh/tcsh-6.15-r1.ebuild b/app-shells/tcsh/tcsh-6.15-r1.ebuild
deleted file mode 100644
index 99446ea3b1f3..000000000000
--- a/app-shells/tcsh/tcsh-6.15-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-shells/tcsh/tcsh-6.15-r1.ebuild,v 1.1 2007/07/03 16:49:11 grobian Exp $
-
-inherit eutils
-
-PATCHVER="1.4"
-
-MY_P="${P}.00"
-DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
-SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
-	mirror://gentoo/tcsh-config-${PATCHVER}.tar.bz2
-	http://www.gentoo.org/~grobian/distfiles/tcsh-config-${PATCHVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="perl catalogs"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	perl? ( dev-lang/perl )
-	!app-shells/csh" # bug #119703
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${MY_P/15/14}"-debian-dircolors.patch # bug #120792
-	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
-	epatch "${FILESDIR}"/${MY_P}-normalize-command-fix.patch # bug #183754
-
-	if use catalogs ; then
-		einfo "enabling NLS catalogs support..."
-		sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
-			config_f.h || die
-		eend $?
-	fi
-}
-
-src_compile() {
-	econf --prefix=/ || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man || die
-
-	if use perl ; then
-		perl tcsh.man2html tcsh.man || die
-		dohtml tcsh.html/*.html
-	fi
-
-	insinto /etc
-	doins \
-		"${WORKDIR}"/tcsh-config/csh.cshrc \
-		"${WORKDIR}"/tcsh-config/csh.login
-
-	insinto /etc/profile.d
-	doins \
-		"${WORKDIR}"/tcsh-config/tcsh-bindkey.csh \
-		"${WORKDIR}"/tcsh-config/tcsh-settings.csh
-
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.14-r33.ebuild b/app-shells/tcsh/tcsh-6.15-r2.ebuild
index c8c8f27bded2..d01c573e9a19 100644
--- a/app-shells/tcsh/tcsh-6.14-r33.ebuild
+++ b/app-shells/tcsh/tcsh-6.15-r2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r33.ebuild,v 1.4 2007/07/15 05:23:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r2.ebuild,v 1.1 2007/07/24 20:53:13 grobian Exp $
 
 inherit eutils
 
-PATCHVER="1.4"
+CONFVER="1.5"
 
 MY_P="${P}.00"
 DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
 HOMEPAGE="http://www.tcsh.org/"
 SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
-	mirror://gentoo/tcsh-config-${PATCHVER}.tar.bz2
-	http://www.gentoo.org/~grobian/distfiles/tcsh-config-${PATCHVER}.tar.bz2"
+	mirror://gentoo/tcsh-config-${CONFVER}.tar.bz2
+	http://www.gentoo.org/~grobian/distfiles/tcsh-config-${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="perl catalogs"
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -26,13 +26,15 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
-	epatch "${FILESDIR}/${P}"-makefile.patch # bug #151951
+	cd "${S}"
+	epatch "${FILESDIR}/${MY_P/15/14}"-debian-dircolors.patch # bug #120792
+	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+	epatch "${FILESDIR}"/${MY_P}-normalize-command-fix.patch # bug #183754
 
 	if use catalogs ; then
 		einfo "enabling NLS catalogs support..."
 		sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
-			${WORKDIR}/${MY_P}/config_f.h || die
+			config_f.h || die
 		eend $?
 	fi
 }
@@ -55,11 +57,6 @@ src_install() {
 		"${WORKDIR}"/tcsh-config/csh.cshrc \
 		"${WORKDIR}"/tcsh-config/csh.login
 
-	insinto /etc/profile.d
-	doins \
-		"${WORKDIR}"/tcsh-config/tcsh-bindkey.csh \
-		"${WORKDIR}"/tcsh-config/tcsh-settings.csh
-
 	dodoc FAQ Fixes NewThings Ported README WishList Y2K
 
 	# bug #119703: add csh -> tcsh symlink