Moved 4.6.4 to main tree

(Portage version: 2.1.10/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

2 files changed, 13 insertions, 49 deletions

diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index 70fb9e3767b..01dfd56e139 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -2,8 +2,6 @@
 Hash: SHA512
 
 DIST kde-workspace-4.6.80.tar.bz2 20151396 RMD160 c01926ccd552fbe27abf3aae07c5b19a01841f3d SHA1 99bf68ee90c4cfa3568527a55c7c68d4247d9b13 SHA256 dc9894be42be86d60af857bdf66ae7d77ac48d44a64af48bb84ed0b8d79d3c16
-DIST kdebase-workspace-4.6.4.tar.bz2 69240174 RMD160 1701edb3814056b119acf8b8fc64211127c8160b SHA1 303f4881b3c87d1bdbdfc8c4b5fd5a2492191d87 SHA256 c19f65daeb778e3304c284a02d83162f870e03094cbfc5b63533ad872823c80f
-EBUILD libplasmaclock-4.6.4.ebuild 632 RMD160 f5ea9c20a5b3cf6df5c35d0e82cb04ced7ed75bc SHA1 d1879729bf66b85460b422018001903f2b429190 SHA256 29acdbca6745f398e08f1c8c5c8b140643381b81fb921a7cc237a291be1e94b6
 EBUILD libplasmaclock-4.6.49.9999.ebuild 580 RMD160 99b8c040c1d4e79bfda87ae1389862f807e67290 SHA1 82f7a5cfb9b88d5124d5ad2b64e6408ea62b4cdb SHA256 7748b7d9a64115124bc71d2bfb8fc9a631ebcc49da5b4458497f56198d387409
 EBUILD libplasmaclock-4.6.80.ebuild 611 RMD160 9a87d5d25a322e186f8e76bbd8887a9dea4bf3b0 SHA1 0274f1302b34343350cdb9966867f12a667710d0 SHA256 1e8e0c20a0f1a413025ef573ae01cd3b7719dd6d6c204809ef11a3feed957b6d
 EBUILD libplasmaclock-9999.ebuild 576 RMD160 d0f94abd00a3e793b95f73998b72f742d34d638b SHA1 90fff4e6dca59ba722313ac6a6e10db014b21310 SHA256 f14547988d1157890f65bf1093d8ef3ccb44d819f46877fb0b49fef23e50777e
@@ -11,17 +9,17 @@ MISC metadata.xml 247 RMD160 abad3cd3a5dedcc08147ce6e5335695560a5e6ba SHA1 a7dc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN7Xm0AAoJELHSF2kinlg4LvwP/2flIXBL6fMAftxi/pxQHjIT
-mUH/6To7s2Gqjxl3rUaIfDb3ydpZS2LhfEiJ09vnJxR/wLGcWOylElNLjIrs2R9l
-y7W0nXUibXQRETUN1L+3P/9++cYEKZtTGKj7nL5RCYv09MPo59RM007xgQrkXS8Z
-lIg8mcA2Q6lPHlGKk48JYQ/sIurkrNO8JAssMijyynT9833HxuCJIV+TMHA2HCQB
-K2qfhRKva0Ry5nvndnukveI/j9N0YGCgM0M8qdn5/5kFcWxoM2faxDisVCZoLhs8
-7QT1vZXc23rhBXABV+DZpfsRjSy+xEZvJS5MJlAFVyHrcy7e82oTF5o8iGry0C7e
-B9BAQ2T6XL6aY3hrts0zh/QUfPmOgdx9bLL2At45XSs1mEKXZXEG8gfVB1uzo6pe
-CkUzFDPHfo9J5TuY7lV8xNcxfM2x3k6c3TF5G07AlRS1d/XEqTus7uoPp5dg2hmv
-Grqas22BAbS1/r/wJeLkjf44Atr559da9oFbIkYDTRqIzArxHfJsdy1e3xrz/LQw
-Z4v8waqNDgrYlVExZqH9d97532yd8anTxdb3ndRb+bVh0LZRGfTvs72k85W0EAnC
-k4b1xgW+61HYUb/KJvDve0uioeycQiPxIn2G+nz+YG0wmWHEZrnpRlNOql8VRuKk
-Ov648kG4Ci1DrhhL0ssr
-=JZoj
+iQIcBAEBCgAGBQJN8l60AAoJENwGBM22xffeR4cP/10VMg66vui4VnoqOgILph3I
+DTcNRG7//X+Pjkc1Jlf/VmWHBOL8SVvfnE0Osuh/XbWQEaMNmuavLEnBO5P8V6iJ
+k7LFnbu2dt9G7mu4AqCyMxr38LwFIbQOg3fvsl8WOqTIsijxaE3zBhdg180r2ZmA
+SzM00s/jUdf+oXw0QWpp4IqKF5vADagRbsPnwTd6KMoCs8I55CCGzSFnCs9+62xe
+uMA+JFVoXY+5T0YtWMAaBNL2GwfQIpjzxBd7kPMwmhPGav8Txmb5w/bi7/qXNoQu
+qN5d/qWBS9MAmktb9blH2rsF2mhFL2/Zdn4G7GwQo9gn2bILE78D7bWjPtW4wiUc
+Kw9h0U6KtCsJie1YVfE41oIaW0XaLMkr4FVlBo3lwdSDeSpqyWO2DXx4RCJnf7hP
+Z2rAUF3/ySWmIznrIL891t4X/CUmLysIqZYjEVmGhMD35P3lip2M5BBkaYuqCxNO
+Mc23sCGl7ZuKOIw76lElUNUT13tadbthxsc34Qkun2h3+2IZ/ubVm7GRW7UW8aWb
+5+qL/GBRhY9vOYxhwhN8lGJnkg0oqTBGj1UYNUNCGcRRCNzA5teIdg8tuVlkvMMZ
+9a+IczU7NjzzJKhkocOU2K1a3NaALbUoSJUXALJzCqtrMzQJ/HVFaJYYt88QKOYa
+Li1TFp9G2Ib3PwGJdlg/
+=sRlD
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.6.4.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.6.4.ebuild
deleted file mode 100644
index 4e4db9dc9ac..00000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.6.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/plasmaclock"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +holidays"
-
-DEPEND="
-	$(add_kdebase_dep kephal)
-	holidays? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
-	libs/kephal/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with holidays KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}