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

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

[Tim Harder]

commit:     63de9941770de42c8c75266faa62c2f41e86f105
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 19:31:48 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 19:33:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63de9941

dev-util/ctags: fix autotools conditionals so pkg-config is always found

Fixes bug #604656.

 dev-util/ctags/files/ctags-20161028-automagic-deps.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
index 82daf14..a22481b 100644
--- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
+++ b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
@@ -18,12 +18,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_libxml=yes
 -		       AC_DEFINE(HAVE_LIBXML)],
 -		       [have_libxml=no])
-+if test "${enable_xml}" = "yes"; then
++AS_IF([test "${enable_xml}" = "yes"], [
 +	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],
@@ -36,12 +36,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_jansson=yes
 -		       AC_DEFINE(HAVE_JANSSON)],
 -		       [have_jansson=no])
-+if test "${enable_json}" = "yes"; then
++AS_IF([test "${enable_json}" = "yes"], [
 +	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],
@@ -54,12 +54,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_libyaml=yes
 -		       AC_DEFINE(HAVE_LIBYAML)],
 -		       [have_libyaml=no])
-+if test "${enable_yaml}" = "yes"; then
++AS_IF([test "${enable_yaml}" = "yes"], [ 
 +	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)
  
  

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

[Aaron Bauman]

commit:     57f4e2fd2d165295f7dc79ae1f60c105fd11087c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Nov  6 18:07:44 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 02:41:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f4e2fd

dev-util/ctags: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13571
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/ctags-20161028-automagic-deps.patch      | 65 ----------------------
 1 file changed, 65 deletions(-)

diff --git a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
deleted file mode 100644
index 980d7d1c5ac..00000000000
--- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Add options to control libxml2, jansson, and libyaml automagic deps.
-
---- 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"])
- 
-+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])
-+AS_IF([test "${enable_xml}" = "yes"], [
-+	PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
-+			       [have_libxml=yes
-+			       AC_DEFINE(HAVE_LIBXML)],
-+			       [AC_MSG_ERROR([libxml2 not found])])
-+])
- 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])
-+AS_IF([test "${enable_json}" = "yes"], [
-+	PKG_CHECK_MODULES(JANSSON, jansson,
-+			       [have_jansson=yes
-+			       AC_DEFINE(HAVE_JANSSON)],
-+			       [AC_MSG_ERROR([jansson not found])])
-+])
- 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])
-+AS_IF([test "${enable_yaml}" = "yes"], [ 
-+	PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
-+			       [have_libyaml=yes
-+			       AC_DEFINE(HAVE_LIBYAML)],
-+			       [AC_MSG_ERROR([libyaml not found])])
-+])
- AM_CONDITIONAL(HAVE_LIBYAML, test "x$have_libyaml" = xyes)
- 
-