gentoo resync : 29.12.2022

6 files changed, 2 insertions, 180 deletions

diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 28829fdfa807..788ea8e4b670 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,11 +1,6 @@
 AUX 50cscope-gentoo.el 1442 BLAKE2B 73a5542b5ac18dd6ffb34169764cae590cb009c3d04816cb09361d24ea16c3e2fdb2355cca2301e932108fbb333ff433783b75bb379ecf4ec8996f8e162f422a SHA512 63bb70766d69a85f78c43204e3539bcabaf5765f19703f6f8ad1dcc2bc076c1c20623a3120eeeaff89842fac9f17d5b3f17820780eab9844716cbcd6a138d384
-AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231cc61099e854ded076f66034ab400c0f49db7ba5eeb43ee7cd3e1d5d9c0ba488b282f050ffe532da9910324688 SHA512 24c3a876c34786c8ff2b51256c05da5c8334cc8befb3db40faba8af8f34abbec78062f1baf8e0dc0adf9f37731b10310e61cd46c08a6e78baa767234e483e7d5
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
-AUX cscope-15.8a-pkgconfig.patch 910 BLAKE2B cdfefcf050af281a930a037b3b9339b316f6eb886f901b84fefeb881a471c8226d9bdc1b8ec7ae2740b2c6a157c471401901a6dca18ee4c1cb4cdc205460b760 SHA512 83bbfe58b682bb95cd0234b5f85528e75074271bb45a24573ba7da6053976d5753aa4019aff11593fb9bdd3a35afff648d21f8463f21945ce1542ddc2a1a4a29
 AUX cscope-15.9-pkgconfig.patch 833 BLAKE2B 4f8869517758d4b8725d772c7b4252c4f7aec57b3d63ab36c3fd4a6df08c6374773b016901a0418327b76c04f9fce131b58845c074073e1bcdc3f319261c74a3 SHA512 98002268e01be238a4f918bd95d9f69957477e9bbd0bd7cd0be204efc421fec8daf2aac86cfad9310c7bbd1f6ef0b6234e11e6e9d5490787ae2011160080f731
-DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.8a-r1.ebuild 1378 BLAKE2B 52001e76ecec742a627e766a0779870e912551ed5cbbe5085351e446a57b589d8164d81cf00b1512ab29598de4b548f9da28c367adbad7657800fecc4074955d SHA512 74ef447b77d1b3422845e5dd24ee284523b5bcd6105e33fea68516c70de430d65b2c5c1416391861b21edd4c82b7998437efcaadec633b0889497b67b503bf64
-EBUILD cscope-15.8a-r2.ebuild 1615 BLAKE2B 03df0e896206ae8f50c2e10c1c55632790abe3c4dd3d3456343cd4b0b7fe14fb4388139a910e1696463695ece9c9227586319fbeff30b9cbf712229d9ae222f7 SHA512 bc73bfc6175f45c11251f3064e6b3b9e0e9a53a8f02052a4ad9c41c8a1c9c3dea04ee3054b8e3e386bc48383a4317ffdafcf1eb9d45b22a6c830e4c35ba4de3f
-EBUILD cscope-15.9.ebuild 1577 BLAKE2B 3ea33d00bb9b81e7fdbb49339e927a5fcce9f38aeb122dd140d620aa96b9551315b743a4e27373b0c47262c994c6d14322e8cd0a372d0dab36c33389b4965da6 SHA512 a020407c661f6f85236c3b50a715d714ccc7917db6b758d620b9cb0cd2a80318c641c7c5f48b26683f9d2e979b1098243fefe96ae8711e1f7d1aa1183d07c5a3
+EBUILD cscope-15.9.ebuild 1584 BLAKE2B c6c346cc1ecdb0ec7692f45431ae8284148d48184253429e7e0ebf0225ede2a2a1c8588b5b0e0f222d082489dd3aea3e6d7ba8c7e5951b2dcb158e0d7a29704e SHA512 7b68f56f4ad6a4bc67b5693fc57cc172c0223c84584e3f7d3f447ff28f5e5289c80e851ce2f7ef948d672a54d47e17d2324a21a4d3d3ec81a53ff2a48529707d
 MISC metadata.xml 1087 BLAKE2B 2e4779a4e1d063adc26a16774898a6cca08788ddfbfa036d29ae751e547a74cbf3252645e2b6444c59ed106f6088acb0bb5490dde7e7f5b55c74b3c9f941ea1c SHA512 6db0a7194cf116f4f1a1b34de222729dd0521dfb21486ead4885b068e52c3191091bf98e52b31b2e9d4d564560cec9a184d8d7c2387262afcf8442d66507c60b
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
deleted file mode 100644
index 560fb85eb311..000000000000
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
deleted file mode 100644
index 95facd63cb4f..000000000000
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply "${FILESDIR}/${PN}-15.6-darwin.patch"
-	eapply "${FILESDIR}/${PN}-15.8a-pkgconfig.patch"
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_configure() {
-	econf --with-ncurses="${EPREFIX}"/usr
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index a1c06ea237cf..2d9421fc287b 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/files/cscope-15.6-darwin.patch b/dev-util/cscope/files/cscope-15.6-darwin.patch
deleted file mode 100644
index e755f3257efd..000000000000
--- a/dev-util/cscope/files/cscope-15.6-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/constants.h
-+++ b/src/constants.h
-@@ -103,7 +103,7 @@
- #define INCLUDES	8
- #define	FIELDS		9
- 
--#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
-+#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ && !__MACH__
- # define TERMINFO	0	/* no terminfo curses */
- #else
- # define TERMINFO	1
diff --git a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
deleted file mode 100644
index 665b7169761e..000000000000
--- a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -22,6 +22,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
-    [Define this if the scanner is run through lex, not flex])
- fi
- AC_PROG_YACC
-+PKG_PROG_PKG_CONFIG
- 
- dnl === BEGIN CURSES CHECK
- dnl Curses detection: Munged from Midnight Commander's configure.in
-@@ -363,7 +364,7 @@ dnl Check for a GNOME installation
- AC_DEFUN([AC_CHECK_GNOME],[
- 	has_gnome=false
- 	AC_CHECK_PROG(gnome1, gnome-config, true)	
--	AC_CHECK_PROG(gnome2, pkg-config, true)
-+	AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
- 
- 	if test x$gnome1 = xtrue; then
- 	  has_gnome=true
-@@ -373,7 +374,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
- 	  has_gnome=true
- 	fi
- 	
--	AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
-+	AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
- 	AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
- 	AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
- ])