Remove virtual/X11 dependency. Use newer patch set.

Package-Manager: portage-2.1.2.5

4 files changed, 57 insertions, 15 deletions

diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index ce51be9ea1fe..c8641739ae63 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.80 2007/02/04 03:09:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.81 2007/05/01 11:58:15 carlo Exp $
+
+*kxkb-3.5.6-r1 (01 May 2007)
+
+  01 May 2007; Carsten Lohrke <carlo@gentoo.org> +kxkb-3.5.6-r1.ebuild:
+  Remove virtual/X11 dependency. Use newer patch set.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kxkb-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index 8d1ab983ca57..443b21745e64 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,21 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdebase-3.5-patchset-01.tar.bz2 5552 RMD160 196f2f57924ccab4109061794d09f579917f4ed1 SHA1 6cf289b7d30f2b7899aac092989cccca5992cecf SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0
+DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
 EBUILD kxkb-3.5.5.ebuild 1078 RMD160 e74ac12b7f97ec6c2d6848a31fbdb69ea5ee4574 SHA1 d1550694eec9cd74449acd7a00ddb0c3a801148c SHA256 6ed4f64f2cf1922a47cf931d296fd3f2a2529339ec0a453cf736a098ead33446
 MD5 575a20609a723a27c2c1e04f2b79f5fe kxkb-3.5.5.ebuild 1078
 RMD160 e74ac12b7f97ec6c2d6848a31fbdb69ea5ee4574 kxkb-3.5.5.ebuild 1078
 SHA256 6ed4f64f2cf1922a47cf931d296fd3f2a2529339ec0a453cf736a098ead33446 kxkb-3.5.5.ebuild 1078
+EBUILD kxkb-3.5.6-r1.ebuild 1004 RMD160 f5b063529a7af9263839e5242d0ac75df815dca9 SHA1 4e0214526c421ca9c193ac555b546d30d19259d6 SHA256 fc16c480869816a0de9b34047bf8c7841dc0268be13e7aac94024b70d7a35fec
+MD5 35ca9e9d540f26220680768af86d3fc0 kxkb-3.5.6-r1.ebuild 1004
+RMD160 f5b063529a7af9263839e5242d0ac75df815dca9 kxkb-3.5.6-r1.ebuild 1004
+SHA256 fc16c480869816a0de9b34047bf8c7841dc0268be13e7aac94024b70d7a35fec kxkb-3.5.6-r1.ebuild 1004
 EBUILD kxkb-3.5.6.ebuild 1088 RMD160 714b86858568c0e18ff8c8b8a281687f71b7c4ee SHA1 a1e2721f0428c7c28ec9629a92dd87c4ccb2870f SHA256 66ab048664954fd22225d8681edb4431053140bcaad573ac252d6490e475e5a7
 MD5 5369a151fee2187b71ed00c4c09983ec kxkb-3.5.6.ebuild 1088
 RMD160 714b86858568c0e18ff8c8b8a281687f71b7c4ee kxkb-3.5.6.ebuild 1088
 SHA256 66ab048664954fd22225d8681edb4431053140bcaad573ac252d6490e475e5a7 kxkb-3.5.6.ebuild 1088
-MISC ChangeLog 9932 RMD160 818206a9a60af3fd5933aa429661f806bbfe9a70 SHA1 1e0e3e2706f42cbe1f5ff8245653cd1e5d41a3ab SHA256 e0cc90883db6491902c606c9fc44e642ce3aaa834a832d9fcb8b46f255e3ee99
-MD5 9bb74d5716967c430eb23f990df7e29b ChangeLog 9932
-RMD160 818206a9a60af3fd5933aa429661f806bbfe9a70 ChangeLog 9932
-SHA256 e0cc90883db6491902c606c9fc44e642ce3aaa834a832d9fcb8b46f255e3ee99 ChangeLog 9932
+MISC ChangeLog 10085 RMD160 4c2d3c1d04d9f62e66ef54fa395b24a875b000ae SHA1 96adb56eb23d3d4cbb09a9332fbab89240a876df SHA256 9230cfa2a1bbed5cd8b946a04a9b7f1e27675a6f366b44ade1c0550bd4c570a5
+MD5 01e10192470b3ab07d187e36cf0488d4 ChangeLog 10085
+RMD160 4c2d3c1d04d9f62e66ef54fa395b24a875b000ae ChangeLog 10085
+SHA256 9230cfa2a1bbed5cd8b946a04a9b7f1e27675a6f366b44ade1c0550bd4c570a5 ChangeLog 10085
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -26,10 +28,6 @@ SHA256 b1edb4c9950fd20e23ad9a863efcae587b27bdf82a2a6229cdec0a2030e171d3 files/di
 MD5 9a4564f107120b439c40dd3770da83bd files/digest-kxkb-3.5.6 518
 RMD160 dad00f11128fb090ff4c821d5f6175dd140dcb34 files/digest-kxkb-3.5.6 518
 SHA256 835f54dac12ccfb7b99b42206c70e5dc26278178e1b654373885638cf3492b64 files/digest-kxkb-3.5.6 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxU5XAiZjviIA2XgRAvPSAJ4hRWf/MG6xZqeve3e/US/vjZmGcwCgn93p
-XATi1vQQOZW34FWw4tb+mII=
-=Gh16
------END PGP SIGNATURE-----
+MD5 e60a2e9e08c74ca4691800cc9baed2ed files/digest-kxkb-3.5.6-r1 518
+RMD160 1aebc0611e61e808bc89e7fd2c2a6b3699f2f2a8 files/digest-kxkb-3.5.6-r1 518
+SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/digest-kxkb-3.5.6-r1 518
diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.6-r1 b/kde-base/kxkb/files/digest-kxkb-3.5.6-r1
new file mode 100644
index 000000000000..1d41d209c152
--- /dev/null
+++ b/kde-base/kxkb/files/digest-kxkb-3.5.6-r1
@@ -0,0 +1,6 @@
+MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502
+RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502
+SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502
+MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599
+RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599
+SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599
diff --git a/kde-base/kxkb/kxkb-3.5.6-r1.ebuild b/kde-base/kxkb/kxkb-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..31fc0f49af68
--- /dev/null
+++ b/kde-base/kxkb/kxkb-3.5.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.6-r1.ebuild,v 1.1 2007/05/01 11:58:15 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
+
+DESCRIPTION="Kxkb is a KControl module and frontend for X11 keyboard extension, allowing the user to configure and switch between keyboard mappings."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility"
+
+RDEPEND="${RDEPEND}
+		|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+		x11-apps/setxkbmap"
+
+KMEXTRACTONLY="${KMEXTRACTONLY}
+	kdm/configure.in.in"
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	epatch ${WORKDIR}/patches/kdm-3.5-noimake.patch
+
+	# Remove reference to kde.desktop in AC_OUTPUT to allow building with
+	# autoconf 2.59d
+	sed -i -e '/kde.desktop/ s:^:#:g' "${S}/kdm/configure.in.in"
+}
+