A few KDE 3.5 branch fixes.

Package-Manager: portage-2.1

diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 26372dedbbc46e352955f50a7a57af5cefd537fd..864a50e3394bdfad7415ecb6414cdf4f5fbdf8a5 100644 (file)
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.60 2006/06/01 17:12:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.61 2006/06/14 18:39:35 carlo Exp $
+
+*kcontrol-3.5.3-r1 (14 Jun 2006)
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +kcontrol-3.5.3-r1.ebuild:
+  A few KDE 3.5 branch fixes.
 
 *kcontrol-3.5.3 (01 Jun 2006)
 

diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 57be5fe241c1acd02cd962ed9cfdfb587af41537..f51454bd677ac248a2ec201db1d51cb99ededdbc 100644 (file)
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX configure.in.in-kdm-settings.diff 686 RMD160 e26a29248e9825c87287107e3fb2767424fead9f SHA1 d765ad762d8113812f197d847669aea5a4a271b5 SHA256 ad228d3e7841ab73fda0987c5e8a21456787a040fb884a988a31c75e7c9f087b
 MD5 64e656c39553f20b12d38eca1f8120d6 files/configure.in.in-kdm-settings.diff 686
 RMD160 e26a29248e9825c87287107e3fb2767424fead9f files/configure.in.in-kdm-settings.diff 686
@@ -13,7 +10,8 @@ AUX kdebase-3.4.2-kinfocenter-opengl-fix.patch 346 RMD160 6eda9169a469f4b4035882
 MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
 RMD160 6eda9169a469f4b403588266c359af960574be77 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
 SHA256 913a471769ed045badc10cec6d1788896b3c6a8b993e234ca74ebb7c415cb5c0 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
-DIST kdebase-3.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
+DIST kdebase-3.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA1 87b72aaf291fdb78fa9feb9acf4476d41485e486 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
+DIST kdebase-3.5-patchset-02.tar.bz2 7118 RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 SHA1 ff7a1d707c894d94d0ca36b352cbdaacd0362a10 SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
 EBUILD kcontrol-3.4.3.ebuild 1780 RMD160 40eee6722129a7e20d4c75491da8bcfbae53aa61 SHA1 f443f1544689494e02f291eb9eb20fa4b3b9d035 SHA256 7e1d2d1c17c7705a826d74b3dfcd90d82346414012c72aeeb80bc18dd4f35424
@@ -24,14 +22,18 @@ EBUILD kcontrol-3.5.2.ebuild 1708 RMD160 9def1c8dfc76cd21d47fa77734a86e8e247a498
 MD5 4d1f074cad4e33b23d9f3695f385cf2c kcontrol-3.5.2.ebuild 1708
 RMD160 9def1c8dfc76cd21d47fa77734a86e8e247a4984 kcontrol-3.5.2.ebuild 1708
 SHA256 b6953cc0ff8c89c73ddf47f1bb666c9675d949668a6ea46003ba70eb7781243d kcontrol-3.5.2.ebuild 1708
+EBUILD kcontrol-3.5.3-r1.ebuild 1782 RMD160 f2a46fe3033bac29b27fdcf7b6cbc801489f3e4f SHA1 c199c22bbbc9bdaecc442aa1495cc0a78bf675d5 SHA256 bd0e922bb590ea1b25f403bd745ae18b6dfbb76e1fd611f03ee7219be553b8e3
+MD5 30f7735ee89dccaced3af74dc8349d31 kcontrol-3.5.3-r1.ebuild 1782
+RMD160 f2a46fe3033bac29b27fdcf7b6cbc801489f3e4f kcontrol-3.5.3-r1.ebuild 1782
+SHA256 bd0e922bb590ea1b25f403bd745ae18b6dfbb76e1fd611f03ee7219be553b8e3 kcontrol-3.5.3-r1.ebuild 1782
 EBUILD kcontrol-3.5.3.ebuild 1712 RMD160 63da20ebe5f4ecd2316860a2b703292f528d53bf SHA1 84dd7cc784d69907863e42068d4fa0e9eeef723a SHA256 411dfa3ba30cccac102816e09c39f67347c9e6be6bcd24f881ac7c9f15dd4249
 MD5 2ead5bb5f2f6d2a82a207216eeed8fc3 kcontrol-3.5.3.ebuild 1712
 RMD160 63da20ebe5f4ecd2316860a2b703292f528d53bf kcontrol-3.5.3.ebuild 1712
 SHA256 411dfa3ba30cccac102816e09c39f67347c9e6be6bcd24f881ac7c9f15dd4249 kcontrol-3.5.3.ebuild 1712
