* [gentoo-commits] repo/gentoo:master commit in: app-editors/nvi/, app-editors/nvi/files/
@ 2016-08-07 8:32 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2016-08-07 8:32 UTC (permalink / raw
To: gentoo-commits
commit: c17562078f3a6f72ea1d97c81ac7c1420340fdfe
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Aug 6 20:15:40 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 08:31:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1756207
app-editors/nvi: revision bump
* add myself as proxied maintainer
* bump EAPI to 6 and clean up ebuild
* add patch from https://bugs.gentoo.org/508922
* add patch to fix parallel make install
Closes: https://github.com/gentoo/gentoo/pull/2031
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-editors/nvi/files/nvi-1.81.6-db.patch | 4 +-
app-editors/nvi/files/nvi-1.81.6-db44.patch | 8 ++--
.../nvi/files/nvi-1.81.6-perl-as-needed.patch | 8 ++--
.../nvi/files/nvi-1.81.6-perl-shortnames.patch | 8 ++--
.../nvi/files/nvi-1.81.6-printf-types.patch | 14 ++++++
app-editors/nvi/metadata.xml | 8 ++++
.../{nvi-1.81.6-r5.ebuild => nvi-1.81.6-r6.ebuild} | 53 +++++++++++-----------
7 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/app-editors/nvi/files/nvi-1.81.6-db.patch b/app-editors/nvi/files/nvi-1.81.6-db.patch
index a8b7219..7001526 100644
--- a/app-editors/nvi/files/nvi-1.81.6-db.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-db.patch
@@ -1,5 +1,5 @@
---- common/exf.c
-+++ common/exf.c
+--- a/common/exf.c
++++ b/common/exf.c
@@ -228,13 +228,18 @@
/*
* XXX
diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch
index f081a2d..3a75bf0 100644
--- a/app-editors/nvi/files/nvi-1.81.6-db44.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-db44.patch
@@ -1,8 +1,8 @@
First part is from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
---- common/db.h 2012-08-27 06:55:01.000000000 -0400
-+++ common/db.h 2012-08-27 07:17:48.000000000 -0400
+--- a/common/db.h 2012-08-27 06:55:01.000000000 -0400
++++ b/common/db.h 2012-08-27 07:17:48.000000000 -0400
@@ -16,7 +16,10 @@
(env)->remove(env, path, NULL, flags)
#endif
@@ -15,8 +15,8 @@
#define db_open(db,file,type,flags,mode) \
(db)->open(db, NULL, file, NULL, type, flags, mode)
#else
---- common/msg.c
-+++ common/msg.c
+--- a/common/msg.c
++++ b/common/msg.c
@@ -724,7 +724,8 @@
p = buf;
} else
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
index 0111749..adf75b6 100644
--- a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
@@ -1,5 +1,5 @@
---- dist/configure.in
-+++ dist/configure.in
+--- a/dist/configure.in
++++ b/dist/configure.in
@@ -105,7 +105,7 @@
dnl A/UX has a broken getopt(3), strpbrk(3).
@@ -72,8 +72,8 @@
"other RE")
;;
esac
---- dist/Makefile.am
-+++ dist/Makefile.am
+--- a/dist/Makefile.am
++++ b/dist/Makefile.am
@@ -169,12 +169,15 @@
$(visrcdir)/common/pthread.c \
$(visrcdir)/common/vi_auto.c \
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
index 88e1829..3567646 100644
--- a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
@@ -1,5 +1,5 @@
---- perl_api/perlsfio.c
-+++ perl_api/perlsfio.c
+--- a/perl_api/perlsfio.c
++++ b/perl_api/perlsfio.c
@@ -32,6 +32,7 @@
/* perl redefines them
* avoid warnings
@@ -8,8 +8,8 @@
#undef USE_DYNAMIC_LOADING
#undef DEBUG
#undef PACKAGE
---- perl_api/perl.xs
-+++ perl_api/perl.xs
+--- a/perl_api/perl.xs
++++ b/perl_api/perl.xs
@@ -38,6 +38,7 @@
/* perl redefines them
* avoid warnings
diff --git a/app-editors/nvi/files/nvi-1.81.6-printf-types.patch b/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
new file mode 100644
index 0000000..20fc47c
--- /dev/null
+++ b/app-editors/nvi/files/nvi-1.81.6-printf-types.patch
@@ -0,0 +1,14 @@
+lno and last are uint32_t which might be different from unsigned long
+
+--- a/common/msg.c
++++ b/common/msg.c
+@@ -640,7 +640,8 @@ msgq_status(SCR *sp, db_recno_t lno, u_i
+ p += len;
+ } else {
+ t = msg_cat(sp, "027|line %lu of %lu [%ld%%]", &len);
+- (void)sprintf(p, t, lno, last, (lno * 100) / last);
++ (void)sprintf(p, t, (u_long)lno, (u_long)last,
++ ((long)lno * 100L) / (long)last);
+ p += strlen(p);
+ }
+ } else {
diff --git a/app-editors/nvi/metadata.xml b/app-editors/nvi/metadata.xml
index 097975e..f954e7f 100644
--- a/app-editors/nvi/metadata.xml
+++ b/app-editors/nvi/metadata.xml
@@ -1,4 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>felix.janda@posteo.de</email>
+ <name>Felix Janda</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-editors/nvi/nvi-1.81.6-r5.ebuild b/app-editors/nvi/nvi-1.81.6-r6.ebuild
similarity index 65%
rename from app-editors/nvi/nvi-1.81.6-r5.ebuild
rename to app-editors/nvi/nvi-1.81.6-r6.ebuild
index 7fd0013..439995b 100644
--- a/app-editors/nvi/nvi-1.81.6-r5.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
-inherit autotools db-use eutils flag-o-matic
+inherit autotools db-use flag-o-matic
DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
DBSLOTS=
@@ -30,35 +30,38 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="perl tcl unicode"
CDEPEND="|| ( ${DBDEPENDS} )
- >=sys-libs/ncurses-5.6-r2
+ >=sys-libs/ncurses-5.6-r2:=
perl? ( dev-lang/perl )
tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
DEPEND="${CDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig"
RDEPEND="${CDEPEND}
app-eselect/eselect-vi"
REQUIRED_USE="tcl? ( !unicode )"
-src_prepare() {
+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
+ )
- 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
+src_prepare() {
+ default
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
+ mv configure.{in,ac} || die
+ sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.ac || die
+ sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
eautoreconf -Im4
}
@@ -70,25 +73,21 @@ src_configure() {
use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
+ append-cppflags -I"$(db_includedir ${DBSLOTS})"
- pushd dist 2>/dev/null
+ pushd dist 2>/dev/null || die
econf \
--program-prefix=n \
- ${myconf} \
- || die "configure failed"
- popd 2>/dev/null
+ ${myconf}
+ popd 2>/dev/null || die
}
src_compile() {
- pushd dist 2>/dev/null
- emake || die "make failed"
- popd 2>/dev/null
+ emake -C dist
}
src_install() {
- pushd dist 2>/dev/null
- emake -j1 DESTDIR="${D}" install || die "install failed"
- popd 2>/dev/null
+ emake -C dist DESTDIR="${D}" install
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-07 8:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-07 8:32 [gentoo-commits] repo/gentoo:master commit in: app-editors/nvi/, app-editors/nvi/files/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox