Move from xfce-extra category.

Package-Manager: portage-2.2_rc39/cvs/Linux x86_64
RepoMan-Options: --force

8 files changed, 420 insertions, 2 deletions

diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
new file mode 100644
index 000000000000..e04958ee1d1b
--- /dev/null
+++ b/xfce-base/exo/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for xfce-base/exo
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.1 2009/08/23 17:43:26 ssuominen Exp $
+
+*exo-0.3.102-r1 (23 Aug 2009)
+*exo-0.3.101-r1 (23 Aug 2009)
+
+  23 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +exo-0.3.101-r1.ebuild, +files/exo-0.3.101-iocharset.patch,
+  +exo-0.3.102-r1.ebuild, +files/exo-0.3.102-eject.patch:
+  Move from xfce-extra category.
+
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
new file mode 100644
index 000000000000..17e918a8fb26
--- /dev/null
+++ b/xfce-base/exo/Manifest
@@ -0,0 +1,8 @@
+AUX exo-0.3.101-iocharset.patch 2052 RMD160 aad5f5b78fa01b9bf13cad9013ee99fb468f8bee SHA1 8b9c68550e090f91a653ef3f4b4a4931f8e92469 SHA256 d3e2b5fb2d012d6f9dddf3da5f350fc81a3d61c1a66eca7638d7c14a9b282769
+AUX exo-0.3.102-eject.patch 6692 RMD160 674aebb271c14f5cc1f1e285cea8fd4c4ad3d41f SHA1 4517c4226bdcdc5e325b7dfc56c500acd1f3b00f SHA256 cc4c3551a06b2161355956eced4345e5bdd50d738a8f8d22f0604d306234c289
+DIST exo-0.3.101.tar.bz2 1793815 RMD160 92dfc1e8f0bfa8ca74f151a2283f6988ce703649 SHA1 74194f58278a2b9d963264806f142e5d6d05336c SHA256 0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
+DIST exo-0.3.102.tar.bz2 1801655 RMD160 a932173cb916ea18e62fdc8f0254452ab09ac320 SHA1 ef85488a713911d1afeea5ddd8d70943f2c5a323 SHA256 deab87326a455fc47eea44a124268fa64b154750a55ae5158a1119cddc497800
+EBUILD exo-0.3.101-r1.ebuild 1300 RMD160 148a15d45622500cde4ce12cd5d244ecb3023696 SHA1 cc6bfff15500d4cee143134f014f708fd83c76f8 SHA256 56c5c7e9e05f0ad3ab3ef1b555e008211f5729c17d2748b1bb559a8e0b8c3bdd
+EBUILD exo-0.3.102-r1.ebuild 1427 RMD160 27f71f464d2b0082c632fd1438b653dd0f1effc8 SHA1 36da4ee3605288a405ba0b45ed7e825b0f53acef SHA256 3b0043f29177f429c9d7d634e9ead37e21405ec37789e5aae2755b4d3b0850f9
+MISC ChangeLog 471 RMD160 d08e795fc67f96dc042a4f7f4f729a4f7fb595b6 SHA1 fcd0dfd45e6feae24da400d0e7842256476e76f5 SHA256 0d85d466fa3f78660a00004abf971b5eeb6570d697b4ffd5bf8bf56645be6ba1
+MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-base/exo/exo-0.3.101-r1.ebuild b/xfce-base/exo/exo-0.3.101-r1.ebuild
new file mode 100644
index 000000000000..45ae13cba303
--- /dev/null
+++ b/xfce-base/exo/exo-0.3.101-r1.ebuild
@@ -0,0 +1,54 @@
+# 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.101-r1.ebuild,v 1.1 2009/08/23 17:43:26 ssuominen Exp $
+
+EAPI="1"
+
+inherit xfce4 python
+
+XFCE_VERSION=4.6.1
+
+xfce4_core
+
+DESCRIPTION="Extensions, widgets and framework library with session management support"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug doc 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-${XFCE_VERSION}
+	libnotify? ( x11-libs/libnotify )
+	hal? ( sys-apps/hal )
+	python? ( dev-python/pygtk )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	doc? ( dev-util/gtk-doc )"
+
+XFCE4_PATCHES="${FILESDIR}/exo-0.3.101-iocharset.patch"
+
+pkg_setup() {
+	XFCE_CONFIG+=" $(use_enable doc gtk-doc) $(use_enable hal)
+	$(use_enable libnotify notifications) $(use_enable python)"
+}
+
+src_unpack() {
+	xfce4_src_unpack
+	cd "${S}"
+	rm py-compile
+	touch py-compile
+	chmod +x py-compile
+}
+
+pkg_postinst() {
+	xfce4_pkg_postinst
+	python_mod_optimize /usr/lib*/python*/site-packages
+}
+
+pkg_postrm() {
+	xfce4_pkg_postrm
+	python_mod_cleanup /usr/lib*/python*/site-packages
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
diff --git a/xfce-base/exo/exo-0.3.102-r1.ebuild b/xfce-base/exo/exo-0.3.102-r1.ebuild
new file mode 100644
index 000000000000..345589ecc2ee
--- /dev/null
+++ b/xfce-base/exo/exo-0.3.102-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2009/08/23 17:43:26 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="http://archive.xfce.org/src/xfce/exo/0.3/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc 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
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	XFCONF="$(use_enable doc gtk-doc) $(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
+}
+
+pkg_postinst() {
+	xfce4_pkg_postinst
+	python_mod_optimize "$(python_get_sitedir)"
+}
+
+pkg_postrm() {
+	xfce4_pkg_postrm
+	python_mod_cleanup "$(python_get_sitedir)"
+}
diff --git a/xfce-base/exo/files/exo-0.3.101-iocharset.patch b/xfce-base/exo/files/exo-0.3.101-iocharset.patch
new file mode 100644
index 000000000000..a667f116652b
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.3.101-iocharset.patch
@@ -0,0 +1,79 @@
+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
new file mode 100644
index 000000000000..316f081b4394
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.3.102-eject.patch
@@ -0,0 +1,207 @@
+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/exo/metadata.xml b/xfce-base/exo/metadata.xml
new file mode 100644
index 000000000000..d56729e92f8e
--- /dev/null
+++ b/xfce-base/exo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>xfce</herd>
+</pkgmetadata>
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index dbe7463c5812..f7cc98f03adb 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,4 +1,4 @@
 DIST xfdesktop-4.6.1.tar.bz2 3671378 RMD160 86785f706a65e443c5521179b68309b9aca0cb32 SHA1 c2c1b54acaae924077caa3cdffe449e3bb34b2bd SHA256 22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-EBUILD xfdesktop-4.6.1.ebuild 1831 RMD160 51a8755b0240b425310f06d65b04860fe5fabf98 SHA1 5bf6750810107cdfb5a35d7e41524f4d82639f36 SHA256 e520a51b5c9f60befa58340086d9b129c797c7f62f5fb99a790a1e4a8879e0f0
