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

[Fabian Groffen]

commit:     853c1a39806ea5c0d66032f2b56976c39a2e9be2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 13:48:46 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 13:49:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=853c1a39

app-portage/portage-utils: drop orphan patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/portage-utils-0.61-solaris.patch         | 27 ------------
 .../files/portage-utils-0.64-fix-quiet.patch       | 51 ----------------------
 2 files changed, 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 8bcc9c1b0ba..00000000000
--- 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 447fe3aa413..00000000000
--- 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@g.o>
-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@g.o>
-
-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();