gentoo resync : 20.10.2021

4 files changed, 89 insertions, 7 deletions

diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index cfa25175b050..36c362d69da7 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,8 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-DIST p5.9.20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
+DIST ctags-20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
+DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
-EBUILD ctags-20210321.0-r1.ebuild 1834 BLAKE2B 3e482f989b51faf1d6112d2f89e766531917fa570b9542a9e8185944c98c219dddc48438b80a521936340fa59c9049d13c0a66d142f236a92d0d3b945f5c9ddb SHA512 e7be1cd84e146ac88c02e0d178eab24ae40f96ff8a7464ff25b6ac27ee261a83edfe5f40ab383415612c0aeb028c7757035edd1c189f0a172f6943a22ce09558
-EBUILD ctags-99999999.ebuild 1827 BLAKE2B 80f19b0ca0d3efcb63255bc0d297c4457adf4ca62a722162c4e5c22989a0ee7332070230672172888c25b85b1bf7118c7b22e56ca476a3f436d4d5922ae6253b SHA512 c08c5bdd0908bb9f1d6ebf7ebfaaff05c502307c66e8658d69088378b2f9e26468a27f462b9747f56963d82d6d3b0895144a84222c20fd43bf059751a1b6afba
+EBUILD ctags-20210321.0-r1.ebuild 1849 BLAKE2B adb99905d2287b779048f3401c62c72f9fffe8fd8a251c4d670c41ab4a184c92c181b0d9d526297c2c4a7083e87658c7b8a8bd267368272e3b389391ecd323d1 SHA512 b709302f59eff89fedf04affb0aa08a1fc56e0d681abd675ed492ef09a0b652f0ae3e7b12745af8e05629bf1f608674ccc39033541f930ce317c373aec72949c
+EBUILD ctags-20211017.0.ebuild 1982 BLAKE2B ebd632cb7092de1a21ad6b55537ddc81d4afd2b1a8c5227ff395d8cbfe1af25ab340be5e6df4b6005fc8090e1d48a047c0c5b3d959132eb604f461a5093c63a7 SHA512 305f7f0d340c88ce7c632d7fcc81af22d95d3ea9c839e2ce7027af4df630ca2c34afecd10da0d06f40574e340472779114219c2b8c0a5c06f7d749c1cfa0a245
+EBUILD ctags-99999999.ebuild 1982 BLAKE2B ebd632cb7092de1a21ad6b55537ddc81d4afd2b1a8c5227ff395d8cbfe1af25ab340be5e6df4b6005fc8090e1d48a047c0c5b3d959132eb604f461a5093c63a7 SHA512 305f7f0d340c88ce7c632d7fcc81af22d95d3ea9c839e2ce7027af4df630ca2c34afecd10da0d06f40574e340472779114219c2b8c0a5c06f7d749c1cfa0a245
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20210321.0-r1.ebuild b/dev-util/ctags/ctags-20210321.0-r1.ebuild
index 471c4110d1bf..c63787072afc 100644
--- a/dev-util/ctags/ctags-20210321.0-r1.ebuild
+++ b/dev-util/ctags/ctags-20210321.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *99999999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
diff --git a/dev-util/ctags/ctags-20211017.0.ebuild b/dev-util/ctags/ctags-20211017.0.ebuild
new file mode 100644
index 000000000000..3b3948787072
--- /dev/null
+++ b/dev-util/ctags/ctags-20211017.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+if [[ ${PV} == *99999999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-p5.9.${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json xml yaml"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-ctags
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--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/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 1d3b06d128c0..3b3948787072 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,9 +11,9 @@ if [[ ${PV} == *99999999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2+"
@@ -35,6 +35,9 @@ BDEPEND="
 "
 
 src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
 	default
 
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die