summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-05-05 16:14:52 +0000
committerRémi Cardona <remi@gentoo.org>2009-05-05 16:14:52 +0000
commit6d8174d7615e2656980f83fe345d6da77e43de85 (patch)
treeb6882a610c465db4df01fbeb273f484f546a97dd /x11-libs
parentMove to EAPI2 and remove USE doc which didn't do anything since the documenta... (diff)
downloadgentoo-2-6d8174d7615e2656980f83fe345d6da77e43de85.tar.gz
gentoo-2-6d8174d7615e2656980f83fe345d6da77e43de85.tar.bz2
gentoo-2-6d8174d7615e2656980f83fe345d6da77e43de85.zip
x11-libs/libxklavier: drop x11-misc/xkbdata support (see bug #196650)
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libxklavier/ChangeLog8
-rw-r--r--x11-libs/libxklavier/libxklavier-3.3.ebuild6
-rw-r--r--x11-libs/libxklavier/libxklavier-3.6.ebuild4
-rw-r--r--x11-libs/libxklavier/libxklavier-3.8.ebuild6
-rw-r--r--x11-libs/libxklavier/libxklavier-3.9.ebuild6
5 files changed, 15 insertions, 15 deletions
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 1539eaf67767..dc307f0a3a6b 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libxklavier
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.126 2009/04/28 11:50:35 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.127 2009/05/05 16:14:52 remi Exp $
+
+ 05 May 2009; Rémi Cardona <remi@gentoo.org> libxklavier-3.3.ebuild,
+ libxklavier-3.6.ebuild, libxklavier-3.8.ebuild, libxklavier-3.9.ebuild:
+ drop x11-misc/xkbdata support (see bug #196650)
28 Apr 2009; Raúl Porcel <armin76@gentoo.org> libxklavier-3.6.ebuild:
arm/sh stable
diff --git a/x11-libs/libxklavier/libxklavier-3.3.ebuild b/x11-libs/libxklavier/libxklavier-3.3.ebuild
index 18c929a51888..093118af50db 100644
--- a/x11-libs/libxklavier/libxklavier-3.3.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.3.ebuild,v 1.8 2008/04/13 22:06:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.3.ebuild,v 1.9 2009/05/05 16:14:52 remi Exp $
inherit eutils
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
IUSE="doc"
-RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+RDEPEND="x11-misc/xkeyboard-config
x11-libs/libX11
x11-apps/xkbcomp
x11-libs/libxkbfile
diff --git a/x11-libs/libxklavier/libxklavier-3.6.ebuild b/x11-libs/libxklavier/libxklavier-3.6.ebuild
index aa7b7058760c..3e964612b45a 100644
--- a/x11-libs/libxklavier/libxklavier-3.6.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.6.ebuild,v 1.9 2009/04/28 11:50:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.6.ebuild,v 1.10 2009/05/05 16:14:52 remi Exp $
inherit eutils
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
IUSE="doc"
-RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+RDEPEND="x11-misc/xkeyboard-config
x11-libs/libX11
x11-apps/xkbcomp
x11-libs/libxkbfile
diff --git a/x11-libs/libxklavier/libxklavier-3.8.ebuild b/x11-libs/libxklavier/libxklavier-3.8.ebuild
index 3a471e82f303..177fa388bddc 100644
--- a/x11-libs/libxklavier/libxklavier-3.8.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.8 2009/04/12 21:26:27 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.9 2009/05/05 16:14:52 remi Exp $
inherit autotools eutils
@@ -13,9 +13,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
IUSE="doc"
-RDEPEND="|| (
- x11-misc/xkeyboard-config
- x11-misc/xkbdata )
+RDEPEND="x11-misc/xkeyboard-config
x11-libs/libX11
>=x11-libs/libXi-1.1.3
x11-apps/xkbcomp
diff --git a/x11-libs/libxklavier/libxklavier-3.9.ebuild b/x11-libs/libxklavier/libxklavier-3.9.ebuild
index 860d03d01b96..94430407f05e 100644
--- a/x11-libs/libxklavier/libxklavier-3.9.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.9.ebuild,v 1.1 2009/04/13 10:50:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.9.ebuild,v 1.2 2009/05/05 16:14:52 remi Exp $
inherit eutils
@@ -13,9 +13,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc"
-RDEPEND="|| (
- x11-misc/xkeyboard-config
- x11-misc/xkbdata )
+RDEPEND="x11-misc/xkeyboard-config
x11-libs/libX11
>=x11-libs/libXi-1.1.3
x11-apps/xkbcomp