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

Package-Manager: portage-2.1.2.9

7 files changed, 35 insertions, 114 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/Manifest b/app-shells/tcsh/Manifest
index ee0ecfdfe074..251ad0f362e4 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -21,27 +21,23 @@ SHA256 e22acf90d146927b261c00bbeb6f7f9ca86ff8c77d017027308ca2a54aeb1b04 files/tc
 DIST tcsh-6.14-conffiles.tar.bz2 20200 RMD160 96e5e43985fe1b6e53b4a2a53f1b7bed3c2ae103 SHA1 3ec8841c88b2c99c6b5978b907d9f3daa22faa7c SHA256 1bae5000c84593187974580c48b0edcec88e2f6363e3c1ec1e43da45c9a63049
 DIST tcsh-6.14.00.tar.gz 859780 RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 SHA1 55a08b31a57cfd8631edd1fb7e42f18578d8198a SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e
 DIST tcsh-6.15.00.tar.gz 870886 RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c SHA1 d24f7bf27e80222a6293b6629c14db547f0b7387 SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc
-DIST tcsh-config-1.4.tar.bz2 2388 RMD160 30ee8c3957fe1bd83534c06ea0ae634e12f9a683 SHA1 a248d29e04b7398f75a7b2af38277f8a9780c179 SHA256 76500542856e69f66412735cd45c4022d95c713460e4008a215fbe4c2cbafd84
+DIST tcsh-config-1.5.tar.bz2 2347 RMD160 e426c395e46273186767b7bcf41712e53e8315fd SHA1 cb8619751dec1141136da1c50c53f8b67c2e6414 SHA256 e53a4ee129433be823288895dd9af23b5156f1350f6b831aba14f984832b74b6
 EBUILD tcsh-6.14-r3.ebuild 2469 RMD160 8e2a942e31581503b53ab97a7bf9506d64c35d16 SHA1 2794f459edfa98c645dca0e5623c93ca4acb9feb SHA256 d6b43fac55e94a2d0bb71e43595c12802f91766bf802e0fbacac99192ee81d77
 MD5 4a67c4c078807d195de6c9e0a5593ce9 tcsh-6.14-r3.ebuild 2469
 RMD160 8e2a942e31581503b53ab97a7bf9506d64c35d16 tcsh-6.14-r3.ebuild 2469
 SHA256 d6b43fac55e94a2d0bb71e43595c12802f91766bf802e0fbacac99192ee81d77 tcsh-6.14-r3.ebuild 2469
-EBUILD tcsh-6.14-r33.ebuild 2118 RMD160 2f4e055b626e91ccede1257a53c531ee690ef220 SHA1 f573ca055f6da19d8859fbff67c3255e0abfbd0e SHA256 9701aa7d655527af5e8750b008aba1e8b7576294bf983cd06d5b902125e7d8c7
-MD5 05361ae517a3056853c1cc9961116167 tcsh-6.14-r33.ebuild 2118
-RMD160 2f4e055b626e91ccede1257a53c531ee690ef220 tcsh-6.14-r33.ebuild 2118
-SHA256 9701aa7d655527af5e8750b008aba1e8b7576294bf983cd06d5b902125e7d8c7 tcsh-6.14-r33.ebuild 2118
 EBUILD tcsh-6.14-r5.ebuild 1846 RMD160 aea7db3864ebb67634d875d5658e78990d451d5d SHA1 e08249a41e0f273c19138c0c9ef2e522be4508a3 SHA256 6b308ff6800689a5cd3ca04790fe18cd6657aa4b52b51f23d80b7f6d138fb69a
 MD5 0922265ad6db8b0468b79ac92fb09637 tcsh-6.14-r5.ebuild 1846
 RMD160 aea7db3864ebb67634d875d5658e78990d451d5d tcsh-6.14-r5.ebuild 1846
 SHA256 6b308ff6800689a5cd3ca04790fe18cd6657aa4b52b51f23d80b7f6d138fb69a tcsh-6.14-r5.ebuild 1846