-MISC ChangeLog 8017 RMD160 eec8ee244e2bbc973fd977102d06ec77ecb2d79b SHA1 59eb876b920a4bbdc12d23d40e2a4def465b0dbd SHA256 c2b220ba63c9e9221c1c294b61707b9faaf6a92ea9de8fb02b1cb9b0006891a8
-MD5 1a321321d64a970a99118b97dc61cf2d ChangeLog 8017
-RMD160 eec8ee244e2bbc973fd977102d06ec77ecb2d79b ChangeLog 8017
-SHA256 c2b220ba63c9e9221c1c294b61707b9faaf6a92ea9de8fb02b1cb9b0006891a8 ChangeLog 8017
+MISC ChangeLog 8154 RMD160 ed18aca4cce4a3e42d890b955ce520e4a9454216 SHA1 addefa4f39dc8b615ac77b2dafbcecc51ad455b1 SHA256 0dec91700337938b899877bbb4e1bf071057fe5c5d63f53a94760666fa0e0ddf
+MD5 eed03c4e96e471f839d75f240cdfaebe ChangeLog 8154
+RMD160 ed18aca4cce4a3e42d890b955ce520e4a9454216 ChangeLog 8154
+SHA256 0dec91700337938b899877bbb4e1bf071057fe5c5d63f53a94760666fa0e0ddf ChangeLog 8154
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -45,10 +47,6 @@ SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/di
 MD5 c769b4fee1a0c608ff42cda1d49b9ac2 files/digest-kcontrol-3.5.3 250
 RMD160 2453307f2d55a127e9043490c766259d59768fbb files/digest-kcontrol-3.5.3 250
 SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/digest-kcontrol-3.5.3 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEfx/zAiZjviIA2XgRAi3AAJ9Kvj2d9zAd5LlCPjYWBICJdPrAuQCgsXzw
-+GdF0hWrvbDRfAsFiY0Ql1o=
-=30Qp
------END PGP SIGNATURE-----
+MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kcontrol-3.5.3-r1 518
+RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kcontrol-3.5.3-r1 518
+SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kcontrol-3.5.3-r1 518

diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.5.3-r1 b/kde-base/kcontrol/files/digest-kcontrol-3.5.3-r1
new file mode 100644 (file)
index 0000000..cfd1854
--- /dev/null
+++ b/kde-base/kcontrol/files/digest-kcontrol-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118
+RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118
+SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194

diff --git a/kde-base/kcontrol/kcontrol-3.5.3-r1.ebuild b/kde-base/kcontrol/kcontrol-3.5.3-r1.ebuild
new file mode 100644 (file)
index 0000000..cff23a7
--- /dev/null
+++ b/kde-base/kcontrol/kcontrol-3.5.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.3-r1.ebuild,v 1.1 2006/06/14 18:39:35 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="The KDE Control Center"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl arts ieee1394 logitech-mouse opengl"
+
+DEPEND=">=media-libs/freetype-2
+       media-libs/fontconfig
+       ssl? ( dev-libs/openssl )
+       arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
+       opengl? ( virtual/opengl )
+       ieee1394? ( sys-libs/libraw1394 )
+       logitech-mouse? ( >=dev-libs/libusb-0.1.10a )"
+
+RDEPEND="${DEPEND}
+       sys-apps/usbutils
+$(deprange $PV $MAXKDEVER kde-base/kcminit)
+$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+$(deprange $PV $MAXKDEVER kde-base/kdesu)
+$(deprange $PV $MAXKDEVER kde-base/khelpcenter)
+$(deprange $PV $MAXKDEVER kde-base/khotkeys)
+$(deprange $PV $MAXKDEVER kde-base/libkonq)
+$(deprange $PV $MAXKDEVER kde-base/kicker)"
+
+KMEXTRACTONLY="kwin/kwinbindings.cpp
+           kicker/kicker/core/kickerbindings.cpp
+               kicker/taskbar/taskbarbindings.cpp
+           kdesktop/kdesktopbindings.cpp
+           klipper/klipperbindings.cpp
+           kxkb/kxkbbindings.cpp
+               kicker/taskmanager"
+
+KMEXTRA="doc/kinfocenter"
+KMCOMPILEONLY="kicker/libkicker
+       kicker/taskbar"
+KMCOPYLIB="libkonq libkonq
+       libkicker kicker/libkicker
+       libtaskbar kicker/taskbar
+       libtaskmanager kicker/taskmanager"
+
+src_compile() {
+       myconf="$myconf `use_with ssl` `use_with arts` `use_with opengl gl`
+               `use_with ieee1394 libraw1394` `use_with logitech-mouse libusb`
+                       --with-usbids=/usr/share/misc/usb.ids"
+       kde-meta_src_compile
+}

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 4e14c24dc125a7567f4650d9877cb8fd14575925..e80ced75a742589d9d58db22910bb8d9c503cbaa 100644 (file)
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -110,6 +110,7 @@ DIST kdebase-3.3.2.tar.bz2 19995043 RMD160 a57e2fd6f7810d4a82e18cf5b1afe59e39298
 DIST kdebase-3.4.3-kubuntu-hal.patch.gz 8441 RMD160 9b7fe6198e8d01205ab37f69a72520a233013906 SHA1 40cfca460d1c4880e63901e7dbd2121db57c26c3 SHA256 9703cf0727fd54a0bf6d404858e44d2d63970ce5a01aa0502e82f3ff842a9dc7
 DIST kdebase-3.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA1 87b72aaf291fdb78fa9feb9acf4476d41485e486 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
 DIST kdebase-3.5-patchset-01.tar.bz2 5552 RMD160 196f2f57924ccab4109061794d09f579917f4ed1 SHA1 6cf289b7d30f2b7899aac092989cccca5992cecf SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0
