gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes #14161

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
This commit is contained in:
Fabian Groffen
2019-12-29 10:24:46 +01:00
parent 7d34e76dc9
commit 74451903ce
3 changed files with 0 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
View File

@@ -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);

8
app-portage/portage-utils/files/post_sync
View File

@@ -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
:

3
app-portage/portage-utils/files/q-reinitialize
View File

@@ -1,3 +0,0 @@
#!/bin/sh
[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
: