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 EA6DC1395E2 for ; Wed, 9 Nov 2016 09:03:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2AA0E095B; Wed, 9 Nov 2016 09:03:09 +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 A07EDE095B for ; Wed, 9 Nov 2016 09:03:09 +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 C9A413415D2 for ; Wed, 9 Nov 2016 09:03:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02736308 for ; Wed, 9 Nov 2016 09:03:06 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1478682076.c0a9b528a16185b57c48cfc46519d06b54482dfa.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nvi/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nvi/nvi-1.81.6-r7.ebuild X-VCS-Directories: app-editors/nvi/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c0a9b528a16185b57c48cfc46519d06b54482dfa X-VCS-Branch: master Date: Wed, 9 Nov 2016 09:03:06 +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: e932fcea-1367-4a9d-8710-77f2a255f76f X-Archives-Hash: d4b1aefb95252673cf6ab40e21632fd8 commit: c0a9b528a16185b57c48cfc46519d06b54482dfa Author: Felix Janda posteo de> AuthorDate: Tue Nov 8 01:57:50 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Wed Nov 9 09:01:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a9b528 app-editors/nvi: don't force <=sys-libs/db-4.8 Also, remove unecessary "! use unicode" tests, and add EPREFIX to the message catalog path. Gentoo-Bug: https://bugs.gentoo.org/599136 Signed-off-by: Pacho Ramos gentoo.org> app-editors/nvi/nvi-1.81.6-r7.ebuild | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild new file mode 100644 index 00000000..33465b6 --- /dev/null +++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools db-use flag-o-matic + +DESCRIPTION="Vi clone" +HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi" +SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="perl tcl unicode" + +CDEPEND=">=sys-libs/db-4.2.52_p5:= + >=sys-libs/ncurses-5.6-r2:= + perl? ( dev-lang/perl ) + tcl? ( >=dev-lang/tcl-8.5:0 )" + +DEPEND="${CDEPEND} + virtual/pkgconfig" + +RDEPEND="${CDEPEND} + app-eselect/eselect-vi" + +REQUIRED_USE="tcl? ( !unicode )" + +PATCHES=( + "${FILESDIR}"/${P}-strlen-macro-renaming.patch + "${FILESDIR}"/${P}-db44.patch + "${FILESDIR}"/${P}-db.patch + "${FILESDIR}"/${P}-perl-as-needed.patch + "${FILESDIR}"/${P}-perl-shortnames.patch + "${FILESDIR}"/${P}-ac_config_header.patch + "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch + "${FILESDIR}"/${P}-printf-types.patch + ) + +src_prepare() { + default + + cd dist || die + chmod +x findconfig || die + + mv configure.{in,ac} || die + sed -i -e "s@-ldb@-l$(db_libname)@" configure.ac || die + sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die + eautoreconf -Im4 +} + +src_configure() { + local myconf + + use perl && myconf="${myconf} --enable-perlinterp" + use unicode && myconf="${myconf} --enable-widechar" + use tcl && myconf="${myconf} --enable-tclinterp" + + append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\"" + append-cppflags -I"$(db_includedir)" + + pushd dist 2>/dev/null || die + econf \ + --program-prefix=n \ + ${myconf} + popd 2>/dev/null || die +} + +src_compile() { + emake -C dist +} + +src_install() { + emake -C dist DESTDIR="${D}" install +} + +pkg_postinst() { + einfo "Setting /usr/bin/vi symlink" + eselect vi update --if-unset +} + +pkg_postrm() { + einfo "Updating /usr/bin/vi symlink" + eselect vi update --if-unset +}