diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-02-09 14:50:25 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-02-09 14:50:25 +0000 |
commit | 5d5ff20a45ecee973966205430f6e316f8816086 (patch) | |
tree | 31506814d323f6ddcf5e7c1dbe9603fd7b26b55b /kde-base | |
parent | stabilise PMS for EAPI 3 as a Portage version is available in the stable tree (diff) | |
download | historical-5d5ff20a45ecee973966205430f6e316f8816086.tar.gz historical-5d5ff20a45ecee973966205430f6e316f8816086.tar.bz2 historical-5d5ff20a45ecee973966205430f6e316f8816086.zip |
Fix blockers due to bug #304127.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/systemsettings/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/systemsettings/Manifest | 10 | ||||
-rw-r--r-- | kde-base/systemsettings/systemsettings-4.4.0.ebuild | 5 |
3 files changed, 14 insertions, 7 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 30e75d419c1f..531c7d3e71dd 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.66 2010/02/09 00:24:09 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.67 2010/02/09 14:50:25 scarabeus Exp $ + + 09 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org> + systemsettings-4.4.0.ebuild: + Fix blockers due to bug #304127. *systemsettings-4.4.0 (09 Feb 2010) diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest index 38988902b24e..6e167314f54b 100644 --- a/kde-base/systemsettings/Manifest +++ b/kde-base/systemsettings/Manifest @@ -8,13 +8,13 @@ DIST kdebase-workspace-4.4.0.tar.bz2 76893149 RMD160 e93e0517d944add5711768141da EBUILD systemsettings-4.3.3.ebuild 1908 RMD160 7752ad450e345588a5a42b54d20d378430599c9a SHA1 95a0a3edaf2573e307f5a26ebb05f72c2f3037dd SHA256 fc40b523b4560800a42de0a0191d830a09ebc2734db134c406cefcbcd9ec3c5e EBUILD systemsettings-4.3.4.ebuild 1903 RMD160 764978661e8bfe2b09a2cd1988129ad23aef5541 SHA1 5fa8cc9e51e447d7fede019f59e6d6a3e6b02ff1 SHA256 5ee257e53681af8008df77d46000b7cf47df8c99e26fbe764b15fffc4403be7c EBUILD systemsettings-4.3.5.ebuild 1905 RMD160 9f4a0fc1d727d3669654a876e173db81e41b1f36 SHA1 f1cc109eb59a9b381ce839fd0fedbde13fc2d51e SHA256 ea387ec55b94aa2894b740d480814f9bf5935e066fec0c8dbfc5f90d8a00820c -EBUILD systemsettings-4.4.0.ebuild 1902 RMD160 a68c13fea4d91236140b9b1737c653ef3b95c3c1 SHA1 2d62ffd8fb40db95f56a0b95d342db6e2cde7102 SHA256 fec12a9af1e66da6c9f171c43800e75da3930732c20f46e7b3bbb4908acd9ed0 -MISC ChangeLog 9971 RMD160 82f75d307c5b0dcdbdd0be5a6dcf7cac3a080554 SHA1 f18555d0e9272a5afcc74e14604f8783531fbca2 SHA256 0142d6c057b4d46e808449dd97f6d211cbb7dd29c73f9eb533fab25677b34934 +EBUILD systemsettings-4.4.0.ebuild 1939 RMD160 c3634e4b8895947f7ad053536cdebe346c47b101 SHA1 208a71db3564d38abe6cf741d3d774a05bae5dd3 SHA256 6cfb01983a3c23d16956d9aa6779cd448cfe3ef5162e95f0ba501688423f2377 +MISC ChangeLog 10096 RMD160 8cb3c84552713342e416d37ad59d046c5d308249 SHA1 a4d93842d276cdf41563663870f51912d6dc5d6b SHA256 3900b1b177e504f9422fcb7b7faab9ba5e703588a78fe3eaf888fb922de66080 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktwqzAACgkQ5BmOA85PVLhWjwCfR0lyf0zMAJG8ON+uhSZKyCEi -43EAoIWQNveg1YvP0d/agrtCYHkcWRBf -=NKHU +iEYEARECAAYFAktxdhEACgkQHB6c3gNBRYfRfQCfbAbuCeBsZHokXhca1zVyEgBn +fOQAn2m0Rgfe8srMJKD587WPCndljcRr +=rNlQ -----END PGP SIGNATURE----- diff --git a/kde-base/systemsettings/systemsettings-4.4.0.ebuild b/kde-base/systemsettings/systemsettings-4.4.0.ebuild index 4de71a41cc68..6e1574074bd4 100644 --- a/kde-base/systemsettings/systemsettings-4.4.0.ebuild +++ b/kde-base/systemsettings/systemsettings-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.0.ebuild,v 1.1 2010/02/09 00:24:09 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.0.ebuild,v 1.2 2010/02/09 14:50:25 scarabeus Exp $ EAPI="2" @@ -33,6 +33,7 @@ DEPEND="${COMMONDEPEND} xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} + x11-apps/setxkbmap x11-misc/xkeyboard-config " @@ -48,6 +49,8 @@ KMEXTRACTONLY=" plasma/ " +add_blocker kcontrol '<4.3.98' + src_unpack() { if use handbook; then KMEXTRA="${KMEXTRA} |