-MISC ChangeLog 18215 RMD160 1575ab79f8080fb70e9090c2915317a9acb20551 SHA1 b5a02c72f102e1f89cf75e3b96f08918f43cb26d SHA256 e4402d9795fdb104df32e1b8dac9aa96c5de13307be4b07e3883ffcd93990c16
+EBUILD xfdesktop-4.6.1.ebuild 1829 RMD160 f5e74d3ee802cf8b4b3739c05282b467c84d7c7f SHA1 399e189036fab2dca3f316da4f488e3d070e8e28 SHA256 706c9e32694cd3c11a4937a886369058fac3bc8adeef8f63f1bd8aadd7abfa22
+MISC ChangeLog 18334 RMD160 710ae624732473328c2dfef9d0e5cbe64f6ed1a1 SHA1 40ba929824682cf049e001dc423095a34f9f0468 SHA256 5d1f74335ab7fbe00990ae52101f0496d2d0ffade43c96903536fd789908246d
 MISC metadata.xml 351 RMD160 4401cf2e2c9cc9f166bdff78a1e15612e784ad1d SHA1 dc6b0946171dda265a9b13871899a9a8e071f6db SHA256 f2a98defe794e66d32ba0f9041a7b0afb7209345974f114ee2b8454dbe4bc6e9