summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-19 19:48:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-19 19:48:10 +0000
commitafb34e915955f99ad5823ee1ef550c7234fe0fd3 (patch)
tree49844b431a8c848386cfa99ff2b92dc309df1ebb /xfce-base
parentx86 stable, bug #304829 (diff)
downloadhistorical-afb34e915955f99ad5823ee1ef550c7234fe0fd3.tar.gz
historical-afb34e915955f99ad5823ee1ef550c7234fe0fd3.tar.bz2
historical-afb34e915955f99ad5823ee1ef550c7234fe0fd3.zip
amd64 stable wrt #305657
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/exo/ChangeLog5
-rw-r--r--xfce-base/exo/exo-0.3.102-r1.ebuild61
-rw-r--r--xfce-base/exo/exo-0.3.106.ebuild4
-rw-r--r--xfce-base/exo/files/exo-0.3.101-iocharset.patch79
-rw-r--r--xfce-base/exo/files/exo-0.3.102-eject.patch210
-rw-r--r--xfce-base/xfce4-panel/ChangeLog8
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild6
-rw-r--r--xfce-base/xfce4-session/ChangeLog6
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild4
-rw-r--r--xfce-base/xfconf/ChangeLog6
-rw-r--r--xfce-base/xfconf/xfconf-4.6.1-r1.ebuild4
11 files changed, 29 insertions, 364 deletions
diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
index 33d6a3cd66f0..fb85b5924268 100644
--- a/xfce-base/exo/ChangeLog
+++ b/xfce-base/exo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for xfce-base/exo
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.23 2010/01/23 17:30:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.24 2010/02/19 19:44:54 ssuominen Exp $
+
+ 19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> exo-0.3.106.ebuild:
+ amd64 stable wrt #305657
*exo-0.3.106 (23 Jan 2010)
diff --git a/xfce-base/exo/exo-0.3.102-r1.ebuild b/xfce-base/exo/exo-0.3.102-r1.ebuild
deleted file mode 100644
index bcb141b46f57..000000000000
--- a/xfce-base/exo/exo-0.3.102-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.102-r1.ebuild,v 1.12 2009/10/06 21:31:14 ssuominen Exp $
-
-EAPI=2
-inherit xfconf python multilib
-
-DESCRIPTION="Extensions, widgets and framework library with session management support"
-# Can't find a better homepage
-HOMEPAGE="http://www.xfce.org"
-SRC_URI="mirror://xfce/src/xfce/exo/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug hal libnotify python"
-
-RDEPEND=">=dev-lang/perl-5.6
- dev-perl/URI
- >=dev-libs/glib-2.6:2
- >=x11-libs/gtk+-2.6:2
- >=xfce-base/libxfce4util-4.6.1
- libnotify? ( x11-libs/libnotify )
- hal? ( sys-apps/hal )
- python? ( dev-python/pygtk )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig"
-
-pkg_setup() {
- XFCONF="--disable-static
- $(use_enable hal)
- $(use_enable libnotify notifications)
- $(use_enable python)"
- DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
- PATCHES=( "${FILESDIR}/exo-0.3.101-iocharset.patch"
- "${FILESDIR}/${P}-eject.patch" )
-}
-
-src_prepare() {
- xfconf_src_prepare
- rm py-compile
- touch py-compile
- chmod +x py-compile
-
- epatch "${FILESDIR}"/${PN}-0.3.4-interix.patch
- if [[ ${CHOST} == *-interix* ]] ; then
- # configure detects getmntent, which is false!
- export ac_cv_func_getmntent=no
- fi
-}
-
-pkg_postinst() {
- xfconf_pkg_postinst
- python_mod_optimize "$(python_get_sitedir)"
-}
-
-pkg_postrm() {
- xfconf_pkg_postrm
- python_mod_cleanup "$(python_get_sitedir)"
-}
diff --git a/xfce-base/exo/exo-0.3.106.ebuild b/xfce-base/exo/exo-0.3.106.ebuild
index 7b6c7d99c7b5..de156786eb53 100644
--- a/xfce-base/exo/exo-0.3.106.ebuild
+++ b/xfce-base/exo/exo-0.3.106.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-base/exo/exo-0.3.106.ebuild,v 1.1 2010/01/23 17:30:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.106.ebuild,v 1.2 2010/02/19 19:44:54 ssuominen Exp $
EAPI=2
inherit xfconf python multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/exo/0.3/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="debug hal libnotify python"
RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/exo/files/exo-0.3.101-iocharset.patch b/xfce-base/exo/files/exo-0.3.101-iocharset.patch
deleted file mode 100644
index a667f116652b..000000000000
--- a/xfce-base/exo/files/exo-0.3.101-iocharset.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
-index 791a536..4b130c3 100644
---- a/exo-mount/exo-mount-hal.c
-+++ b/exo-mount/exo-mount-hal.c
-@@ -34,6 +34,8 @@
- #include <unistd.h>
- #endif
-
-+#include <langinfo.h>
-+
- #include <libhal-storage.h>
-
- #include <exo-hal/exo-hal.h>
-@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
-
-
- /**
-+ * exo_mount_hal_iocharset:
-+ *
-+ * Determines the preferred iocharset for filesystems
-+ * that support it.
-+ *
-+ * Return value: iocharset string or %NULL if none.
-+ **/
-+static const gchar*
-+exo_mount_hal_iocharset ()
-+{
-+ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
-+ if (cs != NULL)
-+ return cs;
-+
-+ const char* codeset = nl_langinfo (CODESET);
-+ if (codeset && !strcmp (codeset, "UTF-8"))
-+ return "utf8";
-+
-+ return NULL;
-+}
-+
-+
-+
-+/**
- * exo_mount_hal_device_mount:
- * @device : an #ExoMountHalDevice.
- * @error : return location for errors or %NULL.
-@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
- /* however this one is FreeBSD specific */
- options[n++] = g_strdup ("longnames");
- }
-+ else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
-+ {
-+ const gchar* iocharset = exo_mount_hal_iocharset();
-+ if (iocharset != NULL)
-+ options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
-+ }
- }
- }
-
-diff --git a/exo-mount/main.c b/exo-mount/main.c
-index 80eae1d..f442019 100644
---- a/exo-mount/main.c
-+++ b/exo-mount/main.c
-@@ -39,6 +39,8 @@
- #include <string.h>
- #endif
-
-+#include <locale.h>
-+
- #include <glib/gstdio.h>
-
- #include <exo-hal/exo-hal.h>
-@@ -97,6 +99,8 @@ main (int argc, char **argv)
- /* initialize the i18n support */
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-+ setlocale(LC_CTYPE, "");
-+
- /* initialize GTK+ */
- if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
- {
diff --git a/xfce-base/exo/files/exo-0.3.102-eject.patch b/xfce-base/exo/files/exo-0.3.102-eject.patch
deleted file mode 100644
index ed9cd537b0b6..000000000000
--- a/xfce-base/exo/files/exo-0.3.102-eject.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=2968
-https://bugs.gentoo.org/199615
-
-diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
-index 791a536..4084719 100644
---- a/exo-mount/exo-mount-hal.c
-+++ b/exo-mount/exo-mount-hal.c
-@@ -145,6 +145,42 @@ exo_mount_hal_propagate_error (GError **error,
- }
-
-
-+static gboolean
-+string_in_list(gchar * const *haystack, const gchar *needle)
-+{
-+ gint n;
-+
-+ if (!haystack)
-+ return FALSE;
-+
-+ for (n=0; haystack[n]; ++n) {
-+ if (!strcmp (haystack[n], needle))
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+
-+static gboolean
-+device_has_interface(const gchar *udi, const gchar *iface,
-+ DBusError *derror)
-+{
-+ gboolean result;
-+ gchar **interfaces;
-+
-+ /* determine the info.interfaces property of the device */
-+ interfaces = libhal_device_get_property_strlist (hal_context, udi,
-+ "info.interfaces", derror);
-+
-+ /* check for the interface we need */
-+ result = string_in_list(interfaces, iface);
-+ libhal_free_string_array(interfaces);
-+
-+ return result;
-+}
-+
-+
-+
-
- /**
- * exo_mount_hal_device_from_udi:
-@@ -158,18 +194,15 @@ exo_mount_hal_propagate_error (GError **error,
- * or %NULL in case of an error.
- **/
- ExoMountHalDevice*
--exo_mount_hal_device_from_udi (const gchar *udi,
-+exo_mount_hal_device_from_udi (const gchar *in_udi,
- GError **error)
- {
- ExoMountHalDevice *device = NULL;
- DBusError derror;
-- gchar **interfaces;
-- gchar **volume_udis;
-- gchar *volume_udi = NULL;
- gint n_volume_udis;
-- gint n;
-+ gchar *udi;
-
-- g_return_val_if_fail (udi != NULL, NULL);
-+ g_return_val_if_fail (in_udi != NULL, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* make sure the HAL support is initialized */
-@@ -179,55 +212,60 @@ exo_mount_hal_device_from_udi (const gchar *udi,
- /* initialize D-Bus error */
- dbus_error_init (&derror);
-
--again:
-- /* determine the info.interfaces property of the device */
-- interfaces = libhal_device_get_property_strlist (hal_context, udi, "info.interfaces", &derror);
-- if (G_UNLIKELY (interfaces == NULL))
-+ udi = g_strdup (in_udi);
-+ /* at this point, we own udi */
-+
-+ /* maybe we have a mountable device here */
-+ while(G_UNLIKELY (!device_has_interface (udi,
-+ "org.freedesktop.Hal.Device.Volume", &derror)))
- {
-- /* reset D-Bus error */
-- dbus_error_free (&derror);
-+ gchar **volume_udis;
-
-- /* release any previous volume UDI */
-- g_free (volume_udi);
-- volume_udi = NULL;
-+ /* maybe there was a D-Bus error? gotta check */
-+ if (G_UNLIKELY (dbus_error_is_set (&derror)))
-+ {
-+ exo_mount_hal_propagate_error (error, &derror);
-+ g_free (udi);
-+ return NULL;
-+ }
-+
-+ /* maybe we have a volume whose parent is identified by the udi */
-+ volume_udis = libhal_manager_find_device_string_match (hal_context,
-+ "info.parent", udi, &n_volume_udis, &derror);
-
-- /* ok, but maybe we have a volume whose parent is identified by the udi */
-- volume_udis = libhal_manager_find_device_string_match (hal_context, "info.parent", udi, &n_volume_udis, &derror);
- if (G_UNLIKELY (volume_udis == NULL))
- {
--err0: exo_mount_hal_propagate_error (error, &derror);
-- goto out;
-+ exo_mount_hal_propagate_error (error, &derror);
-+ g_free (udi);
-+ return NULL;
- }
- else if (G_UNLIKELY (n_volume_udis < 1))
- {
-- /* no match, we cannot handle that device */
- libhal_free_string_array (volume_udis);
-- goto err1;
-+ dbus_error_free (&derror);
-+ /* definitely not a device that we're able to
-+ * mount, eject or unmount */
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Given device \"%s\" is not a volume or drive"), udi);
-+ g_free (udi);
-+ return NULL;
- }
-
-+ g_free (udi);
-+
- /* use the first volume UDI... */
-- volume_udi = g_strdup (volume_udis[0]);
-+ udi = g_strdup (volume_udis[0]);
- libhal_free_string_array (volume_udis);
--
- /* ..and try again using that UDI */
-- udi = (const gchar *) volume_udi;
-- goto again;
- }
-
-- /* verify that we have a mountable device here */
-- for (n = 0; interfaces[n] != NULL; ++n)
-- if (strcmp (interfaces[n], "org.freedesktop.Hal.Device.Volume") == 0)
-- break;
-- if (G_UNLIKELY (interfaces[n] == NULL))
-- {
-- /* definitely not a device that we're able to mount, eject or unmount */
--err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
-- goto out;
-- }
-+ /* at this point, udi contains the UDI of something
-+ * that implements Hal.Device.Volume.
-+ * udi is the only resource that we hold here. */
-
- /* setup the device struct */
- device = g_new0 (ExoMountHalDevice, 1);
-- device->udi = g_strdup (udi);
-+ device->udi = udi;
-
- /* check if we have a volume here */
- device->volume = libhal_volume_from_udi (hal_context, udi);
-@@ -269,8 +307,8 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
- if (G_UNLIKELY (device->file == NULL || device->name == NULL))
- {
- exo_mount_hal_device_free (device);
-- device = NULL;
-- goto err0;
-+ exo_mount_hal_propagate_error(error, &derror);
-+ return NULL;
- }
-
- /* check if we failed */
-@@ -282,11 +320,7 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
- device = NULL;
- }
-
--out:
-- /* cleanup */
-- libhal_free_string_array (interfaces);
-- g_free (volume_udi);
--
-+ dbus_error_free (&derror);
- return device;
- }
-
-@@ -313,7 +347,7 @@ exo_mount_hal_device_from_file (const gchar *file,
- gchar **interfaces;
- gchar **udis;
- gint n_udis;
-- gint n, m;
-+ gint n;
-
- g_return_val_if_fail (g_path_is_absolute (file), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-@@ -347,12 +381,7 @@ exo_mount_hal_device_from_file (const gchar *file,
- continue;
-
- /* check if we have a mountable device here */
-- for (m = 0; interfaces[m] != NULL; ++m)
-- if (strcmp (interfaces[m], "org.freedesktop.Hal.Device.Volume") == 0)
-- break;
--
-- /* check if it's a usable device */
-- if (interfaces[m] != NULL)
-+ if (string_in_list (interfaces, "org.freedesktop.Hal.Device.Volume"))
- {
- libhal_free_string_array (interfaces);
- break;
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 4edfd4d71559..99c430f1dab4 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-panel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.148 2009/10/24 16:39:13 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.149 2010/02/19 19:46:00 ssuominen Exp $
+
+ 19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-panel-4.6.2.ebuild:
+ amd64 stable wrt #305657
24 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
xfce4-panel-4.6.2.ebuild, +files/xfce4-panel-4.6.2-exo.patch:
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
index 4b2de4e4cf96..9998e4042fcd 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild,v 1.2 2009/10/24 16:39:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2.ebuild,v 1.3 2010/02/19 19:46:00 ssuominen Exp $
EAPI=2
EAUTORECONF=yes
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug startup-notification"
RDEPEND=">=dev-libs/glib-2.8:2
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 4c796b53abcb..85090eda01de 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.102 2010/01/11 04:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.103 2010/02/19 19:46:55 ssuominen Exp $
+
+ 19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.6.1-r1.ebuild:
+ amd64 stable wrt #305657
11 Jan 2010; Mike Frysinger <vapier@gentoo.org>
xfce4-session-4.6.1.ebuild, xfce4-session-4.6.1-r1.ebuild:
diff --git a/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild
index 502e1d2f0a35..ae405c524882 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.6.1-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-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild,v 1.3 2010/01/11 04:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild,v 1.4 2010/02/19 19:46:55 ssuominen Exp $
EAPI=2
inherit xfconf
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug fortune gnome gnome-keyring profile"
RDEPEND="gnome-base/libglade
diff --git a/xfce-base/xfconf/ChangeLog b/xfce-base/xfconf/ChangeLog
index a72f37761533..a6bd10231ff3 100644
--- a/xfce-base/xfconf/ChangeLog
+++ b/xfce-base/xfconf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfconf
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfconf/ChangeLog,v 1.23 2010/02/10 15:54:50 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfconf/ChangeLog,v 1.24 2010/02/19 19:48:10 ssuominen Exp $
+
+ 19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xfconf-4.6.1-r1.ebuild:
+ amd64 stable wrt #305657
*xfconf-4.7.2 (10 Feb 2010)
diff --git a/xfce-base/xfconf/xfconf-4.6.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.6.1-r1.ebuild
index 1890d3e333dd..40543661bed4 100644
--- a/xfce-base/xfconf/xfconf-4.6.1-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.6.1-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-base/xfconf/xfconf-4.6.1-r1.ebuild,v 1.2 2010/01/11 04:19:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfconf/xfconf-4.6.1-r1.ebuild,v 1.3 2010/02/19 19:48:10 ssuominen Exp $
EAPI=2
inherit xfconf
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug -perl profile"
RDEPEND=">=dev-libs/dbus-glib-0.72