Remove unused patches.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 21 insertions, 91 deletions

diff --git a/kde-base/print-manager/ChangeLog b/kde-base/print-manager/ChangeLog
index 06ab1f51cc05..bbe1aa77641e 100644
--- a/kde-base/print-manager/ChangeLog
+++ b/kde-base/print-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/print-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.96 2015/02/18 16:26:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.97 2015/02/19 07:13:34 kensington Exp $
+
+  19 Feb 2015; Michael Palimaka <kensington@gentoo.org>
+  -files/print-manager-4.14.1-cups20.patch:
+  Remove unused patches.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -print-manager-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-base/print-manager/Manifest b/kde-base/print-manager/Manifest
index f881f0633b34..e2a03443f656 100644
--- a/kde-base/print-manager/Manifest
+++ b/kde-base/print-manager/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX print-manager-4.14.1-cups20.patch 3354 SHA256 3fe146c93765f20d9e8156c82132a3fadaaee6481b5a0bb33599d38bbdb72106 SHA512 ee524b2571c98196c9c08cec46d5f9c0703ad21e39a8b9eed25268dd5717515844b5be5d0aa08c5b2dd466411feefba8608ff947860a14bb7c914add58a8bef5 WHIRLPOOL 350eab4b312ef824f4dd385810b0b75d9a4efd00b982a155d399dc57c2f4a50574bba1f45bd7e03acc2ad3bfdfe6f7bdf0ca4f2c32199573515f79d4595acf25
 DIST print-manager-4.14.3.tar.xz 92484 SHA256 081736f273c7f13806828497caddf83d36d5e083d56b277dc363360614fbc135 SHA512 2cddb8b254125fc095fe0ea87f37a07c99edab8fd2dd115c4cc91a766e2e69b5c2e2061c7fa6eac64aa7d5bb3ba9c23db93ee78dcc898050496c553f41ff02f4 WHIRLPOOL 5cc136bcda948541089d2487e69b5bf8b8b874110d3f653d8844f586566296e5594b91ed2d06670d63115670c65e5f38ce79c6df1b4205438b1f7f260c268622
 EBUILD print-manager-4.14.3.ebuild 1134 SHA256 080bcae6c2f7b04ce0b7b893d92f13a2e313befa12dbc8eed4df9f50c4c78510 SHA512 53d36164bff30a061ae9f833c653ef78497a8a4cdfc0b0557c750e1c17b4a1d1172ea9db93197874c0567ea2bf1ae969271e3f2ca7f21a4d8f79b5ffd5b20279 WHIRLPOOL f19320fa0e1c50ccfa3b987069fd407cf01feac015600392fcd86cce33f81756ebf1560edef6891d2294e46b69bd5c583d4ab0d851a6f3a642f4460e598363e6
