gentoo resync : 15.02.2018

2 files changed, 0 insertions, 68 deletions

diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
deleted file mode 100644
index 40fa18a45983..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001
-From: Christopher Meng <cickumqt@gmail.com>
-Date: Fri, 10 Jan 2014 19:57:47 +0800
-Subject: [PATCH] Fix non-standard deskop file
-
-desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true"
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
----
- doc/linkchecker-gui.desktop | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop
-index 7e06b6e..09bd997 100644
---- a/doc/linkchecker-gui.desktop
-+++ b/doc/linkchecker-gui.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--Name=LinkChecker GUI
-+Name=LinkChecker GUI
- GenericName=URL validator
- GenericName[de]=URL Validator
- Version=1.0
- Type=Application
- Exec=linkchecker-gui
- Terminal=false
--Categories=Network;WebDevelopment;
--Icon=logo48x48
-+Categories=Network;WebDevelopment;
-+Icon=linkchecker
--- 
-1.8.5.1
-
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
deleted file mode 100644
index 905b7f718414..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2ce810c3fb00b895a841a7be6b2e78c64e7b042 Mon Sep 17 00:00:00 2001
-From: Bastian Kleineidam <bastian.kleineidam@web.de>
-Date: Tue, 28 Jun 2016 21:55:10 +0200
-Subject: [PATCH] Fix python requests version check
-
----
- linkcheck/__init__.py | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
-index 22a0cf5..1cec214 100644
---- a/linkcheck/__init__.py
-+++ b/linkcheck/__init__.py
-@@ -24,10 +24,17 @@
- # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467
- if not (hasattr(sys, 'version_info') or
-         sys.version_info < (2, 7, 2, 'final', 0)):
--    raise SystemExit("This program requires Python 2.7.2 or later.")
-+    import platform
-+    version = platform.python_version()
-+    raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version)
-+# require a reasonably recent requests module: 2.4.0 from 2014-08-29
- import requests
--if requests.__version__ <= '2.2.0':
--    raise SystemExit("This program requires Python requests 2.2.0 or later.")
-+# PEP 396 has only version strings, bummer! PEP 386 is also not helpful.
-+requests_version = requests.__version__.split('.')
-+# Depends on the version scheme of Python requests
-+if int(requests_version[0]) < 2 or \
-+   (int(requests_version[0]) == 2 and int(requests_version[1]) < 4):
-+    raise SystemExit("This program requires Python requests 2.4.0 or later instead of %s." % requests.__version__)
- 
- import os
- # add the custom linkcheck_dns directory to sys.path