From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-editors/elvis/Manifest | 7 ++ app-editors/elvis/elvis-2.2.0-r6.ebuild | 96 ++++++++++++++++++++ app-editors/elvis/elvis-2.2.0-r7.ebuild | 101 +++++++++++++++++++++ .../elvis/files/elvis-2.2.0-glibc-2.10.patch | 48 ++++++++++ app-editors/elvis/files/elvis-2.2.0-interix.patch | 11 +++ .../elvis/files/ft2.3-symbol-collision-fix.patch | 73 +++++++++++++++ app-editors/elvis/metadata.xml | 8 ++ 7 files changed, 344 insertions(+) create mode 100644 app-editors/elvis/Manifest create mode 100644 app-editors/elvis/elvis-2.2.0-r6.ebuild create mode 100644 app-editors/elvis/elvis-2.2.0-r7.ebuild create mode 100644 app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch create mode 100644 app-editors/elvis/files/elvis-2.2.0-interix.patch create mode 100644 app-editors/elvis/files/ft2.3-symbol-collision-fix.patch create mode 100644 app-editors/elvis/metadata.xml (limited to 'app-editors/elvis') diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest new file mode 100644 index 000000000000..e6f56d1386ea --- /dev/null +++ b/app-editors/elvis/Manifest @@ -0,0 +1,7 @@ +AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21bf231cc1ebfc038b24181ed5e6f522463ca1111835f90e82e1975484be1637e299257a04f36f16585e0498133d6282 SHA512 2658fc5a6758a0ecab2320a01fcb708d595e304e94609f642e324d6d77a58a13e20560041fdb890f0f91443c5a3c53ccd1eb8f6a7bc47c70f8e910da107b071c +AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442 +AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3 +DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42 +EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca +EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc +MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2 diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild new file mode 100644 index 000000000000..2317c7acda26 --- /dev/null +++ b/app-editors/elvis/elvis-2.2.0-r6.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils versionator toolchain-funcs + +MY_PV=$(replace_version_separator 2 '_') + +DESCRIPTION="A vi/ex clone" +HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/" +SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" +IUSE="X" + +RDEPEND=">=sys-libs/ncurses-5.7-r7:0= + X? ( + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libXpm-3.5.4.2 + >=x11-libs/libXft-2.1.8.2 ) + app-eselect/eselect-vi" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + virtual/pkgconfig" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_prepare() { + epatch \ + "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \ + "${FILESDIR}"/${P}-glibc-2.10.patch \ + "${FILESDIR}"/${P}-interix.patch +} + +src_configure() { + ./configure \ + --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ + --prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${EPREFIX}"/usr/share/elvis \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_with X x) \ + || die + + # Some Makefile fixups (must happen after configure) + # Use our CFLAGS + sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" + + # We'll install the man-pages ourselves + sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" + + # Don't try to write to /etc + sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed" + + # Use LDFLAGS + sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \ + die "sed 4 failed" +} + +src_install() { + dodir /usr/bin + dodir /usr/share/man/man1 + dodir /usr/share/elvis + dodir /usr/share/doc/${PF} + dodir /etc + emake install \ + PREFIX="${ED}"/usr \ + BINDIR="${ED}"/usr/bin \ + DATADIR="${ED}"/usr/share/elvis \ + DOCDIR="${ED}"/usr/share/doc/${PF} + + # Install the man-pages + mv doc/elvis.man doc/elvis.1 + mv doc/elvtags.man doc/elvtags.1 + mv doc/ref.man doc/ref.1 + doman doc/*.1 + + # Fixup some READMEs + sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \ + || die 'sed /etc/elvis/README failed' + sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \ + || die 'sed /usr/share/elvis/README failed' +} + +pkg_postinst() { + einfo "Setting /usr/bin/vi symlink" + eselect vi set "${PN}" +} + +pkg_postrm() { + einfo "Updating /usr/bin/vi symlink" + eselect vi update +} diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild new file mode 100644 index 000000000000..c69d4195dd1b --- /dev/null +++ b/app-editors/elvis/elvis-2.2.0-r7.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator toolchain-funcs + +MY_PV=$(replace_version_separator 2 '_') + +DESCRIPTION="A vi/ex clone" +HOMEPAGE="http://elvis.the-little-red-haired-girl.org" +SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" +IUSE="X" + +RDEPEND=" + sys-libs/ncurses:0= + app-eselect/eselect-vi + X? ( + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libXpm-3.5.4.2 + >=x11-libs/libXft-2.1.8.2 + )" + +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}"/ft2.3-symbol-collision-fix.patch + "${FILESDIR}"/${P}-glibc-2.10.patch + "${FILESDIR}"/${P}-interix.patch +) + +src_configure() { + ./configure \ + --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ + --prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${EPREFIX}"/usr/share/elvis \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_with X x) \ + || die + + # Some Makefile fixups (must happen after configure) + # Use our CFLAGS + sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" + + # We'll install the man-pages ourselves + sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" + + # Don't try to write to /etc + sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed" + + # Use LDFLAGS + sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \ + die "sed 4 failed" +} + +src_install() { + dodir /usr/bin + dodir /usr/share/man/man1 + dodir /usr/share/elvis + dodir /usr/share/doc/${PF} + dodir /etc + + emake install \ + PREFIX="${ED}"/usr \ + BINDIR="${ED}"/usr/bin \ + DATADIR="${ED}"/usr/share/elvis \ + DOCDIR="${ED}"/usr/share/doc/${PF} + + # Install the man-pages + mv doc/elvis.man doc/elvis.1 || die + mv doc/elvtags.man doc/elvtags.1 || die + mv doc/ref.man doc/ref.1 || die + doman doc/*.1 + + # Fixup some READMEs + sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \ + || die 'sed /etc/elvis/README failed' + sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \ + || die 'sed /usr/share/elvis/README failed' +} + +pkg_postinst() { + einfo "Setting /usr/bin/vi symlink" + eselect vi set "${PN}" +} + +pkg_postrm() { + einfo "Updating /usr/bin/vi symlink" + eselect vi update +} diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch new file mode 100644 index 000000000000..1a3d1affb303 --- /dev/null +++ b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch @@ -0,0 +1,48 @@ +diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c +--- elvis-2.2_0.orig/ref.c 2003-10-21 05:32:25.000000000 +0300 ++++ elvis-2.2_0/ref.c 2009-08-05 21:28:30.000000000 +0300 +@@ -42,7 +42,7 @@ + + #if USE_PROTOTYPES + static void usage(char *argv0); +-static char *getline(FILE *fp); ++static char *get_line(FILE *fp); + static void store(char *line, char **list); + static LINECLS classify(char *line, LINECLS prev); + static void lookup(TAG *tag); +@@ -171,7 +171,7 @@ + /* This function reads a single line, and replaces the terminating newline with + * a '\0' byte. The string will be in a static buffer. Returns NULL at EOF. + */ +-static char *getline(fp) ++static char *get_line(fp) + FILE *fp; + { + int ch; +@@ -348,7 +348,7 @@ + } + + /* for each line... */ +- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++) ++ for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++) + { + /* is this the tag definition? */ + if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len)) +@@ -377,7 +377,7 @@ + { + if (strchr(line, '(') != NULL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = get_line(fp)) != NULL + && *line + && ((*line != '#' && *line != '{') + || line[strlen(line) - 1] == '\\')) +@@ -387,7 +387,7 @@ + } + else if ((lc = classify(line, lc)) == LC_PARTIAL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = get_line(fp)) != NULL + && (lc = classify(line, lc)) == LC_PARTIAL) + { + puts(line); diff --git a/app-editors/elvis/files/elvis-2.2.0-interix.patch b/app-editors/elvis/files/elvis-2.2.0-interix.patch new file mode 100644 index 000000000000..e16024374716 --- /dev/null +++ b/app-editors/elvis/files/elvis-2.2.0-interix.patch @@ -0,0 +1,11 @@ +diff -ru -x '*.Po' -x '*.Plo' elvis-2.2_0.orig/osunix/osblock.c elvis-2.2_0/osunix/osblock.c +--- elvis-2.2_0.orig/osunix/osblock.c 2008-04-03 12:00:26 +0200 ++++ elvis-2.2_0/osunix/osblock.c 2008-04-03 12:01:53 +0200 +@@ -293,5 +293,7 @@ + return; + #endif + ++#ifndef __INTERIX + sync(); ++#endif + } diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch new file mode 100644 index 000000000000..aac099e56ef7 --- /dev/null +++ b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch @@ -0,0 +1,73 @@ +diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags +--- elvis-2.2_0-orig/guix11/tags 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/tags 2007-08-17 12:56:28.000000000 -0700 +@@ -31,7 +31,7 @@ + DEFAULT_TOOLFG guix11.c 40;" d ln:40 file: + DEFAULT_XENCODING guix11.c 48;" d ln:48 file: + FT_DEFAULT xdialog.h 10;" ln:10 enum:X_FIELDTYPE +-FT_FILE xdialog.h 10;" ln:10 enum:X_FIELDTYPE ++FT_FILEC xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_LOCKED xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_NUMBER xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_ONEOF xdialog.h 10;" ln:10 enum:X_FIELDTYPE +diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c +--- elvis-2.2_0-orig/guix11/xdialog.c 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/xdialog.c 2007-08-17 12:56:28.000000000 -0700 +@@ -387,7 +387,7 @@ + case 'o': ft = FT_ONEOF, limit = scan; break; + case 'n': ft = FT_NUMBER, limit = scan; break; + case 's': ft = FT_STRING; break; +- case 'f': ft = FT_FILE; break; ++ case 'f': ft = FT_FILEC; break; + case 'l': ft = FT_LOCKED; break; + } + +@@ -556,7 +556,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + button = addbutton(dia, "<", 'l', ELVCTRL('L')); + button->y = dia->y0 + dia->rowh * i; + button->x = dia->x0 + 3; +@@ -1111,7 +1111,7 @@ + newvalue = keystring(dia, key); + break; + +- case FT_FILE: ++ case FT_FILEC: + #ifdef FEATURE_COMPLETE + if (key == '\t') + { +@@ -1179,7 +1179,7 @@ + switch (dia->field[row].ft) + { + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + case FT_NUMBER: + case FT_LOCKED: + drawtext(dia, row); +@@ -1207,7 +1207,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + if (button->shape == 'l') + if (row == dia->current + ? dia->shift > 0 +diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h +--- elvis-2.2_0-orig/guix11/xdialog.h 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/xdialog.h 2007-08-17 12:56:28.000000000 -0700 +@@ -5,7 +5,7 @@ + FT_ONEOF, /* one of a preset list; includes boolean */ + FT_NUMBER, /* numeric field */ + FT_STRING, /* string field */ +- FT_FILE, /* string field where does filename completion */ ++ FT_FILEC, /* string field where does filename completion */ + FT_LOCKED /* non-editable field */ + } X_FIELDTYPE; + typedef struct + diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml new file mode 100644 index 000000000000..f1abc6411341 --- /dev/null +++ b/app-editors/elvis/metadata.xml @@ -0,0 +1,8 @@ + + + + + vim@gentoo.org + Gentoo Vim Project + + -- cgit v1.2.3