-MISC ChangeLog 12011 SHA256 d30bf73f1cac321bc23e8c452b2830d541311b7c9fef1a599a2b51f0a4a09b4a SHA512 21e9a6316a74cdb9425c3d3264758e114a103f74b98153a827e632a159b2a12a265bc24faef5fe026a4ebba155e6de779263dde2c8f3cd203f8b1c9c458d621f WHIRLPOOL fcf017a2ca409fe51b3b65aff34f7ddbdc9def484e84a5ccfbd8e5c41d193d6c99dc40410a7b7936decc857854f736dcd704f17db5cbdd1d369a698791f9eb9d
+MISC ChangeLog 12141 SHA256 256c3b8f85af86736e381454ffe852d434bb9228c0c59d98dcb52cdb2640c8cd SHA512 35bda71b18d93cd52af1bfe708613fe14874790671187d8ff88c7e329cfd6c35d176a380990014c86cba7eb8888bc2c37b840a841f035de68513c8b336a11d63 WHIRLPOOL 224e8e213e59a1b17971ddf2a73e853c9299178c1cc6d9e3a988c69319109b31e31662fc4fdd153471a154113344b4082aad3920b726fd3df89b97b24efcf28a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU5L1vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZCgQAJoQ2RRAQppo0tTlnLsUKatM
-JDLM+MHZJ9DF11lFsvht+katCXAG1YmAejLKrQlpRtr9vxcUHDXctX4w0efXBUyw
-oYJP0BwxTYVzp8nctOfAynYBWgf0RecYxyYoE9Zz7JoOSGnD5l6xFxVbb4rJ9oRe
-9XHL3q5HzbbAalmQw1N2a1Im3A3+kirVsTBWi3UsFDe+FcjQ6SS2B4ROLNDxlLM6
-xnB7NIrKUbLdqmkXkgczsucoz/xKaM9yLG0SjyuTBt5UC9mS6h2nmiGwaNNQc9Tj
-YaRJf99LuhlKjY3HTrsD8rhodkL52hy/MmT7efZ28y61IPIR/PwvHStR+RCwxWGH
-WVF6QAc+E7WOytemka026v0M14rtB2LB8f//X9WU1ImOkME/qGdsQpXcWrFEpVPc
-IXH8jeNJRHbf0E8bCv7TdCWuEhrIa5SzTUC6HFGANcFoT8XK/47fJW3t6YWEw1po
-1C6HfLZwQMbJSzMXK/RSIPx+/NxN5tRNLeQEDEanwBNZ2x6+mIFHvtHZPPGMFU7E
-bRhj4tzMFlFuuuYUh3YPSMStdHWTldc6MMGJyoPMJzI0Z13seRHlzLFUHoElj/WP
-oZeOQIHXodoNlMBk3QN0UjKJAE+FJBWSYcgPIZ3gE920XTJVPrIfV64UtJcZYdBq
-i9nF7Bib9KhE53u5suJ9
-=+ZPV
+iQJiBAEBCABMBQJU5Y0gRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7D37EACJ7zGkPKJ8oPm70f4XleD4vuLOa43L54tQ0IXM2CVoVAdYQbtdaGiLVkYC
+AenL6mVthv32jrYCu7WUvtQx2H+Wv74JUKcYBnMJ3ACPur+wST5Ws5934ic8xooZ
+5Z+da4uFmonYMcrhItNndYypGBCGhCJrsUWuyy+XU0O8o5IHs4a8/Z+QGieXh4Ao
+5PqbM1R1Q2g/ZINgZ0oeF+hvA2c7RPG4vt9U/ClHPAqvUb3+YKLPhV7lp0gD8aK3
+kc423l6T5sUnY8NW5oZ/vPTn7r4gVG6v3WiLbIwWFKpmPfOvgYEzfDrzPypc/89D
+P/+ibf7tm4kadUfScWezAr70kzrbeXzQ9HiZgOSzV3LBrq0ENCvN2ZrJg+6Qdcih
+ig5SKbeX9YqAA+2V4U/ZKmmxSflmp6t+RmEbQQnbD9lVd42t3e966GvYNhIcFTDE
+e34cN+9+YRPPpKaA1QrwqC8T01Gl4ftwjMM7r1JMJn+63MfYDkQaB1QmTdP9zw63
+JILAPPOyuQTQUvU16E5bkM0XrkGLYCQqM/O3qn1AuBfswlcMvemzQGtP/tOrPF2Q
+vCIr4iYUe+HVITKFjKiXVhQS2KDlPvuJL+p8sbaPwXxlmEOC86Xr90Nkvt+GfAlK
+S2zCWsmOuSeutGNzPrgd8i6gMCS8BEbGQoUATHA0+ffJ8NoLaA==
+=bchO
 -----END PGP SIGNATURE-----
diff --git a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
deleted file mode 100644
index 58c59dd61078..000000000000
--- a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp
-index 713be2f..335fc46 100644
---- a/libkcups/KCupsConnection.cpp
-+++ b/libkcups/KCupsConnection.cpp
-@@ -377,11 +377,11 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-         response = request.sendIppRequest();
-     } while (retry("/", operation));
- 
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     if (response && ippGetStatusCode(response) == IPP_OK) {
- #else
-     if (response && response->request.status.status_code == IPP_OK) {
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-         ipp_attribute_t *attr;
-         if (subscriptionId >= 0) {
-             // Request was ok, just return the current subscription
-@@ -392,7 +392,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-             kWarning() << "No notify-subscription-id in response!";
-             ret = -1;
-         } else {
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-             ret = ippGetInteger(attr, 0);
-         }
-     } else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {
-@@ -406,7 +406,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
-         kDebug() << "Subscription not found";
-         // When the subscription is not found try to get a new one
-         return renewDBusSubscription(-1, leaseDuration, events);
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     } else {
-         kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
-         // When the server stops/restarts we will have some error so ignore it
-@@ -582,7 +582,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
-     ipp_attribute_t *attr;
-     ReturnArguments ret;
- 
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     QVariantHash destAttributes;
-     for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
-         // We hit an attribute sepparator
-@@ -659,7 +659,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
-             break;
-         }
-     }
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
- 
-     return ret;
- }
-@@ -667,7 +667,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
- QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
- {
-     QVariant ret;
--#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     switch (ippGetValueTag(attr)) {
-     case IPP_TAG_INTEGER:
-     case IPP_TAG_ENUM:
-@@ -760,7 +760,7 @@ QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
-             ret = values;
-         }
-     }
--#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
-+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
-     return ret;
- }
-