alpha/ia64/sparc stable wrt #349053

(Portage version: 2.1.9.39/cvs/Linux x86_64)

4 files changed, 6 insertions, 172 deletions

diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
index 69f6dea8f047..09506f780b74 100644
--- a/xfce-base/exo/ChangeLog
+++ b/xfce-base/exo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/exo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.52 2011/02/05 18:17:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.53 2011/02/14 19:18:38 ssuominen Exp $
+
+  14 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> exo-0.6.0.ebuild:
+  alpha/ia64/sparc stable wrt #349053
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> exo-0.6.0.ebuild:
   arm stable, bug #349053
diff --git a/xfce-base/exo/exo-0.3.107.ebuild b/xfce-base/exo/exo-0.3.107.ebuild
deleted file mode 100644
index 77ca62a4df87..000000000000
--- a/xfce-base/exo/exo-0.3.107.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.107.ebuild,v 1.13 2011/01/29 20:22:33 ssuominen Exp $
-
-EAPI=3
-inherit xfconf python multilib
-
-DESCRIPTION="Extensions, widgets and framework library with session management support"
-HOMEPAGE="http://www.xfce.org/projects/exo"
-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-0.7 )
-	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 NEWS README THANKS TODO"
-	PATCHES=( "${FILESDIR}/${PN}-0.3.4-interix.patch" )
-}
-
-src_prepare() {
-	xfconf_src_prepare
-	rm py-compile
-	touch py-compile
-	chmod +x py-compile
-
-	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 exo-0.3 pyexo.py
-}
-
-pkg_postrm() {
-	xfconf_pkg_postrm
-	python_mod_cleanup exo-0.3 pyexo.py
-}
diff --git a/xfce-base/exo/exo-0.6.0.ebuild b/xfce-base/exo/exo-0.6.0.ebuild
index 96feb22d912c..78856964c7f3 100644
--- a/xfce-base/exo/exo-0.6.0.ebuild
+++ b/xfce-base/exo/exo-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.6.0.ebuild,v 1.5 2011/02/05 18:17:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.6.0.ebuild,v 1.6 2011/02/14 19:18:38 ssuominen Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://xfce/src/xfce/exo/0.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 ~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 python"
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/exo/files/exo-0.3.4-interix.patch b/xfce-base/exo/files/exo-0.3.4-interix.patch
deleted file mode 100644
index 238f6b60b61a..000000000000
--- a/xfce-base/exo/files/exo-0.3.4-interix.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=5825
-http://bugs.gentoo.org/show_bug.cgi?id=287820
-
-diff -ru -x '*.P[l]o' exo-0.3.4.orig/exo/exo-mount-point.c exo-0.3.4/exo/exo-mount-point.c
---- exo-0.3.4.orig/exo/exo-mount-point.c	2008-03-13 08:08:55 +0100
-+++ exo-0.3.4/exo/exo-mount-point.c	2008-03-13 08:58:10 +0100
-@@ -72,7 +72,10 @@
- #include <exo/exo-string.h>
- #include <exo/exo-alias.h>
- 
--
-+#if defined(__INTERIX)
-+#include <dirent.h>
-+#include <sys/statvfs.h>
-+#endif
- 
- /* define _PATH_FSTAB if undefined */
- #ifndef _PATH_FSTAB
-@@ -309,6 +312,45 @@
-       /* release the buffer */
-       free (mntbuf);
-     }
-+#elif defined(__INTERIX)
-+  DIR* dirp = opendir("/dev/fs");
-+  if(dirp == NULL) {
-+    g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-+                 _("Failed to open file \"%s\": %s"), "/dev/fs",
-+                 g_strerror (errno));
-+    return NULL;
-+  } else {
-+	char file_name[9 + NAME_MAX];
-+	int saved_errno;
-+
-+	while(1) {
-+	  struct statvfs stat_buf;
-+	  struct dirent entry;
-+	  struct dirent *result;
-+
-+	  if (readdir_r (dirp, &entry, &result) || result == NULL)
-+		 break;
-+
-+	  strcpy (file_name, "/dev/fs/");
-+	  strcat (file_name, entry.d_name);
-+
-+	  if(statvfs(file_name, &stat_buf) == 0)
-+	  {
-+		exo_mount_point_add_if_matches(mask, device, folder, fstype,
-+										stat_buf.f_mntfromname,
-+										stat_buf.f_mntonname,
-+										stat_buf.f_fstypename,
-+										((stat_buf.f_flag & ST_RDONLY) != 0),
-+										&mount_points);
-+	  }
-+	  else
-+	  {
-+	  	/* this is ok for now... */
-+	  }
-+	}
-+
-+	closedir (dirp);
-+  }
- #else
- #error "Add support for your operating system here."
- #endif
-@@ -413,6 +455,46 @@
- 
-   /* close the file handle */
-   endfsent ();
-+#elif defined(__INTERIX)
-+  DIR* dirp = opendir("/dev/fs");
-+  if(dirp == NULL) {
-+    g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-+                 _("Failed to open file \"%s\": %s"), "/dev/fs",
-+                 g_strerror (errno));
-+    return NULL;
-+  } else {
-+	char file_name[9 + NAME_MAX];
-+	int saved_errno;
-+
-+	while(1) {
-+	  struct statvfs stat_buf;
-+	  struct dirent entry;
-+	  struct dirent *result;
-+
-+	  if (readdir_r (dirp, &entry, &result) || result == NULL)
-+		 break;
-+
-+	  strcpy (file_name, "/dev/fs/");
-+	  strcat (file_name, entry.d_name);
-+
-+	  if(statvfs(file_name, &stat_buf) == 0)
-+	  {
-+		exo_mount_point_add_if_matches(mask, device, folder, fstype,
-+										stat_buf.f_mntfromname,
-+										stat_buf.f_mntonname,
-+										stat_buf.f_fstypename,
-+										((stat_buf.f_flag & ST_RDONLY) != 0),
-+										&mount_points);
-+	  }
-+	  else
-+	  {
-+	  	/* this is ok for now... */
-+	  }
-+	}
-+
-+	closedir (dirp);
-+  }
-+
- #else
- #error "Add support for your operating system here."
- #endif