From 136c8e2c484fc372112be7dbdc5619bbc20b8b49 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 22 Jun 2021 22:58:56 +0100 Subject: app-shells/tcsh: add virtual/libcrypt dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed for upcoming libcrypt migration. Acked-by: David Seifert Reported-by: Ulrich Müller Signed-off-by: Sam James --- app-shells/tcsh/tcsh-6.22.02-r1.ebuild | 106 +++++++++++++++++++++++++++++++ app-shells/tcsh/tcsh-6.22.02.ebuild | 105 ------------------------------- app-shells/tcsh/tcsh-6.22.04-r1.ebuild | 110 +++++++++++++++++++++++++++++++++ app-shells/tcsh/tcsh-6.22.04.ebuild | 109 -------------------------------- 4 files changed, 216 insertions(+), 214 deletions(-) create mode 100644 app-shells/tcsh/tcsh-6.22.02-r1.ebuild delete mode 100644 app-shells/tcsh/tcsh-6.22.02.ebuild create mode 100644 app-shells/tcsh/tcsh-6.22.04-r1.ebuild delete mode 100644 app-shells/tcsh/tcsh-6.22.04.ebuild (limited to 'app-shells') diff --git a/app-shells/tcsh/tcsh-6.22.02-r1.ebuild b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild new file mode 100644 index 000000000000..962d72644d4b --- /dev/null +++ b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit epatch flag-o-matic autotools prefix + +CONFVER="1.9" + +DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" +HOMEPAGE="https://www.tcsh.org/" +SRC_URI=" + ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz + https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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:0= + virtual/libcrypt:= + virtual/libiconv" +DEPEND="${RDEPEND} + sys-devel/gettext + doc? ( dev-lang/perl )" + +CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} + +PATCHES=( + "${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792 + "${FILESDIR}"/${PN}-6.18.01-aix.patch + "${FILESDIR}"/${PN}-6.21.00-no-nls.patch + "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch + "${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream +) + +src_prepare() { + epatch "${PATCHES[@]}" + + eautoreconf + + # fix gencat usage + sed \ + -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ + -i nls/Makefile.in || die + + # always use sysmalloc, the builtin malloc fails on Darwin, musl, + # etc. it's already used for glibc-linux, so this doesn't change + # anything for the majority of users + sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || 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 + + eapply_user +} + +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 + + DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) + if use doc ; then + perl tcsh.man2html tcsh.man || die + HTML_DOCS=( tcsh.html/*.html ) + fi + einstalldocs + + insinto /etc + doins \ + "${CONFDIR}"/csh.cshrc \ + "${CONFDIR}"/csh.login + + # bug #119703: add csh -> tcsh symlink + dosym tcsh /bin/csh +} diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02.ebuild deleted file mode 100644 index b5d2662737f5..000000000000 --- a/app-shells/tcsh/tcsh-6.22.02.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit epatch flag-o-matic autotools prefix - -CONFVER="1.9" - -DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" -HOMEPAGE="https://www.tcsh.org/" -SRC_URI=" - ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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:0= - virtual/libiconv" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( dev-lang/perl )" - -CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} - -PATCHES=( - "${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792 - "${FILESDIR}"/${PN}-6.18.01-aix.patch - "${FILESDIR}"/${PN}-6.21.00-no-nls.patch - "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch - "${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream -) - -src_prepare() { - epatch "${PATCHES[@]}" - - eautoreconf - - # fix gencat usage - sed \ - -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ - -i nls/Makefile.in || die - - # always use sysmalloc, the builtin malloc fails on Darwin, musl, - # etc. it's already used for glibc-linux, so this doesn't change - # anything for the majority of users - sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || 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 - - eapply_user -} - -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 - - DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) - if use doc ; then - perl tcsh.man2html tcsh.man || die - HTML_DOCS=( tcsh.html/*.html ) - fi - einstalldocs - - insinto /etc - doins \ - "${CONFDIR}"/csh.cshrc \ - "${CONFDIR}"/csh.login - - # bug #119703: add csh -> tcsh symlink - dosym tcsh /bin/csh -} diff --git a/app-shells/tcsh/tcsh-6.22.04-r1.ebuild b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild new file mode 100644 index 000000000000..da1bb0b9c52b --- /dev/null +++ b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic autotools prefix + +CONFVER="1.9" + +DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" +HOMEPAGE="https://www.tcsh.org/" +SRC_URI=" + ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz + https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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:0= + virtual/libcrypt:= + virtual/libiconv" +DEPEND="${RDEPEND} + sys-devel/gettext + doc? ( dev-lang/perl )" + +CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} + +PATCHES=( + "${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792 + "${FILESDIR}"/${PN}-6.21.04-no-nls.patch + "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch +) + +src_prepare() { + default + + eautoreconf + + # fix gencat usage + sed \ + -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ + -i nls/Makefile.in || die + + # always use sysmalloc, the builtin malloc fails on Darwin, musl, + # etc. it's already used for glibc-linux, so this doesn't change + # anything for the majority of users + sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || 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 + + eapply_user +} + +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"'"'" + + # musl's utmp is non-functional + if use elibc_musl ; then + export ac_cv_header_utmp_h=no + export ac_cv_header_utmpx_h=no + fi + + econf \ + --prefix="${EPREFIX:-}" \ + --datarootdir='${prefix}/usr/share' \ + $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install install.man + + DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) + if use doc ; then + perl tcsh.man2html tcsh.man || die + HTML_DOCS=( tcsh.html/*.html ) + fi + einstalldocs + + insinto /etc + doins \ + "${CONFDIR}"/csh.cshrc \ + "${CONFDIR}"/csh.login + + # bug #119703: add csh -> tcsh symlink + dosym tcsh /bin/csh +} diff --git a/app-shells/tcsh/tcsh-6.22.04.ebuild b/app-shells/tcsh/tcsh-6.22.04.ebuild deleted file mode 100644 index 41835e196feb..000000000000 --- a/app-shells/tcsh/tcsh-6.22.04.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic autotools prefix - -CONFVER="1.9" - -DESCRIPTION="Enhanced version of the Berkeley C shell (csh)" -HOMEPAGE="https://www.tcsh.org/" -SRC_URI=" - ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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:0= - virtual/libiconv" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( dev-lang/perl )" - -CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER} - -PATCHES=( - "${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792 - "${FILESDIR}"/${PN}-6.21.04-no-nls.patch - "${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch -) - -src_prepare() { - default - - eautoreconf - - # fix gencat usage - sed \ - -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \ - -i nls/Makefile.in || die - - # always use sysmalloc, the builtin malloc fails on Darwin, musl, - # etc. it's already used for glibc-linux, so this doesn't change - # anything for the majority of users - sed -i -e 's/undef SYSMALLOC/define SYSMALLOC/' config_f.h || 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 - - eapply_user -} - -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"'"'" - - # musl's utmp is non-functional - if use elibc_musl ; then - export ac_cv_header_utmp_h=no - export ac_cv_header_utmpx_h=no - fi - - econf \ - --prefix="${EPREFIX:-}" \ - --datarootdir='${prefix}/usr/share' \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install install.man - - DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K ) - if use doc ; then - perl tcsh.man2html tcsh.man || die - HTML_DOCS=( tcsh.html/*.html ) - fi - einstalldocs - - insinto /etc - doins \ - "${CONFDIR}"/csh.cshrc \ - "${CONFDIR}"/csh.login - - # bug #119703: add csh -> tcsh symlink - dosym tcsh /bin/csh -} -- cgit v1.2.3-65-gdbad