Simplify add_blocker a bit, remove more slotting bits

4 files changed, 22 insertions, 22 deletions

diff --git a/kde-base/kfmclient/Manifest b/kde-base/kfmclient/Manifest
index 5bc813e9cde..77f3780e881 100644
--- a/kde-base/kfmclient/Manifest
+++ b/kde-base/kfmclient/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA512
 
 DIST kde-baseapps-4.6.80.tar.bz2 2487943 RMD160 30f8e1f32f0780ccbcdfdd2aff7a6a29cbc58be9 SHA1 f89b848791628d675e26dd7e703bd79834d1c951 SHA256 d10c7d3ba65d369cc93f2853cf4adacd4d7131dfd0c715080d0faf4acf0b513f
-EBUILD kfmclient-4.6.49.9999.ebuild 914 RMD160 ce90de3af4cb45840a18cfbe1b6179d1d6c267e7 SHA1 75e29d7e7b54b8aae2e48adf95a07d0f3394370d SHA256 f336ba82a1c86953f898ecd8f1be99e2fbcf2d3dabbf4c0c883a6ab2c4ab9e09
-EBUILD kfmclient-4.6.80.ebuild 949 RMD160 b7316b25d84d64f19708fd92aec430d501d5e6f0 SHA1 f4067561467da59862388a6efaaae148b13b745a SHA256 3b1faa5acaae43c898e97ece02114f33c0e00c4ed1dcea01e4baa4600dce7ce4
-EBUILD kfmclient-9999.ebuild 914 RMD160 43fa22c6369fd09c2e5c343678d3ff5d80264baa SHA1 30c7bea2813085c0fa003fea0f643e6c447d9ee5 SHA256 2f071d82d8fcff8aa1ef1eab7f6895bb101fa4876090b44e04f5fea9c21e0c81
+EBUILD kfmclient-4.6.49.9999.ebuild 891 RMD160 bdb923095900987be5afa6150109260ac0db1030 SHA1 2edf2ccf2dd4d1dfc83a7297f37b95d2d5633a4d SHA256 2c0bd9cde248cb39470f614cbc2e7dfb9fc10c8ac9adc21c5aec1f43eed453b6
+EBUILD kfmclient-4.6.80.ebuild 926 RMD160 731d7ee26f881de391092099500acfe65454b3f8 SHA1 0c48ed253b03ac1ee12f1a5b9ef4c0d1547a7d00 SHA256 2a020a3aa82bab371cc1e22fc9d2bf1a67afc7d631b705aae26d992d7944bdff
+EBUILD kfmclient-9999.ebuild 891 RMD160 0fa68f07fb05028bf1067529a903cbbe6bf74704 SHA1 11cb457992a0bfb10092ab36af2ca038f651ad4b SHA256 f0348d4670d4cdc57a38ed513268cadb3073f033fddd2b98e6920acf8f94eae0
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN8l6VAAoJENwGBM22xffe84sP/itJE5NcEagdw+kCBxlxybCN
-8aDdGXNru1TaMIGkd+tEFI25IF4hj+I42FztlmP77b36Ug5oAEo5NcF982SW9PPc
-I/FpwWnLLvznUoz2h+PYj16FhdJ2Rw3210MUYKLFwkBxq/AEEbgAcnctbX1/U2u0
-bSA4Tn4JsK4jtMi3DSj5uBGm2aaAIezd8apc/VT3SrGbjLitDeCuUSYbj9pNEunr
-HvTsZTivR6AuSJ6DYf6q5+OPd8klP0LKvtrZMv8jMS3PdJf3nvIwkryPyNS/HvSR
-PfZc3EffWTCg+yGLt25bZ6hHrxelNX2WyMA9PsifHUWKUmhCVxbK6tPGZUprtgnw
-aeqf/Bn8q3fnxfUjFo6Bp5hEjq22qJv/WgWuoXROGJhF+TH1QKhXWsbu0akWIs0L
-dYn2CT8A97X7x5fekicGwyGbBg+mXszK7Vd10BqufabtFTpzSLtSbZz+3RcmKTgj
-QKrHaA4i1a9n8pSRRExuqJo98I777mq1N+U9FTpVRpQbFktUBb7RxoYIL2gmERI6
-iuN8l7MC12vNkCQV3qBWPSBFZShF8kPnbvpDTXpzwiW/P1QlkgOn8If6OTPZ5axQ
-oyr151zw6GCs6HS8qWSXDWuM8VgaP6GWn7I1jWA4rYFLciWAUI7Oc/E4iN40sKUe
-YvOB64cs9PPWjGOkOANT
-=78nd
+iQIcBAEBCgAGBQJN9+P3AAoJELHSF2kinlg4uq4P/3h3zBhAQOV95myCXRjTx27v
+aZLqV7bDDyxZNkFyDWzQYIrkcPWvg6w3FesIX74Bjgll4RoIhSONaV3Vd4dFqKKG
+MOwc5pEcyIfaBofTv/JoJ6S4RXiWdZsvUhTIBDB76HpfXGD/mqxmP3AAqrtw3PYc
++Q3hnHSsoDoOAl0b2J533ed2qXxGLg95jvsDSkXcuW/NZfcHBXBHvp9wEqzDlvu8
+hRDUKDSAXcrf/RjviqL1pBM4VdvKXmwGWrvIjdS/9dgd4v1ZkgqZaPCrSN/FMrnH
+ZGOmvhhB9L8pvFHobAVdXF0ABzKO7Luyoigjtg6P6PBlkn+C6Wkri3OH7LOVOUdZ
+sGgxWk+E4yyegdWMJs09Q3P/L1OoEr0hjW4cu1b7uuhd7e+7evjb+fsCanhM3aVk
+L49yxgc2tw8Y/hcPDLkUslTdY+uIl/DoSx9e+uX3EOi+NK7MgSFlZnX5/+CkeuMK
+wWKPmzr1rfHVvU+lobkvQXF2e3UJhENYrP0K3P5RS7t3uqKHt5q7UI+Zsfv/DNAy
+XhCt1GBJL09Zvi5No2pF5mZw+R6Vv4zAdPNZkm/uw45Twe/VpYSvxnthF9BaXEZh
+fLuT4joo3m7At2YCn+Fk5AQtJS7ru3TxKKBHMu7N+kiA5gB//HbDXKoekl76fZ6q
+NPWQclJtfJn9UhRM4Aq2
+=vyjm
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kfmclient/kfmclient-4.6.49.9999.ebuild b/kde-base/kfmclient/kfmclient-4.6.49.9999.ebuild
index 8b2ca449b38..17ab6ac52a1 100644
--- a/kde-base/kfmclient/kfmclient-4.6.49.9999.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.6.49.9999.ebuild
@@ -12,8 +12,8 @@ DESCRIPTION="KDE tool for opening URLs from the command line"
 KEYWORDS=""
 IUSE="debug"
 
