summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-04-06 15:48:46 +0200
committerFabian Groffen <grobian@gentoo.org>2018-04-06 15:49:02 +0200
commit853c1a39806ea5c0d66032f2b56976c39a2e9be2 (patch)
tree4669d64cca19e0fcf7880587d0580c121874a167 /app-portage
parentapp-portage/portage-utils: re-add accidentially dropped s390 keyword (diff)
downloadgentoo-853c1a39806ea5c0d66032f2b56976c39a2e9be2.tar.gz
gentoo-853c1a39806ea5c0d66032f2b56976c39a2e9be2.tar.bz2
gentoo-853c1a39806ea5c0d66032f2b56976c39a2e9be2.zip
app-portage/portage-utils: drop orphan patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/portage-utils/files/portage-utils-0.61-solaris.patch27
-rw-r--r--app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch51
2 files changed, 0 insertions, 78 deletions
diff --git a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
deleted file mode 100644
index 8bcc9c1b0bad..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-qcache: work around missing d_type/DT_DIR
-
---- qcache.c
-+++ qcache.c
-@@ -750,13 +750,21 @@
-
- xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
- dir = opendir(catpath);
-- while ((de = readdir(dir)))
-+ while ((de = readdir(dir))) {
-+#ifndef DT_DIR
-+ struct stat s;
-+ if (stat(de->d_name, &s))
-+ continue;
-+ if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
-+#else
- if (de->d_type == DT_DIR && de->d_name[0] != '.') {
-+#endif
- bool ok;
- allcats = add_set_unique(de->d_name, allcats, &ok);
- if (ok)
- ++numcat;
- }
-+ }
- closedir(dir);
- free(catpath);
-
diff --git a/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch b/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
deleted file mode 100644
index 447fe3aa4138..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 237d1b34166fea2e4cb0eb28098a5b2759548b86
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date: Sun Nov 26 23:50:58 2017 -0800
-
- Fix PORTAGE_QUIET quiet result.
-
- Having PORTAGE_QUIET set caused the quiet variable to be incremented,
- but it did not also setup the warnout variable.
-
- Add a common setup function for warnout quiet, and use consistently.
-
- Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/main.c b/main.c
-index d124695..dea03a8 100644
---- a/main.c
-+++ b/main.c
-@@ -78,6 +78,15 @@ no_colors(void)
- setenv("NOCOLOR", "true", 1);
- }
-
-+static void
-+setup_quiet(void)
-+{
-+ /* "e" for FD_CLOEXEC */
-+ if (quiet == 0)
-+ warnout = fopen("/dev/null", "we");
-+ ++quiet;
-+}
-+
- /* include common applet defs */
- #include "applets.h"
-
-@@ -102,7 +111,7 @@ no_colors(void)
- #define COMMON_GETOPTS_CASES(applet) \
- case 0x1: portroot = optarg; break; \
- case 'v': ++verbose; break; \
-- case 'q': if (quiet == 0) { warnout = fopen("/dev/null", "we"); } ++quiet; break; \
-+ case 'q': setup_quiet(); break; \
- case 'V': version_barf(); break; \
- case 'h': applet ## _usage(EXIT_SUCCESS); break; \
- case 'C': no_colors(); break; \
-@@ -952,7 +961,7 @@ initialize_portage_env(void)
- xarraypush_str(overlays, main_overlay);
-
- if (getenv("PORTAGE_QUIET") != NULL)
-- quiet = 1;
-+ setup_quiet();
-
- if (nocolor)
- no_colors();