neurogeek    15/02/19 02:45:24

  Modified:             ChangeLog
  Added:                nvi-1.81.6-r5.ebuild
  Log:
  Added patch to avoid collision with perl macros. closes bug #523820. Thanks 
to Karl Hakimian for the patch.
  
  (Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 
748B2C601F6F0683)

Revision  Changes    Path
1.97                 app-editors/nvi/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/ChangeLog?rev=1.97&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/ChangeLog?rev=1.97&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog   26 Jan 2014 12:20:13 -0000      1.96
+++ ChangeLog   19 Feb 2015 02:45:24 -0000      1.97
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/nvi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.96 2014/01/26 
12:20:13 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.97 2015/02/19 
02:45:24 neurogeek Exp $
+
+*nvi-1.81.6-r5 (18 Feb 2015)
+
+  18 Feb 2015; Jesus Rivero <neurog...@gentoo.org> +nvi-1.81.6-r5.ebuild,
+  +files/nvi-1.81.6-strlen-macro-renaming.patch:
+  Added patch to avoid collision with perl macros. closes bug #523820. Thanks
+  to Karl Hakimian for the patch.
 
   26 Jan 2014; Agostino Sarubbo <a...@gentoo.org> nvi-1.81.6-r4.ebuild:
   Stable for sparc, wrt bug #496600



1.1                  app-editors/nvi/nvi-1.81.6-r5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild?rev=1.1&content-type=text/plain

Index: nvi-1.81.6-r5.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.1 
2015/02/19 02:45:24 neurogeek Exp $

EAPI=4

inherit autotools db-use eutils flag-o-matic

DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
DBSLOTS=
DBDEPENDS=
for DBVER in ${DBVERS}
do
        if [[ ${DBVER} = *.*.* ]]; then
                DBSLOTS="${DBSLOTS} ${DBVER%.*}"
                DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
        else
                DBSLOTS="${DBSLOTS} ${DBVER}"
                DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
        fi
done

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 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="perl tcl unicode"

CDEPEND="|| ( ${DBDEPENDS} )
        >=sys-libs/ncurses-5.6-r2
        perl? ( dev-lang/perl )
        tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"

DEPEND="${CDEPEND}
                virtual/pkgconfig"

RDEPEND="${CDEPEND}
        app-admin/eselect-vi"

REQUIRED_USE="tcl? ( !unicode )"

src_prepare() {

        epatch "${FILESDIR}"/${P}-strlen-macro-renaming.patch
        epatch "${FILESDIR}"/${P}-db44.patch
        epatch "${FILESDIR}"/${P}-db.patch
        epatch "${FILESDIR}"/${P}-perl-as-needed.patch
        epatch "${FILESDIR}"/${P}-perl-shortnames.patch
        epatch "${FILESDIR}"/${P}-ac_config_header.patch
        epatch "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch

        cd dist || die
        chmod +x findconfig || die

        append-cppflags -I"$(db_includedir ${DBSLOTS})"

        sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die
        rm -f configure || die
        eautoreconf -Im4
}

src_configure() {
        local myconf

        use perl && myconf="${myconf} --enable-perlinterp"
        use unicode && myconf="${myconf} --enable-widechar"
        use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"

        append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'

        pushd dist 2>/dev/null
        econf \
                --program-prefix=n \
                ${myconf} \
                || die "configure failed"
        popd 2>/dev/null
}

src_compile() {
        pushd dist 2>/dev/null
        emake || die "make failed"
        popd 2>/dev/null
}

src_install() {
        pushd dist 2>/dev/null
        emake -j1 DESTDIR="${D}" install || die "install failed"
        popd 2>/dev/null
}

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
}




Reply via email to