From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4967138330 for ; Sat, 1 Oct 2016 20:11:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFCFFE08C1; Sat, 1 Oct 2016 20:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3481E08C1 for ; Sat, 1 Oct 2016 20:11:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 055F6340A5C for ; Sat, 1 Oct 2016 20:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4614B2497 for ; Sat, 1 Oct 2016 20:11:41 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1475352683.f2adc93f628e14bf3eaca67b340141213c291c7f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/fte/fte-20110708-r1.ebuild app-editors/fte/fte-20110708.ebuild X-VCS-Directories: app-editors/fte/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f2adc93f628e14bf3eaca67b340141213c291c7f X-VCS-Branch: master Date: Sat, 1 Oct 2016 20:11:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b55b422d-9a93-4779-924e-515e9f1b553e X-Archives-Hash: 86152641aa5f28cdfe3d2e9657a3ab1d commit: f2adc93f628e14bf3eaca67b340141213c291c7f Author: Kacper Kołodziej kolodziej in> AuthorDate: Sat Oct 1 12:05:29 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Oct 1 20:11:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2adc93f app-editors/fte: upgrade to EAPI=6 Package-Manager: portage-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/2411 Signed-off-by: David Seifert gentoo.org> ...{fte-20110708.ebuild => fte-20110708-r1.ebuild} | 38 ++++++++++------------ 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/app-editors/fte/fte-20110708.ebuild b/app-editors/fte/fte-20110708-r1.ebuild similarity index 76% rename from app-editors/fte/fte-20110708.ebuild rename to app-editors/fte/fte-20110708-r1.ebuild index 19c53c6..900419f 100644 --- a/app-editors/fte/fte-20110708.ebuild +++ b/app-editors/fte/fte-20110708-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=6 inherit eutils toolchain-funcs @@ -20,7 +20,7 @@ IUSE="gpm slang X" S="${WORKDIR}/${PN}" RDEPEND=" - >=sys-libs/ncurses-5.2 + sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} slang? ( >=sys-libs/slang-2.1.3 ) app-arch/unzip" +HTML_DOCS=( doc/. ) + set_targets() { export TARGETS="" use slang && TARGETS="${TARGETS} s${PN}" @@ -43,14 +45,12 @@ set_targets() { } src_prepare() { - # Do not apply anymore, posibly deprecated. TODO: Check and clean up. - # epatch "${FILESDIR}"/${PN}-gcc34 - # epatch "${FILESDIR}"/${PN}-new_keyword.patch - # epatch "${FILESDIR}"/${PN}-slang.patch - # epatch "${FILESDIR}"/${PN}-interix.patch + default - [[ -e /usr/include/linux/keyboard.h ]] && \ - sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h + if [[ -e "${EPREFIX}"/usr/include/linux/keyboard.h ]]; then + sed "${EPREFIX}"/usr/include/linux/keyboard.h \ + -e '/wait.h/d' > src/hacked_keyboard.h || die + fi sed \ -e "s::\"hacked_keyboard.h\":" \ @@ -90,35 +90,31 @@ src_compile() { DEFAULT_FTE_CONFIG=../config/main.${PN} UOS=${os}" set_targets - emake CXX=$(tc-getCXX) OPTIMIZE="${CXXFLAGS}" ${DEFFLAGS} TARGETS="${TARGETS}" all + emake CXX="$(tc-getCXX)" OPTIMIZE="${CXXFLAGS}" "${DEFFLAGS}" TARGETS="${TARGETS}" all } src_install() { - local files - keepdir /etc/${PN} - into /usr set_targets - files="${TARGETS} c${PN}" + local i files="${TARGETS} c${PN}" for i in ${files}; do - dobin src/$i + dobin src/${i} done - dobin "${FILESDIR}"/${PN} + dobin "${FILESDIR}/${PN}" - dodoc BUGS README TODO - dohtml doc/* + einstalldocs insinto /usr/share/${PN} - doins -r config/* + doins -r config/. } pkg_postinst() { ebegin "Compiling configuration" cd "${EPREFIX}"/usr/share/${PN} || die "missing configuration dir" - "${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc + "${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc || die eend $? }