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 | 881970993869cb3393219664624efa5e99b95ff8 (patch) | |
| tree | 04965f3f04450106ae3a79fd353559129a462840 /xfce-extra | |
| parent | Stable on amd64 wrt bug #343453 (diff) | |
| download | historical-881970993869cb3393219664624efa5e99b95ff8.tar.gz historical-881970993869cb3393219664624efa5e99b95ff8.tar.bz2 historical-881970993869cb3393219664624efa5e99b95ff8.zip | |
drop ugly has_version hack
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
3 files changed, 4 insertions, 31 deletions
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest index 6c2370ee7226..27a7a4169bc2 100644 --- a/xfce-extra/xfce4-xkb-plugin/Manifest +++ b/xfce-extra/xfce4-xkb-plugin/Manifest @@ -1,8 +1,7 @@ AUX xfce4-xkb-plugin-0.5.3.3-libxfce4ui.patch 7321 RMD160 989cfde65312d798eb2e5e1f450fa44b54401d63 SHA1 9ac92cda43c5fbafdc2a6d3de68e568ba29edfb1 SHA256 2dd615c7f9e516dbfa14652c4eca0db5c93bc8e107dd83cfe19e9980972c21e7 AUX xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch 1072 RMD160 c2f2f4742c0096fa4e95884d521f48bc3567d0e2 SHA1 bef99ec230a9bc0d05ce63ca6ffc896360427988 SHA256 3e0df3416fd3fdc727194d1b4a97ac176a1e1d63acdb41e505147e0fac46d899 -AUX xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 843 RMD160 32c11dbbec33df267185f4b2f48855ec42b880ea SHA1 82490cc65d589ead5697f0c1bb8eba62a7be92f2 SHA256 d35deb49f42e081700542dd7bac180b8b17c58eb83a2b0f5682d54c07e96de7d DIST xfce4-xkb-plugin-0.5.3.3.tar.gz 768414 RMD160 c4f691f0712c105ca37e4af4b311b066cceb3eec SHA1 5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7 SHA256 97b257ae15feefb9a32ef1d34d696797e2555862e19cc46bc31d84379c531379 -EBUILD xfce4-xkb-plugin-0.5.3.3-r1.ebuild 1171 RMD160 9030632a806a6544b49376bb27872384a6be3ddd SHA1 554dab476439bccdd6994d5c119ed15c88fe8ac7 SHA256 a893c5ea27be1140bda37c91a9cde3fa3b553a44ba0bd1dab85cfbb2cede442d +EBUILD xfce4-xkb-plugin-0.5.3.3-r1.ebuild 1059 RMD160 5365625dbad0061b91b8e9463506c5fcbee9700c SHA1 ff674894efc420b0e04e8ce36ac4993e99ec7d93 SHA256 f74ea5d3427d766014984bacdaa0abb965ee24dadff3a05e08d203db18036202 EBUILD xfce4-xkb-plugin-0.5.3.3-r9.ebuild 1119 RMD160 d21c6666d02b1ff549b809df154566c42ecb317c SHA1 9265235170fb59e66d10b9cc5f2a748b5702d139 SHA256 ca7aab6dd74af3ee13447753daf6a9562e635abbc16b45b2fce77c5dc43d847f MISC ChangeLog 2886 RMD160 c67cd2a629d84d38150c11ea1fb25d964e5fb8ad SHA1 b9d4232024a1cf0d500904eddb213f2a55c91fe4 SHA256 7b698a39a3f63dcfbfca0220b3706fc664de6c9799be5a90cedc1237e0026dfb MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 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 } |