diff options
author | 2005-12-19 19:10:40 +0000 | |
---|---|---|
committer | 2005-12-19 19:10:40 +0000 | |
commit | 6ff6c55130b5a80d99173e2d194aa36ef58a90e2 (patch) | |
tree | 54c88733254d57688894343bbfede6217110407d /kde-base | |
parent | Switch to #include_next rather than copying for regex.h (diff) | |
download | historical-6ff6c55130b5a80d99173e2d194aa36ef58a90e2.tar.gz historical-6ff6c55130b5a80d99173e2d194aa36ef58a90e2.tar.bz2 historical-6ff6c55130b5a80d99173e2d194aa36ef58a90e2.zip |
Add runtime dependencies on xkbdata and setxkb for modularx.
Package-Manager: portage-2.1_pre1
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.0-r1.ebuild | 8 | ||||
-rw-r--r-- | kde-base/kxkb/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kxkb/kxkb-3.5.0.ebuild | 8 |
4 files changed, 22 insertions, 5 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 5a11a9668fdb..48adfc894900 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.244 2005/12/17 20:36:32 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.245 2005/12/19 19:10:39 flameeyes Exp $ + + 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + kdebase-3.5.0-r1.ebuild: + Add runtime dependencies on xkbdata and setxkb for modularx. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> kdebase-3.5.0-r1.ebuild: Added ~ppc64 diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild index 81fd5ab24a0f..a402bbc6b482 100644 --- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild +++ b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.4 2005/12/17 20:36:32 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.5 2005/12/19 19:10:40 flameeyes Exp $ inherit kde-dist eutils flag-o-matic @@ -31,7 +31,11 @@ DEPEND="arts? ( ~kde-base/arts-${PV} ) RDEPEND="${DEPEND} java? ( >=virtual/jre-1.4 ) - virtual/eject" + virtual/eject + || ( ( + x11-misc/xkbdata + x11-apps/setxkbmap + ) virtual/x11 )" DEPEND="${DEPEND} dev-util/pkgconfig" diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog index 9c6b0b4e49e1..ff34815ba7bc 100644 --- a/kde-base/kxkb/ChangeLog +++ b/kde-base/kxkb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kxkb # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.36 2005/12/17 10:26:26 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.37 2005/12/19 19:07:01 flameeyes Exp $ + + 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> kxkb-3.5.0.ebuild: + Add runtime dependencies on xkbdata and setxkb for modularx. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> kxkb-3.5.0.ebuild: Added ~ppc64 diff --git a/kde-base/kxkb/kxkb-3.5.0.ebuild b/kde-base/kxkb/kxkb-3.5.0.ebuild index dd0d8ca6067c..63d7f3c731ed 100644 --- a/kde-base/kxkb/kxkb-3.5.0.ebuild +++ b/kde-base/kxkb/kxkb-3.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.6 2005/12/17 10:26:26 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.7 2005/12/19 19:07:01 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV @@ -11,5 +11,11 @@ DESCRIPTION="Kicker applet for management of X keymaps" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" +RDEPEND="${RDEPEND} + || ( ( + x11-misc/xkbdata + x11-apps/setxkbmap + ) virtual/x11 )" + PATCHES="${FILESDIR}/${P}-modularxkb.patch" |