commit:     7f8e75ec7f6b0b65bf8aa65a2e9d3f8a0f6e4b41
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 10:58:38 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 10:58:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8e75ec

app-shells/tcsh: Remove old, bug 605728

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-shells/tcsh/Manifest                           |  3 -
 app-shells/tcsh/files/tcsh-6.14-makefile.patch     | 16 ----
 app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch  | 11 ---
 .../tcsh/files/tcsh-6.14.00-debian-dircolors.patch | 19 -----
 app-shells/tcsh/metadata.xml                       |  3 -
 app-shells/tcsh/tcsh-6.17-r1.ebuild                | 92 ----------------------
 app-shells/tcsh/tcsh-6.18.01.ebuild                | 88 ---------------------
 7 files changed, 232 deletions(-)

diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 36973cd6581..7e72ccc3d39 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,2 @@
-DIST tcsh-6.17.00.tar.gz 890084 SHA256 
575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9 SHA512 
7bb1504ea3aed7d67943c9a642b12982621c79325ef223bfed43c01ea6f9aca44cab7c5c949a7fac910fd5140dac154c2ac125362a7a0bb4c1992ef2fdd76fe3
 WHIRLPOOL 
2f9350c378b4a6aa757bd7168fb38ababe4e89e842ab43335d43b222af73ff27bdeef558ad9c83d54a5b8a22be18e8be86e4da218fa1fdc91e903476104c94cb
-DIST tcsh-6.18.01.tar.gz 926872 SHA256 
d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8 SHA512 
2791709f6db19b70652259f7dd5ee5c5d7943e814b3904cac5a3e890ff3b144401ed8552bd4f82ec789378d85c3f785438446c4d97d229c46bd0a08970d34628
 WHIRLPOOL 
3a77a207fb53e81ccedec821dc20c55cdd60f0ea290b3042e0858dc479a9a208d515c065521118e85dba839f0ff765b435c42118849d5159e12cab52fdbfc001
 DIST tcsh-6.20.00.tar.gz 1001696 SHA256 
b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d SHA512 
c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 WHIRLPOOL 
09090ca8f698b4cc85b9a6dede56cf83a1f71b9844ac99729d0472bb9f7c4593572673b07f0ec9a0eb34cf7903cad08c20d93c795aff66f0717a48b47efa86b0
-DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 SHA256 
77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37 SHA512 
ab7bf0beb7fcb6fd0d5f18089f6e86ee62b5cc780a1b34cee576199eaac3b08ee84740b53327a37440b58042246a12da253c698655367fde548e121f4e3101b2
 WHIRLPOOL 
8ec43dd26dcedb6ef12a552c8029a88e9cc7569ba069c90567d75ddd103fe08edaabd8c57418484435bb782410f9b58886e189f347cb50249280aa7fb88afb4f
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 SHA256 
6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483 SHA512 
9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 WHIRLPOOL 
a16e642f32095f5403cad38446acc50e1802e874dba66eccfdc2ab7f5108fe77e91f5990585ba4fffb808be92c15a05f70eaf1fb436da040287b04c207c9a105

diff --git a/app-shells/tcsh/files/tcsh-6.14-makefile.patch 
b/app-shells/tcsh/files/tcsh-6.14-makefile.patch
deleted file mode 100644
index 6d85aa0588f..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-* don't strip (portage does that for us)
-* don't try to move away an older tcsh binary; we don't install in / so
-  that only results in an ugly error message
-
---- tcsh-6.14.00/Makefile.in
-+++ tcsh-6.14.00/Makefile.in
-@@ -477,9 +477,7 @@
- 
- install: tcsh$(EXEEXT) 
-       -mkdir -p ${DESTBIN}
--      -mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
-       cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
--      -strip ${DESTBIN}/tcsh$(EXEEXT)
-       chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
- 
- install.man: tcsh.man

diff --git a/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch 
b/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch
deleted file mode 100644
index 8fc902c19b4..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14-use-ncurses.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -257,7 +257,7 @@
- dnl Checks for libraries
- AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(getspnam, sec)
--AC_SEARCH_LIBS(tgetent, termlib termcap curses ncurses)
-+AC_SEARCH_LIBS(tgetent, ncurses)
- AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_SEARCH_LIBS(connect, socket)
- AC_SEARCH_LIBS([iconv], [iconv], [AC_DEFINE([HAVE_ICONV], [1],

diff --git a/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch 
b/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
deleted file mode 100644
index 194d478c403..00000000000
--- a/app-shells/tcsh/files/tcsh-6.14.00-debian-dircolors.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tcsh-6.14.00/tw.color.c
-+++ tcsh-6.14.00/tw.color.c
-@@ -235,13 +235,10 @@
-                   if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
-                       (Char)variables[i].variable[1] == (v[1] & CHAR))
-                       break;
--              if (i < nvariables) {
--                  v += 3;
-+              v += 3;
-+              if (i < nvariables)
-                   getstring(&c, &v, &variables[i].color, ':');
--                  continue;
--              }
--              else
--                  stderror(ERR_BADCOLORVAR, v[0], v[1]);
-+              continue;
-           }
-           break;
-       }

diff --git a/app-shells/tcsh/metadata.xml b/app-shells/tcsh/metadata.xml
index 19fc17dab30..b99b69c44e6 100644
--- a/app-shells/tcsh/metadata.xml
+++ b/app-shells/tcsh/metadata.xml
@@ -12,7 +12,4 @@
                includes a command-line editor, programmable word completion, 
spelling
                correction, a history mechanism, job control and a C-like 
syntax.
        </longdescription>
-  <use>
-    <flag name="catalogs">Add support for NLS catalogs</flag>
-  </use>
 </pkgmetadata>

diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild 
b/app-shells/tcsh/tcsh-6.17-r1.ebuild
deleted file mode 100644
index a399e9f3334..00000000000
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils flag-o-matic autotools prefix
-
-CONFVER="1.8"
-
-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
-       
https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="m68k"
-IUSE="catalogs 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 )"
-
-S=${WORKDIR}/${MY_P}
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
-       epatch "${FILESDIR}/${MY_P/17/14}"-debian-dircolors.patch # bug #120792
-       epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
-       epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
-       eautoreconf
-
-       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
-
-       # 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'
-}
-
-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
-}

diff --git a/app-shells/tcsh/tcsh-6.18.01.ebuild 
b/app-shells/tcsh/tcsh-6.18.01.ebuild
deleted file mode 100644
index c45d8eb3f9d..00000000000
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/${P}.tar.gz
-       
https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="s390 sh"
-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-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
-       append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
-       append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
-       append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
-       append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
-
-       econf \
-               --prefix="${EPREFIX:-/}" \
-               --datarootdir='${prefix}/usr/share' \
-               $(use_enable nls)
-}
-
-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
-}

Reply via email to