summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-08-01 17:15:32 +0000
committerJohannes Huber <johu@gentoo.org>2015-08-01 17:15:32 +0000
commit66442c1a7ba7828d8d084efa0b1834b5c182e462 (patch)
treea07e7c910e1d463fc73fc22ed6249469dcfec5e6
parentDrop kde-plasma/kio-extras, bug #555592. (diff)
downloadhistorical-66442c1a7ba7828d8d084efa0b1834b5c182e462.tar.gz
historical-66442c1a7ba7828d8d084efa0b1834b5c182e462.tar.bz2
historical-66442c1a7ba7828d8d084efa0b1834b5c182e462.zip
Allow kde-apps/kio-extras, bug #555592.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xFDF4F788
-rw-r--r--kde-plasma/plasma-desktop/ChangeLog5
-rw-r--r--kde-plasma/plasma-desktop/Manifest32
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild4
3 files changed, 22 insertions, 19 deletions
diff --git a/kde-plasma/plasma-desktop/ChangeLog b/kde-plasma/plasma-desktop/ChangeLog
index a1e3bf7d9ead..5f8ecab087b3 100644
--- a/kde-plasma/plasma-desktop/ChangeLog
+++ b/kde-plasma/plasma-desktop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-plasma/plasma-desktop
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-plasma/plasma-desktop/ChangeLog,v 1.4 2015/07/09 20:49:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/plasma-desktop/ChangeLog,v 1.5 2015/08/01 17:15:28 johu Exp $
+
+ 01 Aug 2015; Johannes Huber <johu@gentoo.org> plasma-desktop-5.3.2.ebuild:
+ Allow kde-apps/kio-extras, bug #555592.
09 Jul 2015; Johannes Huber <johu@gentoo.org> -plasma-desktop-5.3.1.ebuild:
Remove KDE Plasma 5.3.1
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 6735781535b2..b4d784e6d9ac 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -2,25 +2,25 @@
Hash: SHA256
DIST plasma-desktop-5.3.2.tar.xz 5888840 SHA256 e16f878bd07cdbe46205eff6294f1b19cdebd021e1fa6d0720409d54ab050fa4 SHA512 3429983ec39eff68d14dd9216a71d368edfddc0fc048ed47b302ca7a4808d6b6f75b16b6294e9e69a19e58d4c3a1f14d9876da1719411a354aa3a03e614b1d4c WHIRLPOOL 1e828b3a0a585e6f08a928c5eb32a2e697ea34c5f94aede77d15df95bf5cabed8b28b0fc3a8f28573e864dfe9dacfce31aad849074441685c01b8429c3533c8a
-EBUILD plasma-desktop-5.3.2.ebuild 3711 SHA256 f35a92c30585d52ed65f7ec20789a3c6d117f5c2a135e3bc90ccd47c31c8e139 SHA512 1ae7f4bcec2aa3ee127edce4ec918c2413122996d57c8671c4b0a60d73b592153b806621cab14dd9b4c94fd806992bc57c018f6129839e2edad643c63184a225 WHIRLPOOL 252ce216cb28b33f5cd2e8d92c23f47e86d4e1f64ed9ed1f9d79342f8aa23aed6f773857c98840957ea6e166f0e2e78092924b76464cca5418265aa82382fcc6
-MISC ChangeLog 883 SHA256 1d05244a19fb3c89a996323cf505561fb7f08d11ccad5dc6fe0cdca6a858a996 SHA512 4154d07f7142eac43e2c4644153f41871b21938519b8c2c0030f6aff18a171e6126d8fa02301294130ff23041af14d48f068a5317b76bedf0c622e1b55b604cd WHIRLPOOL 87686968247b5c26c84d113c36e9c0a19390585d397a6bd0a9cb8dc9bf3a44a6cd7648cbf8655f1c5bb1a94d3ade37239afdbd8f345231cc796f2ae77353d116
+EBUILD plasma-desktop-5.3.2.ebuild 3749 SHA256 ef29b58e0a96a7d8a24d53e0b13f6b6281d111fb5c88ef3dcd2f3d3f008816d5 SHA512 c75a922e64cf091e63017106dbb3f5941101bdbd11572f000914b40aaa0569fcd8706a550d082491881c8e209ab7dde505469a1c0626f933bf00808946e4e8b2 WHIRLPOOL 8c0ceb3d9be0f923a0e62729812ba4f6359343dfc08b281194d11460df0c000acfbb542e00bcdba9dd83ea63485d39640396da30065a04a5c9990689a97a8621
+MISC ChangeLog 1003 SHA256 2d8838369a5b9507a87184045c7c5bb097a62ff2d55e873d66cb762cc8179f87 SHA512 721e4e83154e4a24876b2b1db0e9d8722e492e8c46fbf57fca10e3c69e5cb5f7190d314754e5108deed94f72e06b3ca0ee4e3cfe187f759c6400b1fb84bf21fe WHIRLPOOL 771d186b1cc6ef7b1905089c57b63f861642f1d53a3e09a4ccdec4adcb328348d12356a9191dbf3f0126a7c7f2fd2c4c650b04b14f3334063a0aa544443aeb83
MISC metadata.xml 609 SHA256 f7de8c0d5302cfe0ec97cb93cc09a2f5b235d4f5599181ae158a67d812913730 SHA512 36666708f8a3ffb539ff3551eda5b964f3f1399e50d2ef8742c1583d40ab516eb9719e40b0a3fdbd225f18b51c2341c7aa6da087f6adea254d5241dd49fe41eb WHIRLPOOL b43771f8535a56e32b661ac2913481a25a7e4ac4da541f7e9791cc975016e5106148a697ee4c04554adf55bdccf905eea9eb192ed9511310b433e81f65c55a65
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJVnt7MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVvP8vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vthwQAMuFoY7n3UXFW7+eqP0stgsk
-UOACMnJOk62u7V2LGIbGSW+tWd40KelB8d6e1O7B0wJH1vsaD5mqperB8E54rpzT
-6yD3ljzzw9FW5C8k39Sfe9/NSG6Zu3DICiSsFPnTdO5CEOO0HGZXJgl/nOTQrL9H
-g0ZoRnXnawQmwmwAWonyfXvsUlHfy6IlXEGVs+OBMfIASwrO/aEtym8YSY7HZuCb
-HydY5h2ZQtoiUJL60ih1BQB6ACKkxF12teSjx96vgYEwJSNs4lLY3lSxuWoG2eq7
-fcU9FQrv0ov5KSicy1rxqBBIpPrKxXxcd2cjaVP2BFDU95XQJpgCb0wyy743r/Of
-amK2nihYraguaLrFgLKi+moFviqs6xudhNNHpZb/f+lhpjd5b1aidXRGiBqHJ9LT
-4FNb32bt6jPHqtJsbwHi/WWmiw8VVKES9UCqUjdtVCOxn2NDOsPjHI7CxRrDkU77
-5QyFVm+0wUzsrE885LeG2HhhJVapYPRUWCZfuUrLY0Iir5urc9qNfiNajUtu7q51
-AoTj/f+NBnxPsbfd8SxiMs+9aW+bFl4Hn2175XEGECzNP1N9wMiSbCNGHPqXyFOi
-m8ziqky6KcV+Om6iEGRNyBo9L7GyL/cuFTwNfGnvsFrndOjASJEF8687uYpibp2/
-f4d72T2C8zvx1WLRyrfC
-=Kx+l
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vQkUP/Ax/kPHG4A70cSnpDrog5bgE
+8f1Upj5B+JRD4Bq4v44HHXt125pRkVdie4ELQt4LIxPdUGC7fz5W3V0J8G9PGAsN
+1oIV2G8yZHpuQClQz+cC2vsl8/nhntGEqvZKBdjztGxllJIwGnQcBPXmG9J2d7wj
+lgGF4wG/on1SeOFHtXJ3s6cCe+5d1iCgQyWx5hK5Ml1wJxcaoUAhK39XPCfp4+ZF
+be3y0haJ0iDtbISymxh8bnC8y5RhMpgrB+1BVI4Q/CNb4hVX+BZihPd6McX9MMc5
+SVUh1qop1ltIUqDfgDUxb4ZDoviF30RlkT5a4Ry8JpVWkxnLYw64G2U4O8dTvcRU
+aP5lqNZeqfLNLKK9wZ+Kk+XwpKKLNk/Q3akkewHZqaP9O5R+fc+tfexGtdVusCvA
+OGKysXU0AtyDh/d1RV8lmvuvTpS81AOQs6DwmC7VxnCDMjsII1fbIFZIemLneAVh
++mjbEiafntOeI3hI8fpkBrlNyKPv2jDk/0/iZM1ScMUiuPC3aMp9pxRvPxHOf9vY
+KAkDbIEmVVE2t49uzOYHqVboGIcT544VJ5hG03ZTbJ0XoIUR4Jja0slXSQldtkYE
+FTbm66TsG9CAKj1/y6uRembsQRK4gSO2Woz4pGmwhy2Sgq0qS7+s+iUi2WQ9rBT9
+x4KPsVT9yrdnUwsLmERa
+=Z6Zd
-----END PGP SIGNATURE-----
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
index cc8f7690d88e..92c7b91b1331 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild,v 1.1 2015/06/30 20:50:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/plasma-desktop/plasma-desktop-5.3.2.ebuild,v 1.2 2015/08/01 17:15:28 johu Exp $
EAPI=5
@@ -92,7 +92,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
$(add_plasma_dep kde-cli-tools)
- $(add_plasma_dep kio-extras)
+ || ( $(add_plasma_dep kio-extras) $(add_kdeapps_dep kio-extras ) )
$(add_plasma_dep oxygen)
sys-apps/accountsservice
x11-apps/setxkbmap