dev-util/ctags: EAPI 6 bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-util/ctags/ctags-5.8-r2.ebuild b/dev-util/ctags/ctags-5.8-r2.ebuild
new file mode 100644 (file)
index 0000000..033b487
--- /dev/null
+++ b/dev-util/ctags/ctags-5.8-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="http://ctags.sourceforge.net"
+SRC_URI="
+       mirror://sourceforge/${PN}/${P}.tar.gz
+       ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada"
+
+RDEPEND="app-eselect/eselect-ctags"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+       # Upstream fix for python variables starting with def
+       "${FILESDIR}/${P}-python-vars-starting-with-def.patch"
+       # Bug #273697
+       "${FILESDIR}/${P}-f95-pointers.patch"
+)
+
+HTML_DOCS=( EXTENDING.html ctags.html )
+
+DOCS=( FAQ NEWS README )
+
+src_prepare() {
+       default
+
+       # enabling Ada support
+       if use ada ; then
+               cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die
+               epatch "${FILESDIR}/${P}-ada.patch"
+       fi
+}
+
+src_configure() {
+       econf \
+               --with-posix-regex \
+               --without-readlib \
+               --disable-etags \
+               --enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+       emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+       # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+       # rename ctags to exuberant-ctags (Mandrake does this also).
+       mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+       mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+
+       einstalldocs
+}
+
+pkg_postinst() {
+       eselect ctags update
+       elog "You can set the version to be started by /usr/bin/ctags through"
+       elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+       eselect ctags update
+}

diff --git a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
index a22481be7bebc4dd617fa300de40d870f97b9efc..980d7d1c5ac5debd308453a141340e26838a1280 100644 (file)
--- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
+++ b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
@@ -1,7 +1,7 @@
 Add options to control libxml2, jansson, and libyaml automagic deps.
 
---- ctags-20161028/configure.ac
-+++ ctags-20161028/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -585,30 +585,48 @@
  AC_CHECK_FUNCS(fork waitpid execv pipe,[enable_xcmd=yes],[enable_xcmd=no])
  AM_CONDITIONAL([ENABLE_XCMD], [test "xyes" = "x$enable_xcmd"])

diff --git a/dev-util/ctags/files/ctags-5.6-ebuilds.patch b/dev-util/ctags/files/ctags-5.6-ebuilds.patch
index 5b0de663a15a9e8818ff31e2e20655de5cb6d943..9fce6c5defcf21882599ea8ad94b0f5fbd2a9d43 100644 (file)
--- a/dev-util/ctags/files/ctags-5.6-ebuilds.patch
+++ b/dev-util/ctags/files/ctags-5.6-ebuilds.patch
@@ -1,6 +1,6 @@
 diff -ur ctags-5.6/sh.c ctags-5.6-ebuild/sh.c
---- ctags-5.6/sh.c     2006-05-30 00:37:13.000000000 -0400
-+++ ctags-5.6-ebuild/sh.c      2006-10-07 17:37:31.000000000 -0400
+--- a/sh.c     2006-05-30 00:37:13.000000000 -0400
++++ b/sh.c     2006-10-07 17:37:31.000000000 -0400
 @@ -7,7 +7,8 @@
  *   GNU General Public License.
  *

diff --git a/dev-util/ctags/files/ctags-5.8-ada.patch b/dev-util/ctags/files/ctags-5.8-ada.patch
index 48ed96f0d88e0e5349d7954924dcfe549aaaff3a..9026bc540400d1e4dac5ab5171bd11d1f706265d 100644 (file)
--- a/dev-util/ctags/files/ctags-5.8-ada.patch
+++ b/dev-util/ctags/files/ctags-5.8-ada.patch
@@ -1,5 +1,5 @@
---- parsers-orig.h     2009-11-16 23:39:49.747328066 +0200
-+++ parsers.h  2009-11-16 23:40:26.541581805 +0200
+--- a/parsers.h        2009-11-16 23:39:49.747328066 +0200
++++ b/parsers.h        2009-11-16 23:40:26.541581805 +0200
 @@ -16,6 +16,7 @@
  
  /* Add the name of any new parser definition function here */

diff --git a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
index 4ac9560f87854c40e568c997d8b99893d65b206c..a29334571657387db69a47f6c74154f3bcc2084d 100644 (file)
--- a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
+++ b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
@@ -1,5 +1,5 @@
---- fortran-orig.c     2009-11-16 23:38:06.154328652 +0200
-+++ fortran.c  2009-11-16 23:38:08.711335501 +0200
+--- a/fortran.c        2009-11-16 23:38:06.154328652 +0200
++++ b/fortran.c        2009-11-16 23:38:08.711335501 +0200
 @@ -1319,7 +1319,8 @@
                        readToken (token);
                        skipPast (token, TOKEN_OPERATOR);

diff --git a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
index 83d9f7e887eb9047c3182c9b86e20ac7b17d162f..68a37df7ff9161cf01ee0eda367323204202a50c 100644 (file)
--- a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
+++ b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
@@ -1,5 +1,5 @@
---- python-orig.c      2009-11-16 23:33:44.930351712 +0200
-+++ python.c   2009-11-16 23:35:08.433328150 +0200
+--- a/python.c 2009-11-16 23:33:44.930351712 +0200
++++ b/python.c 2009-11-16 23:35:08.433328150 +0200
 @@ -264,8 +264,8 @@
        while (*cp)
        {