diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-10-31 19:40:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-31 19:40:52 +0000 |
| commit | 97bad34b8941cdee5787b33634ac8d7ef60bed74 (patch) | |
| tree | a7ee0d8c8882cf1b9a9221fb6bb88b4285d6f55e /xfce-extra | |
| parent | Stable on amd64 wrt bug #343453 (diff) | |
| download | gentoo-2-97bad34b8941cdee5787b33634ac8d7ef60bed74.tar.gz gentoo-2-97bad34b8941cdee5787b33634ac8d7ef60bed74.tar.bz2 gentoo-2-97bad34b8941cdee5787b33634ac8d7ef60bed74.zip | |
drop ugly has_version hack
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
| -rw-r--r-- | xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 21 | ||||
| -rw-r--r-- | xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild | 11 |
2 files changed, 3 insertions, 29 deletions
diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch deleted file mode 100644 index fbb918905654..000000000000 --- a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c ---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200 -+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300 -@@ -150,7 +150,7 @@ - config->application_map = g_hash_table_new (g_direct_hash, NULL); - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - config_item = xkl_config_item_new (); - -@@ -547,7 +547,7 @@ - if (!config) return NULL; - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - return registry; - } diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild index 49524dcfdeff..a40a29e9b379 100644 --- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild +++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.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/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.12 2010/08/05 21:51:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.13 2010/10/31 19:40:52 ssuominen Exp $ EAPI=2 inherit xfconf @@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2 >=xfce-base/xfce4-panel-4.3.20 >=xfce-base/libxfce4util-4.3.90.2 >=xfce-base/libxfcegui4-4.3.90.2 - >=x11-libs/libxklavier-4 + >=x11-libs/libxklavier-5 x11-libs/libwnck" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -27,13 +27,8 @@ DEPEND="${RDEPEND} >=gnome-base/librsvg-2.18" pkg_setup() { + PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" ) DOCS="AUTHORS ChangeLog README" XFCONF="--disable-dependency-tracking $(xfconf_use_debug)" - - if has_version ">=x11-libs/libxklavier-5"; then - PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" ) - else - PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" ) - fi } |