gentoo resync : 20.03.2022

6 files changed, 58 insertions, 117 deletions

diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 0dcbb821c551..943bf5bce912 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,7 +1,5 @@
-AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b7e380cdb99ae20082209fbcb05e7c837553900f507fcba6faa7cf691dd66e2f7e32b7d987dc238a80259cc6 SHA512 5ab3ba3d31288c4cb2071796144e68d85c6bf29f215714980685dce75eeac199ea32bfea2c83619e997c2c90891a254179dd6e8763651e703f4a662b7871bab2
-AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7
-DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
-EBUILD zile-2.3.24-r2.ebuild 1368 BLAKE2B 308ea08faf165d84b31d2930ecc0fa61bbb087dd009acdc0941743d2738bbd94633672f067854a40d1a207db58af3ca0aca8e704675543bb5185ff7548c47405 SHA512 f721e9f61105809c3eb463f9f0d6e42d3151f32ca98d8e5b26ef46151186bb513036b8be5cda37b3deea48b9713e4b8d9652c5564ef17b5acdefab813a753960
+DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
-MISC metadata.xml 639 BLAKE2B 21089f59c450a6758090d4e7f1d9ec35834ec6e8883751c1043ae4b4267c0d7367435b774826152ce4d91d6762c17ad6c6f932cb78914a3b14b21a6496e6376d SHA512 6d06d8fde6d21edc99b065886194d252461680b23f367031d1b55fe52292f01ec5032f35c28f420c37b1c6225965f4b00d08cb5300837832727a5b802b9f8fc5
+EBUILD zile-2.6.2-r1.ebuild 1176 BLAKE2B 8223428bc7394d28e4eaa0bbfc95eb68a2dcbe1f0cf1f76ea2ae3380c5c702eff9257fa32983e63ca0371916bf970753a9a2751bc7de6510db2203a6f6b8b0be SHA512 b7e0d7e9fc225e04ec40aa4c9ef19d89019df4affe1c4d6eb758c4b943b05341e7ed6100ac5dcf2b7aa96050aa45fda202da26432522d1d488c9afb9c456bb91
+MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424
diff --git a/app-editors/zile/files/zile-2.3.24-gets.patch b/app-editors/zile/files/zile-2.3.24-gets.patch
deleted file mode 100644
index 9060c4bcf921..000000000000
--- a/app-editors/zile/files/zile-2.3.24-gets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/623218
-Backported from gnulib in zile-2.4.11.
-
---- zile-2.3.24-orig/lib/stdio.in.h
-+++ zile-2.3.24/lib/stdio.in.h
-@@ -717,22 +717,11 @@
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
diff --git a/app-editors/zile/files/zile-2.3.24-userhome.patch b/app-editors/zile/files/zile-2.3.24-userhome.patch
deleted file mode 100644
index 37f605ccf610..000000000000
--- a/app-editors/zile/files/zile-2.3.24-userhome.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://lists.gnu.org/archive/html/bug-zile/2011-08/msg00030.html
-
---- zile-2.3.24-orig/src/file.c
-+++ zile-2.3.24/src/file.c
-@@ -177,14 +177,15 @@ compact_path (astr path)
-     {
-       /* Replace `/userhome/' (if found) with `~/'. */
-       size_t homelen = strlen (pw->pw_dir);
--      if (astr_len (path) >= homelen &&
--          !strncmp (pw->pw_dir, astr_cstr (path), homelen))
-+      if (homelen > 0 && pw->pw_dir[homelen - 1] == '/')
-+        homelen--;
-+
-+      if (astr_len (path) > homelen &&
-+          !strncmp (pw->pw_dir, astr_cstr (path), homelen) &&
-+          astr_get (path, homelen) == '/')
-         {
-           astr buf = astr_new_cstr ("~/");
--          if (STREQ (pw->pw_dir, "/"))
--            astr_cat_cstr (buf, astr_cstr (path) + 1);
--          else
--            astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-+          astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-           astr_cpy (path, buf);
-           astr_delete (buf);
-         }
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index b55d67a17365..b90e6fc97258 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -11,8 +11,4 @@
   or quick editing sessions, especially on remote machines or as a different
   user, e.g. root.
 </longdescription>
-<use>
-  <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg>
-    in tests</flag>
-</use>
 </pkgmetadata>
diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild
deleted file mode 100644
index a283c37c087d..000000000000
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test valgrind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch)
-
-src_configure() {
-	# --without-emacs to suppress tests for GNU Emacs #630652
-	econf \
-		--without-emacs \
-		$(use test && use_with valgrind || echo "--without-valgrind") \
-		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_test() {
-	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
-		# We have a sane terminal that can move the cursor
-		emake check
-	else
-		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
-		ewarn "Running the tests with TERM=vt100 instead"
-		TERM=vt100 emake check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# FAQ is installed by the build system in /usr/share/zile
-	dodoc AUTHORS BUGS NEWS README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
diff --git a/app-editors/zile/zile-2.6.2-r1.ebuild b/app-editors/zile/zile-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..b7fa5c7239ff
--- /dev/null
+++ b/app-editors/zile/zile-2.6.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION=0.52
+
+inherit toolchain-funcs vala
+
+DESCRIPTION="Zile is a small Emacs clone"
+HOMEPAGE="https://www.gnu.org/software/zile/"
+SRC_URI="mirror://gnu/zile/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libgee:0.8=
+	sys-libs/ncurses:0="
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-lang/perl
+	sys-apps/help2man
+	virtual/pkgconfig
+	$(vala_depend)"
+
+# AUTHORS, FAQ, and NEWS are installed by the build system
+DOCS="README THANKS"
+
+QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
+
+pkg_setup() {
+	vala_setup
+}
+
+src_prepare() {
+	default
+	rm *_vala.stamp || die
+}
+
+src_configure() {
+	econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with unset TERM instead"
+		( unset TERM; emake check )
+	fi
+}