[gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/files/

[Fabian Groffen]

commit:     74451903cea83740dd5ecd5ddbbe76dd0b20f5a5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 09:24:46 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 09:25:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74451903

app-portage/portage-utils: remove unused patch and files

Closes #14161

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../portage-utils-0.74-qdepends-Q-regex.patch      | 96 ----------------------
 app-portage/portage-utils/files/post_sync          |  8 --
 app-portage/portage-utils/files/q-reinitialize     |  3 -
 3 files changed, 107 deletions(-)

diff --git a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch b/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
deleted file mode 100644
index 6d10161d704..00000000000
--- a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-qdepends: restore regex matching capabilities for reverse dependencies
-
-The use of atom matching unintendedly removed the ability to use
-regexes, which broke app-admin/gentoo-perl-helpers.  This patch removes
-the atom matching, and reverts to using regex matching always to restore
-behaviour.
-
-Bug: https://bugs.gentoo.org/683430
-
---- a/qdepends.c
-+++ b/qdepends.c
-@@ -483,11 +483,9 @@
- 	int ret;
- 	regex_t preg;
- 	regmatch_t match;
--	depend_atom *aq;
- 	depend_atom *as;
- 	depend_atom *ac;
- 	char firstmatch = 0;
--	char *sslot;
- 
- 	if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len))
- 		return 0;
-@@ -526,34 +524,17 @@
- 		return 1;
- 	}
- 
--	aq = atom_explode(state->query);
--	if (!aq) {
--		/* "fall" back to old behaviour of just performing an extended
--		 * regular expression match */
--		if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
--			dep_burn_tree(dep_tree);
--			return 1;
--		}
-+	/* fallback for old behaviour of just performing an extended
-+	 * regular expression match */
-+	if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
-+		dep_burn_tree(dep_tree);
-+		return 1;
- 	}
- 
- 	match.rm_eo = 0;
- 	firstmatch = 1;
- 	do {  /* find all matches */
--		if (!aq) {
--			ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
--		} else {
--			char *loc;
--			ret = -1;
--			snprintf(qbuf, sizeof(qbuf), "%s%s%s",
--					aq->CATEGORY ? aq->CATEGORY : "",
--					aq->CATEGORY ? "/" : "",
--					aq->PN);
--			if ((loc = strstr(ptr + match.rm_eo, qbuf)) != NULL) {
--				ret = 0;
--				match.rm_so = loc - ptr;
--				match.rm_eo = match.rm_so + strlen(qbuf);
--			}
--		}
-+		ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
- 		if (ret != 0)
- 			break;
- 
-@@ -571,18 +552,6 @@
- 					ptr + match.rm_so);
- 		ac = atom_explode(qbuf);
- 
--		/* drop SLOT when not present in aq so we can match atoms
--		 * regardless */
--		sslot = ac->SLOT;
--		if (aq->SLOT == NULL && ac->SLOT != NULL)
--			ac->SLOT = NULL;
--		ret = atom_compare(ac, aq);
--		ac->SLOT = sslot;
--		if (ret != EQUAL) {
--			atom_implode(ac);
--			break;
--		}
--
- 		if (firstmatch == 1) {
- 			firstmatch = 0;
- 			printf("%s%s/%s%s%s%c", BOLD, catname, BLUE,
-@@ -615,11 +584,7 @@
- 	if (verbose && firstmatch == 0)
- 		printf("\n");
- 
--	if (!aq) {
--		regfree(&preg);
--	} else {
--		atom_implode(aq);
--	}
-+	regfree(&preg);
- 	atom_implode(as);
- 	dep_burn_tree(dep_tree);
- 

diff --git a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync
deleted file mode 100644
index e94ea5d0257..00000000000
--- a/app-portage/portage-utils/files/post_sync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright 2006-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-for f in /etc/portage/postsync.d/* ; do
-	[ -x "${f}" ] && "${f}"
-done
-:

diff --git a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize
deleted file mode 100644
index 7bca1a86b3a..00000000000
--- a/app-portage/portage-utils/files/q-reinitialize
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
-: