old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 7 insertions, 99 deletions

diff --git a/xfce-extra/xfce4-places-plugin/ChangeLog b/xfce-extra/xfce4-places-plugin/ChangeLog
index 4ef27ed9fe03..4636553aad99 100644
--- a/xfce-extra/xfce4-places-plugin/ChangeLog
+++ b/xfce-extra/xfce4-places-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-places-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.19 2012/01/02 13:03:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.20 2012/01/02 13:04:40 ssuominen Exp $
+
+  02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-places-plugin-1.2.0.ebuild,
+  -files/xfce4-places-plugin-1.2.0-exo.patch,
+  -files/xfce4-places-plugin-1.2.0-link-against-libx11.patch:
+  old
 
   02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-places-plugin-1.2.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch
deleted file mode 100644
index a137688a7bd4..000000000000
--- a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=5754
-
---- configure.in
-+++ configure.in
-@@ -25,7 +25,7 @@
- XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
- XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
--XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
-+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5])
- 
- dnl check for optional packages/versions
- XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
---- panel-plugin/support.c
-+++ panel-plugin/support.c
-@@ -52,10 +52,9 @@
- 
-     if(path != NULL && *path != '\0'){
- 
--        DBG("exo_url_show(%s)", path);
--        exo_success = exo_url_show(path, NULL, NULL);
-+        GError *error = NULL;
- 
--        if(!exo_success){
-+        if ( !gtk_show_uri (NULL, path, 0, &error)){
-             gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL);
-             DBG("exec: %s", cmd);
-             places_gui_exec(cmd);
-@@ -114,8 +113,9 @@
- void
- places_load_file(const gchar *path)
- {
-+    GError *error = NULL;
-     if(path != NULL && *path != '\0')
--        exo_url_show(path, NULL, NULL);
-+        gtk_show_uri (NULL , path, 0, &error);
- }
- 
- /**
diff --git a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-link-against-libx11.patch b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-link-against-libx11.patch
deleted file mode 100644
index e06a155aeb8c..000000000000
--- a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-link-against-libx11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 27f6da0..9c753fe 100644
---- a/configure.in
-+++ b/configure.in
-@@ -26,6 +26,7 @@ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
- XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
- XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5])
-+XDT_CHECK_LIBX11()
- 
- dnl check for optional packages/versions
- XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index dcbcdf5..63e2027 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -59,6 +59,7 @@ xfce4_places_plugin_LDADD =						\
- 	$(LIBXFCE4UTIL_LIBS)						\
- 	$(LIBXFCEGUI4_LIBS)						\
- 	$(LIBXFCE4PANEL_LIBS)						\
-+	$(LIBX11_LIBS)							\
- 	@THUNAR_VFS_LIBS@
- 
- 
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild
deleted file mode 100644
index 7d0bbcf168b0..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild,v 1.17 2011/05/31 11:24:05 angelos Exp $
-
-EAPI=4
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Places menu plug-in for panel, like GNOME's"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	xfce-extra/thunar-vfs
-	>=xfce-base/exo-0.6
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-exo.patch
-		"${FILESDIR}"/${P}-link-against-libx11.patch
-	)
-	XFCONF=( $(xfconf_use_debug) )
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}