commit: cfba147f6b983843477064d34c334b968c576469
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 11:51:56 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 12:22:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfba147f
app-shells/tcsh: Bump to EAPI=5 and use subslot deps for ncurses
* drop die from econf
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-shells/tcsh/tcsh-6.17-r1.ebuild | 3 +-
app-shells/tcsh/tcsh-6.17.06.ebuild | 3 +-
app-shells/tcsh/tcsh-6.18.01-r2.ebuild | 3 +-
app-shells/tcsh/tcsh-6.18.01-r3.ebuild | 3 +-
...sh-6.18.01-r3.ebuild => tcsh-6.18.01-r4.ebuild} | 38 +++++++++++++---------
app-shells/tcsh/tcsh-6.18.01.ebuild | 3 +-
6 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild
b/app-shells/tcsh/tcsh-6.17-r1.ebuild
index cb515e8..64ec5fe 100644
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild
@@ -70,8 +70,7 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
- --datarootdir='${prefix}/usr/share' \
- || die
+ --datarootdir='${prefix}/usr/share'
}
src_install() {
diff --git a/app-shells/tcsh/tcsh-6.17.06.ebuild
b/app-shells/tcsh/tcsh-6.17.06.ebuild
index f0378a8..34886ee 100644
--- a/app-shells/tcsh/tcsh-6.17.06.ebuild
+++ b/app-shells/tcsh/tcsh-6.17.06.ebuild
@@ -66,8 +66,7 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
--datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
+ $(use_enable nls)
}
src_install() {
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index 3dc6ead..8fc7f32 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -76,8 +76,7 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
--datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
+ $(use_enable nls)
}
src_install() {
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
index 31db287..791d7c1 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
@@ -77,8 +77,7 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
--datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
+ $(use_enable nls)
}
src_install() {
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
similarity index 77%
copy from app-shells/tcsh/tcsh-6.18.01-r3.ebuild
copy to app-shells/tcsh/tcsh-6.18.01-r4.ebuild
index 31db287..42d2ba1 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="3"
+EAPI=5
inherit eutils flag-o-matic autotools prefix
@@ -10,7 +10,8 @@ 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
+SRC_URI="
+ ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2";
LICENSE="BSD"
@@ -20,7 +21,8 @@ IUSE="nls doc"
RESTRICT="test"
# we need gettext because we run autoconf (AM_ICONV)
-RDEPEND=">=sys-libs/ncurses-5.1
+RDEPEND="
+ >=sys-libs/ncurses-5.1:5=
virtual/libiconv"
DEPEND="${RDEPEND}
sys-devel/gettext
@@ -28,12 +30,16 @@ DEPEND="${RDEPEND}
CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
+ "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+ "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+ "${FILESDIR}"/${PN}-6.18.01-aix.patch
+ "${FILESDIR}"/${PN}-6.18.01-gcc5.patch
+)
+
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
- epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
- epatch "${FILESDIR}"/${PN}-6.18.01-gcc5.patch
+ epatch "${PATCHES[@]}"
# fix dependency on ncurses[tinfo], #459484
sed \
@@ -43,8 +49,9 @@ src_prepare() {
eautoreconf
# fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $>
$^/' \
- nls/Makefile.in || die
+ sed \
+ -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $>
$^/' \
+ -i nls/Makefile.in || die
# use sysmalloc (for larger alloc sets) on Darwin also
sed -i -e 's/__MACHTEN__/__MACH__/' config_f.h || die
@@ -77,25 +84,24 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
--datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
+ $(use_enable nls)
}
src_install() {
- emake DESTDIR="${D}" install install.man || die
+ emake DESTDIR="${D}" install install.man
+ DOCS=( FAQ Fixes NewThings Ported README WishList Y2K )
if use doc ; then
perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
+ HTML_DOCS=( tcsh.html/*.html )
fi
+ einstalldocs
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
index 8e010a4..f08276c 100644
--- a/app-shells/tcsh/tcsh-6.18.01.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01.ebuild
@@ -66,8 +66,7 @@ src_configure() {
econf \
--prefix="${EPREFIX:-/}" \
--datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
+ $(use_enable nls)
}
src_install() {