-EBUILD tcsh-6.15-r1.ebuild 1797 RMD160 322ed97bf6f7ca18b52b824ab2a4a3d37ec1a99c SHA1 60d1ec5b8a86e414328be139795ebff00813bb90 SHA256 6549035c4ffc85f2d535bce04c541a0f8869fda1d93480f4554f13e15ab330d2
-MD5 7b2fda932a02d20e14b8b6b97dcd8b16 tcsh-6.15-r1.ebuild 1797
-RMD160 322ed97bf6f7ca18b52b824ab2a4a3d37ec1a99c tcsh-6.15-r1.ebuild 1797
-SHA256 6549035c4ffc85f2d535bce04c541a0f8869fda1d93480f4554f13e15ab330d2 tcsh-6.15-r1.ebuild 1797
-MISC ChangeLog 11303 RMD160 b16656ed51f3eb8495857af00699de871f003aa6 SHA1 96828de6c3db8f27a85900eebc5a3e63d068aa8a SHA256 430cd0ca49b8415c3b6c9f69418a2859b3791c7f3eb4e2b446f2064d23ddbe2a
-MD5 95a3e111b133b09c8acc6b7729e52c23 ChangeLog 11303
-RMD160 b16656ed51f3eb8495857af00699de871f003aa6 ChangeLog 11303
-SHA256 430cd0ca49b8415c3b6c9f69418a2859b3791c7f3eb4e2b446f2064d23ddbe2a ChangeLog 11303
+EBUILD tcsh-6.15-r2.ebuild 2073 RMD160 f2e58f1f5ea0c4fbad507e341fc532b2c6b7d933 SHA1 a4567bc58179802cce6ca5b7ff573cb193ff81c2 SHA256 c1503b9b5ca6f3d3cb6ca5274b99b42932ad906eb9a2083df08c30d5668861cc
+MD5 abea622bb96f75afd80dd701c0be839a tcsh-6.15-r2.ebuild 2073
+RMD160 f2e58f1f5ea0c4fbad507e341fc532b2c6b7d933 tcsh-6.15-r2.ebuild 2073
+SHA256 c1503b9b5ca6f3d3cb6ca5274b99b42932ad906eb9a2083df08c30d5668861cc tcsh-6.15-r2.ebuild 2073
+MISC ChangeLog 11514 RMD160 cc4e0982b2931f59fb78950241a16df2ebacbcc7 SHA1 090e8378c70c519ccc1224660693517c86d1856b SHA256 72f2c7b6da222b76e40adb857e0d3d177144bf2c58a0cd0391dec66ba93021c6
+MD5 f3bf3bd84483017a037f349adef00833 ChangeLog 11514
+RMD160 cc4e0982b2931f59fb78950241a16df2ebacbcc7 ChangeLog 11514
+SHA256 72f2c7b6da222b76e40adb857e0d3d177144bf2c58a0cd0391dec66ba93021c6 ChangeLog 11514
 MISC metadata.xml 655 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 SHA1 8e04b7ca425f5469ce8515c2ab8fce6cf166b3ca SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b
 MD5 57ae68ef95b893d172203de06faf380d metadata.xml 655
 RMD160 10cac0d0a38ab114ec6f34be1fed837f38a77f40 metadata.xml 655
@@ -49,12 +45,9 @@ SHA256 bde0b24fe9a295482f3394de9b3d658bbcc2e58504136785fd4a6210b1d2e28b metadata
 MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r3 497
 RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r3 497
 SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r3 497
-MD5 fe1623f2b43fdc98e100a637196d1ad8 files/digest-tcsh-6.14-r33 482
-RMD160 18d4f342014e976c171cd6dbc39fe68996235743 files/digest-tcsh-6.14-r33 482
-SHA256 4595b7abfab1eefc3382a6c8d6f69fd9254483efca957373be64ad49def0eb11 files/digest-tcsh-6.14-r33 482
 MD5 6a74574703dca366bcf1a246f9bf6e32 files/digest-tcsh-6.14-r5 497
 RMD160 28da1915a51453b91b97fe54a3866e7bc589b8c0 files/digest-tcsh-6.14-r5 497
 SHA256 92be31902b0ded77904c82ced086d52942e9a5fc4a99a90983091fc22c61b4f5 files/digest-tcsh-6.14-r5 497
-MD5 3a96ebc660ea4c36d850e626fb971902 files/digest-tcsh-6.15-r1 482
-RMD160 7ed4da52803633916c81010d07264954414a3e14 files/digest-tcsh-6.15-r1 482
-SHA256 9262c6b5aaa24453c08d86f9b154ebe21a82c200659cf0098ddba284b5bfc328 files/digest-tcsh-6.15-r1 482
+MD5 34965cbeb2c2659612a1f5a6918da3a6 files/digest-tcsh-6.15-r2 482
+RMD160 fe80a9aabe896dea5cbe05481d2877f8050a0812 files/digest-tcsh-6.15-r2 482
+SHA256 15766c93843de9d2448f7ed3d7b7791632e9cdc70c9f0346b4bb17e9f070e179 files/digest-tcsh-6.15-r2 482
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