Cleanup old, version bump to beta version with ebuild cleanup.

(Portage version: 2.2.01.20043-prefix/cvs/Darwin i386)

6 files changed, 98 insertions, 244 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index f633691f93f5..131a45264466 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.107 2011/11/26 19:01:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.108 2011/12/31 16:38:34 grobian Exp $
+
+*tcsh-6.17.06 (31 Dec 2011)
+
+  31 Dec 2011; Fabian Groffen <grobian@gentoo.org> +tcsh-6.17.06.ebuild,
+  -files/tcsh-6.14-r2.patch, -files/tcsh-6.14-r4.patch, -tcsh-6.14-r5.ebuild,
+  -tcsh-6.15-r2.ebuild:
+  Cleanup old, version bump to beta version with ebuild cleanup.
 
   26 Nov 2011; Raúl Porcel <armin76@gentoo.org> tcsh-6.17-r1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #389013
diff --git a/app-shells/tcsh/files/tcsh-6.14-r2.patch b/app-shells/tcsh/files/tcsh-6.14-r2.patch
deleted file mode 100644
index c1dc772dac15..000000000000
--- a/app-shells/tcsh/files/tcsh-6.14-r2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- gentoo/csh.cshrc
-+++ gentoo/csh.cshrc
-@@ -1,6 +1,9 @@
- ## Gentoo csh.cshrc
- ##
--## 2005-09-29 -- Fabian Groffen (grobian@gentoo.org)
-+## 2005-11-10 -- Fabian Groffen (grobian@gentoo.org)
-+##   * Disabled sourcing environment defaults and additional settings
-+##     when having a non-interactive shell.  Bug #104763
-+## 2005-09-29 -- Fabian Groffen
- ##   * Initial version of a complete redo of this file to fix many bugs
- ##     and resolve many annoyances experienced by numerous users
- ##
-@@ -8,7 +11,7 @@
- ##
- ## Load the environment defaults.
- ##
--if ( -r /etc/csh.env ) then
-+if ( $?prompt && -r /etc/csh.env ) then
-     source /etc/csh.env
- endif
- 
-@@ -55,7 +58,7 @@
- ##
- ## Source extensions
- ##
--if ( -d /etc/profile.d ) then
-+if ( $?prompt && -d /etc/profile.d ) then
- 	set nonomatch
- 	foreach i ( /etc/profile.d/*.csh )
- 		if ( -r $i ) then
---- gentoo/tcsh-complete
-+++ gentoo/tcsh-complete
-@@ -3,8 +3,11 @@
- ## Based on the TCSH complete.tcsh script, with changed from the TCSHRC
- ## package (http://tcshrc.sourceforge.net)
- ##
--## Please do not change this file!  Place your personal customizations in
--## ~/.tcshrc and system-wide customizations in /etc/profiles.d/local.csh
-+## Please note that the tcsh-complete file is a large set of examples
-+## that is not meant to be used in its exact form, as it defines an
-+## excessive -- sometimes conflicting -- amount of completion scripts.
-+## It is highly encouraged to copy over the desired auto completion
-+## scripts to the personal ~/.tcshrc file.
- ##
- ## 2005-09-27  --  Fabian Groffen (grobian@gentoo.org)
- ##     fixed some bugs reported by users and cleaned it a bit
---- gentoo/tcsh-gentoo_legacy
-+++ gentoo/tcsh-gentoo_legacy
-@@ -4,6 +4,9 @@
- ## by gentoo ebuilds prior to 6.14-r1.  If you wonder what it does, you
- ## probably don't want this at all, so stay away from it.
- ##
-+## Remember that you have to copy over these files into their
-+## appropriate places, such as /etc/profile.d and /etc/skel.
-+##
- 
- ##
- ## Start by unsetting all our variables.  This is needed to prevent
diff --git a/app-shells/tcsh/files/tcsh-6.14-r4.patch b/app-shells/tcsh/files/tcsh-6.14-r4.patch
deleted file mode 100644
index a9628b78df0c..000000000000
--- a/app-shells/tcsh/files/tcsh-6.14-r4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gentoo/csh.login
-+++ gentoo/csh.login
-@@ -1,6 +1,9 @@
- ## Gentoo csh.login
- ##
--## 2005-09-27  --  Fabian Groffen (grobian@gentoo.org)
-+## 2006-12-02  --  Fabian Groffen (grobian@gentoo.org)
-+##     Don't set SHELL variable, should be done by login (bug #91725)
-+##     Properly call tset, such that it actually does something (bug #156422)
-+## 2005-09-27  --  Fabian Groffen
- ##     Resolved reported bug on MOTD (disabled it)
- ## 2003-01-13  --  Alain Penders (alain@gentoo.org)
- ##     Initial version.  Inspired by the Suse version.
-@@ -14,9 +17,7 @@
-     # Console
-     if ( ! ${?TERM} )           setenv TERM linux
-     if ( "$TERM" == "unknown" ) setenv TERM linux
--    # No tset available on SlackWare
-     if ( -x "`which stty`" ) stty sane cr0 pass8 dec
--    if ( -x "`which tset`" ) tset -I -Q
-     unsetenv TERMCAP
-     settc km yes
- endif
-@@ -27,11 +30,6 @@
- umask 022
- 
- ##
--## Set our SHELL variable.
--##
--setenv SHELL /bin/tcsh
--
--##
- ## Setup a default MAIL variable
- ##
- if ( -f /var/spool/mail/$USER ) then
diff --git a/app-shells/tcsh/tcsh-6.14-r5.ebuild b/app-shells/tcsh/tcsh-6.14-r5.ebuild
deleted file mode 100644
index 9a2881fcbbbf..000000000000
--- a/app-shells/tcsh/tcsh-6.14-r5.ebuild
+++ /dev/null
@@ -1,74 +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/tcsh/tcsh-6.14-r5.ebuild,v 1.6 2010/10/06 07:45:27 grobian Exp $
-
-inherit eutils
-
-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/old/${MY_P}.tar.gz
-	mirror://gentoo/${P}-conffiles.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="perl catalogs"
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	!app-shells/csh" # bug #119703
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
-	epatch "${FILESDIR}/${P}"-r2.patch
-	epatch "${FILESDIR}/${P}"-makefile.patch # bug #151951
-	epatch "${FILESDIR}/${P}"-r4.patch
-
-	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
-		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}"/gentoo/csh.cshrc \
-		"${WORKDIR}"/gentoo/csh.login
-
-	insinto /etc/profile.d
-	doins \
-		"${WORKDIR}"/gentoo/tcsh-bindkey.csh \
-		"${WORKDIR}"/gentoo/tcsh-settings.csh
-
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	docinto examples
-	dodoc \
-		"${WORKDIR}"/gentoo/tcsh-aliases \
-		"${WORKDIR}"/gentoo/tcsh-complete \
-		"${WORKDIR}"/gentoo/tcsh-gentoo_legacy \
-		"${WORKDIR}"/gentoo/tcsh.config
-
-	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/tcsh/tcsh-6.15-r2.ebuild b/app-shells/tcsh/tcsh-6.15-r2.ebuild
deleted file mode 100644
index a59eb70c5978..000000000000
--- a/app-shells/tcsh/tcsh-6.15-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r2.ebuild,v 1.15 2011/02/06 22:03:07 leio Exp $
-
-inherit eutils
-
-CONFVER="1.6"
-
-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/old/${MY_P}.tar.gz
-	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 ~x86-fbsd"
-IUSE="perl catalogs"
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}
-	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
-
-	dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
-	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
-}
-
-pkg_postinst() {
-	elog "This revision of tcsh does use a completely revamped configuration"
-	elog "files system, which is based on the bash equivalents.  It should"
-	elog "fix issues for KDE users, and miscelaneous issues of environment"
-	elog "variables not set that should have, like EDITOR.  If you rely"
-	elog "on the /etc/csh.* files heavily, you may find your setup will be"
-	elog "broken now."
-}
diff --git a/app-shells/tcsh/tcsh-6.17.06.ebuild b/app-shells/tcsh/tcsh-6.17.06.ebuild
new file mode 100644
index 000000000000..12968ce252b9
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.17.06.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17.06.ebuild,v 1.1 2011/12/31 16:38:34 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools prefix
+
+CONFVER="1.9"
+
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/beta/${P}.tar.gz
+	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls doc"
+RESTRICT="test"
+
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-lang/perl )"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
+	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+	eautoreconf
+
+	# fix gencat usage
+	sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		nls/Makefile.in || die
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
+}
+
+src_configure() {
+	# make tcsh look and live along the lines of the prefix
+	append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	econf \
+		--prefix="${EPREFIX:-/}" \
+		--datarootdir='${prefix}/usr/share' \
+		$(use_enable nls) \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man || die
+
+	if use doc ; then
+		perl tcsh.man2html tcsh.man || die
+		dohtml tcsh.html/*.html
+	fi
+
+	insinto /etc
+	doins \
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
+
+	dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym /bin/tcsh /bin/csh
+}