-# Moved from kde-base/konqueror in 4.3.0-r2, 4.3.65-r1
-add_blocker konqueror 4.3.0-r1 4.3.65:4.4
+# Moved from kde-base/konqueror in 4.3.65-r1
+add_blocker konqueror 4.3.65
 
 KMEXTRACTONLY="
 	konqueror/kfmclient.desktop
diff --git a/kde-base/kfmclient/kfmclient-4.6.80.ebuild b/kde-base/kfmclient/kfmclient-4.6.80.ebuild
index 5deac086d71..9abe643c9b2 100644
--- a/kde-base/kfmclient/kfmclient-4.6.80.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.6.80.ebuild
@@ -12,8 +12,8 @@ DESCRIPTION="KDE tool for opening URLs from the command line"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
-# Moved from kde-base/konqueror in 4.3.0-r2, 4.3.65-r1
-add_blocker konqueror 4.3.0-r1 4.3.65:4.4
+# Moved from kde-base/konqueror in 4.3.65-r1
+add_blocker konqueror 4.3.65
 
 KMEXTRACTONLY="
 	konqueror/kfmclient.desktop
diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclient/kfmclient-9999.ebuild
index 30f6735d3d6..c9ed89a7d29 100644
--- a/kde-base/kfmclient/kfmclient-9999.ebuild
+++ b/kde-base/kfmclient/kfmclient-9999.ebuild
@@ -12,8 +12,8 @@ DESCRIPTION="KDE tool for opening URLs from the command line"
 KEYWORDS=""
 IUSE="debug"
 
-# Moved from kde-base/konqueror in 4.3.0-r2, 4.3.65-r1
-add_blocker konqueror 4.3.0-r1 4.3.65:4.4
+# Moved from kde-base/konqueror in 4.3.65-r1
+add_blocker konqueror 4.3.65
 
 KMEXTRACTONLY="
 	konqueror/kfmclient.desktop