gentoo resync : 14.05.2020

3 files changed, 71 insertions, 0 deletions

diff --git a/net-misc/ncman/Manifest b/net-misc/ncman/Manifest
index 21b244307952..1a7db9a5a520 100644
--- a/net-misc/ncman/Manifest
+++ b/net-misc/ncman/Manifest
@@ -1,5 +1,7 @@
+AUX ncman-fix-for-json-c-0.14.patch 1586 BLAKE2B 37c63f15cea1e7ed4b95d54a005ae67aa068a0af0bb09b63759ba68069772590a8232bf194231efecc5f8c5d8ec3632aaf19fbad8ba0cece17dd1178bce72294 SHA512 469781a3d8a26cdd536d8795226a14cff57329a7a2f68293f5998a3560409fca25d1adf184bfb5088782fc19ffeccd8b22e3a4c64b3710ce7a96f686341b996d
 DIST ncman-0.0.1_p20190327.tar.gz 51925 BLAKE2B 020092e64ccb55563cc891699550911411b67b749a49fb6bab4962857b59c93fb05109afacb88a5e42abc9030683af66aed2e44aaf0bd1cd8931c9df019bdc52 SHA512 24a3b3eec57987e290cc319e409e8da00f14e260360c606b3a89ee2e092976d0b1c256a4b1be40870bcaea620a482477c4aed53fa0e1719c297fc9edd524235e
 EBUILD ncman-0.0.1_p20190327-r1.ebuild 796 BLAKE2B 65d65b1572418507a518e13d1b4e0861ff9cc3d7757dce42ddf7988449938857696e51a45360b535e59fc355574c972210e207469e70e1f0aed445ed648fa5eb SHA512 679cb7ff2b81998de0eb38ccf26bac798db605db0d750170ff98ee968d032663bba2c679675f96af3f3d9ecacace2a1f6c08cee2d7688c3d1822bf9fd0889d64
+EBUILD ncman-0.0.1_p20190327-r2.ebuild 855 BLAKE2B ccaaa376e826a231830e2991b05a75a1b45fa88c31d77adf8eab513adb761f573bface1b8304188ad55d37d4e7b69d7d962a4340813d5ff28e8649935bf8605d SHA512 350276af6cd23c7c345d3ba3b2a14685f397a19e9a68b71f637e0784fd44866ab7c6f76072ea54b0069b1ec5f81a87b4f31d1c2e5003dfcfc4ff6eaa599cb2e6
 EBUILD ncman-0.0.1_p20190327.ebuild 536 BLAKE2B 55e75c03200470f58100bac93c67877aa380757a4715a12b14aaf572f6524e115d799c2d3c80a60a6469647c7a44f55853ccb221d26205bf3896d6c952c6896e SHA512 d480d1afc2c4909802177bc39c2326877775d02567b9e748cc4d8cef50b5d5996a534dda0b27936a9dfd064e787a6f5fcad97793350247e30c0a9001c833d124
 EBUILD ncman-9999.ebuild 756 BLAKE2B 5e763d6ee99f25641fec73594f59fa808c56e57a1cd12e424c85f48ad917f4215bfd8db2421f7b552d22c305648451fa2f2174b15c58cdbe25087111bb682205 SHA512 5eebcf6839e40d0abdf91a721f36d172ce69fd306b36ef021c4ed498fb9c7e3480125ea7d084f852df8485fdde0ecba32d1658085f61e3a0ef495c7b11957ffa
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch b/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch
new file mode 100644
index 000000000000..c0ff5ded937d
--- /dev/null
+++ b/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch
@@ -0,0 +1,33 @@
+diff -ur a/src/json_regex.c b/src/json_regex.c
+--- a/src/json_regex.c	2020-05-05 06:50:49.643196630 -0500
++++ b/src/json_regex.c	2020-05-05 06:59:32.722322215 -0500
+@@ -64,7 +64,7 @@
+ 	json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$"));
+ 
+-	jregex_agent_retry_response = json_object_new_boolean(TRUE);
++	jregex_agent_retry_response = json_object_new_boolean(1);
+ 
+ 	// See commands.c __cmd_config_service for a better idea of the format.
+ 	jregex_config_service = json_object_new_object();
+@@ -94,7 +94,7 @@
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(tmp, key_serv_proxy_excludes, arr);
+ 	json_object_object_add(opt, key_serv_proxy_config, tmp);
+-	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE));
++	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(1));
+ 	arr = json_object_new_array();
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(opt, key_serv_domains_config, arr);
+diff -ur a/src/json_utils.c b/src/json_utils.c
+--- a/src/json_utils.c	2020-05-05 06:50:49.643196630 -0500
++++ b/src/json_utils.c	2020-05-05 06:59:46.140940810 -0500
+@@ -83,7 +83,7 @@
+ 		key_is_trusted = json_object_object_get_ex(jtrusted, key,
+ 				&tmp_trusted);
+ 
+-		if (key_is_trusted == FALSE)
++		if (key_is_trusted == 1)
+ 			return false;
+ 
+ 		res = __json_type_dispatch(val, tmp_trusted);
diff --git a/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild b/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild
new file mode 100644
index 000000000000..c57a4f960f9b
--- /dev/null
+++ b/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson
+COMMIT="21a55145ddbc5d085e91352586875abe92cff73b"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=https://github.com/l4rzy/ncman.git
+else
+	SRC_URI="https://github.com/l4rzy/ncman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="An ncurses UI for connman, forked from connman-json-client"
+HOMEPAGE="https://github.com/l4rzy/ncman"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/json-c:0=
+	>=sys-apps/dbus-1.4
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-fix-for-json-c-0.14.patch )
+
+[[ ${PV} == *9999* ]] || S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	append-cflags "-D_POSIX_C_SOURCE=200809L"
+}