[gentoo-commits] repo/gentoo:master commit in: dev-util/ctags/, dev-util/ctags/files/

[Tim Harder]

commit:     6635a8c6cb2423209613660b53d8360ebe621a75
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 07:30:14 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 07:33:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6635a8c6

dev-util/ctags: version bump to 20161028 universal-ctags snapshot

 dev-util/ctags/Manifest                            |  1 +
 dev-util/ctags/ctags-20161028.ebuild               | 67 ++++++++++++++++++++++
 .../files/ctags-20161028-automagic-deps.patch      | 65 +++++++++++++++++++++
 dev-util/ctags/metadata.xml                        |  3 +
 4 files changed, 136 insertions(+)

diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 53e165a..8c49aa0 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,4 @@
+DIST ctags-20161028.tar.xz 852108 SHA256 8c10b3728ed90793fa25e5225e8cf56ee0a01b5da6d2bcdccd97e8ec0db2da4e SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e WHIRLPOOL ac8b51f9d453c7d5ae52044d711949112f0523c61c5de12827188c694f616c5108ff4af86e2b810da859b88ba9ada1a9f9d36ba52060ebb16ed570f185caea95
 DIST ctags-5.8.tar.gz 479927 SHA256 0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 SHA512 981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 WHIRLPOOL 04506a4495025907ee5fe41b9c4ff104dd234fc9ef39bd594158b36c550bf511b6ab5980a98736f9857dc47b99f1718a7ae2928fd4a1d1c0b57dfd3d79fce2ea
 DIST ctags-5.8_p20140919.tar.gz 582289 SHA256 eebc85bd0206988250d9b24a7d02918bbca751259b086d5f53f31b4b39f571ee SHA512 3b6ad6e2d1f683dffe9e79c607f9cc222c4aa3c1f5113540cd18ea66d8f862917c9d849ee81d8b33a57ddd09749fa28fde74868d48479269a6e17b6c0451342d WHIRLPOOL 0c4008e914aed33097641fbb517f33e2ccf771a968ae3d1f6288422cdb634dda054ece11dd6204d624c9c78d4a36cecc4bb9d696d07f2bba24f3099aa3758f48
 DIST ctags-ada-mode-4.3.11.tar.bz2 14060 SHA256 d25a3fd26b356adbd068f10a0b68691d36c154c04b96304b96386e169e4b6b57 SHA512 51c71e13ef658cd6682f04c94485315c4a702080ef2c7786fc9881b03c86f1c1d43aa1a69c452e4b0b2f7a78383804b66b159542cb4eae0cd309bc1ddbe2eb6e WHIRLPOOL 7e0ded8c97d3651e1afe48ec836697a4a19264baf3b203f6e98c134b88e3ab0eee7ac660789f5b955f0f827128996988694aa6c4bc78f18adf52724c5230da5d

diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
new file mode 100644
index 00000000..18e793e
--- /dev/null
+++ b/dev-util/ctags/ctags-20161028.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+SRC_URI="http://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="json xml yaml"
+
+COMMON_DEPEND="
+	json? ( dev-libs/jansson )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-eselect/eselect-ctags
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-automagic-deps.patch )
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-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
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog "You can set the version to be started by /usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+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
new file mode 100644
index 00000000..82daf14
--- /dev/null
+++ b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
@@ -0,0 +1,65 @@
+Add options to control libxml2, jansson, and libyaml automagic deps.
+
+--- ctags-20161028/configure.ac
++++ ctags-20161028/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"])
+ 
++AC_ARG_ENABLE([xml],
++	[AS_HELP_STRING([--enable-xml],
++		[enable xml support [no]])])
++
+ AH_TEMPLATE([HAVE_LIBXML],
+ 	[Define this value if libxml is available.])
+ dnl About the condition of version
+ dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html
+-PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
+-		       [have_libxml=yes
+-		       AC_DEFINE(HAVE_LIBXML)],
+-		       [have_libxml=no])
++if test "${enable_xml}" = "yes"; then
++	PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
++			       [have_libxml=yes
++			       AC_DEFINE(HAVE_LIBXML)],
++			       [AC_MSG_ERROR([libxml2 not found])])
++fi
+ AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes)
+ 
++AC_ARG_ENABLE([json],
++	[AS_HELP_STRING([--enable-json],
++		[enable json support [no]])])
++
+ AH_TEMPLATE([HAVE_JANSSON],
+ 	[Define this value if jansson is available.])
+-PKG_CHECK_MODULES(JANSSON, jansson,
+-		       [have_jansson=yes
+-		       AC_DEFINE(HAVE_JANSSON)],
+-		       [have_jansson=no])
++if test "${enable_json}" = "yes"; then
++	PKG_CHECK_MODULES(JANSSON, jansson,
++			       [have_jansson=yes
++			       AC_DEFINE(HAVE_JANSSON)],
++			       [AC_MSG_ERROR([jansson not found])])
++fi
+ AM_CONDITIONAL(HAVE_JANSSON, test "x$have_jansson" = xyes)
+ 
++AC_ARG_ENABLE([yaml],
++	[AS_HELP_STRING([--enable-yaml],
++		[enable yaml support [no]])])
++
+ AH_TEMPLATE([HAVE_LIBYAML],
+ 	[Define this value if libyaml is available.])
+-PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
+-		       [have_libyaml=yes
+-		       AC_DEFINE(HAVE_LIBYAML)],
+-		       [have_libyaml=no])
++if test "${enable_yaml}" = "yes"; then
++	PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
++			       [have_libyaml=yes
++			       AC_DEFINE(HAVE_LIBYAML)],
++			       [AC_MSG_ERROR([libyaml not found])])
++fi
+ AM_CONDITIONAL(HAVE_LIBYAML, test "x$have_libyaml" = xyes)
+ 
+ 

diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 30c6883..7edfb20 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/metadata.xml
@@ -7,6 +7,9 @@
   </maintainer>
   <use>
     <flag name="ada">Enable Ada support</flag>
+    <flag name="json">Enable JSON output support</flag>
+    <flag name="xml">Enable XML parsing support</flag>
+    <flag name="yaml">Enable YAML parsing support</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">gnuada</remote-id>