+DIST kdebase-3.5-patchset-02.tar.bz2 7118 RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 SHA1 ff7a1d707c894d94d0ca36b352cbdaacd0362a10 SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b
 DIST kdebase-3.5.2-patchset.tar.bz2 5578 RMD160 85656629b35a7aff41e96b1ffa464a38a377c281 SHA1 adfaf7e74a88ca041ddf82a3f81028f82155927c SHA256 47db65bda783c05d8ede7ba1d598f0fcf92ab365ae2ba44475352eec5c3ba701
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
@@ -141,14 +142,18 @@ EBUILD kdebase-3.5.2-r2.ebuild 5329 RMD160 ed77eb5b1244a09491d460ef7d24cf7c592a4
 MD5 2ba0add3d7484b16f7a489f893d85416 kdebase-3.5.2-r2.ebuild 5329
 RMD160 ed77eb5b1244a09491d460ef7d24cf7c592a44c3 kdebase-3.5.2-r2.ebuild 5329
 SHA256 df570c4d88d4ec31c0a86c889ea466dfd95d5c7900276be00a52b7faa9caa7d6 kdebase-3.5.2-r2.ebuild 5329
+EBUILD kdebase-3.5.3-r1.ebuild 5233 RMD160 585aea43080d9f5887a20916dae57e835a7504fe SHA1 8e97fa1a848468019356b7ca7d59850e11a5eef0 SHA256 1357a2ce8870d09a541325f4e5bbd11c8752f99ca2871921ee48d368a71ef578
+MD5 7087bcd6c8effbf29ab1220e43e0480f kdebase-3.5.3-r1.ebuild 5233
+RMD160 585aea43080d9f5887a20916dae57e835a7504fe kdebase-3.5.3-r1.ebuild 5233
+SHA256 1357a2ce8870d09a541325f4e5bbd11c8752f99ca2871921ee48d368a71ef578 kdebase-3.5.3-r1.ebuild 5233
 EBUILD kdebase-3.5.3.ebuild 5133 RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 SHA1 e89fcd27ee1c35136609208a4c64fe6da008846f SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7
 MD5 968bdb01893c00eac99aa022f3238c08 kdebase-3.5.3.ebuild 5133
 RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 kdebase-3.5.3.ebuild 5133
 SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7 kdebase-3.5.3.ebuild 5133
-MISC ChangeLog 49120 RMD160 19bf13cb58958ea846443413d94de28cc48e181c SHA1 6df8d1010f026e322056ee2b7924953cc7e2eff4 SHA256 d07961716b1598334edff89f3f12fa6c4ef9e08da7c316ac80e6b5c6c9465e3c
-MD5 989ab7f5b0e7d751a177983cf819482d ChangeLog 49120
-RMD160 19bf13cb58958ea846443413d94de28cc48e181c ChangeLog 49120
-SHA256 d07961716b1598334edff89f3f12fa6c4ef9e08da7c316ac80e6b5c6c9465e3c ChangeLog 49120
+MISC ChangeLog 49367 RMD160 42349357490683d5a9229eb445fbbfb049b760e7 SHA1 a50e7b39913167722b4f9d1e7b8523db899e8d15 SHA256 9b9e3173ce863a2d824936fb621ef322e448f64f15bec55c52890e1e7ece8fec
+MD5 5b99a1582c4d08ab9ab4e256f18c465f ChangeLog 49367
+RMD160 42349357490683d5a9229eb445fbbfb049b760e7 ChangeLog 49367
+SHA256 9b9e3173ce863a2d824936fb621ef322e448f64f15bec55c52890e1e7ece8fec ChangeLog 49367
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -177,3 +182,6 @@ SHA256 597ab4944116d710976429afa6318b5eb3243417225fe3db430c63d2568dfcba files/di
 MD5 9ac2db0ffd1dd385ceaba456f341146f files/digest-kdebase-3.5.3 518
 RMD160 c47af94094e7e7f03e4c49271c2f6e5c538d332d files/digest-kdebase-3.5.3 518
 SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/digest-kdebase-3.5.3 518
+MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdebase-3.5.3-r1 518
+RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdebase-3.5.3-r1 518
+SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdebase-3.5.3-r1 518