old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 15 insertions, 110 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/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index 57c623154176..f363d6b4672e 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xfce4-places-plugin-1.2.0-exo.patch 1264 RMD160 f8cfd5859fcbaae15eed0ca6b5bc46bf2621dfac SHA1 f8129252e09eac1f270c4f376c047b508c5296b6 SHA256 69b61b1c8291e2736edb6fff82a6a58b1e4e181b35a395c20596be4b9c1460c6
-AUX xfce4-places-plugin-1.2.0-link-against-libx11.patch 915 RMD160 2248e5cc79541c7b414009dd94fd789390f6dc26 SHA1 a093d3b4d56b5697bad6d3c3dde048d773ac3ccb SHA256 b08fcf183c25cf011efdf4994632a34c47da4d4cef29e92c446d640cd39b62e8
 DIST xfce4-places-plugin-1.2.0.tar.bz2 295239 RMD160 5911c724ccd0f171cacaba4f914ffc5b46867614 SHA1 24aebeccb3d45c511762bc4174dfc075f082e3d9 SHA256 a77c0a85d03cbf149ba518c46927fe314b8ef39e0f5d040a849f1b05996f62b0
 DIST xfce4-places-plugin_1.2.0-3.debian.tar.gz 17151 RMD160 31a9b5802797868ed7dc2bc2f3a7b9c7fa1b45fe SHA1 35bd2505f399ef626f4b41a4b42510ad0f1825cc SHA256 d796ad4b764fa1f7f886f4705570826c2b234dbf2bb5af84d5f70c872ca0f3fd
 EBUILD xfce4-places-plugin-1.2.0-r1.ebuild 1249 RMD160 184e281cef7facb0f24357f64aaf1f430686c23a SHA1 cfaf2a75959f973eb34902611653122f5fa883fc SHA256 bcdc83557ca7a4eee45d851c14fe958ee395f4be2ca6c390a36a3f4bf430086f
-EBUILD xfce4-places-plugin-1.2.0.ebuild 1053 RMD160 16b0eb126cb3017b0f3904b292c291ea8a4391b2 SHA1 6838e12afbe9714ee3e6e2050eb85d582bfff324 SHA256 357540cfdac40d2205a7cefc48fe645ad7c37582890edb43c34f0ecb7e5bc65f
-MISC ChangeLog 2801 RMD160 76ac411a292f342285960dc1ee9f258db3632e06 SHA1 26f37cab754e016aee1a97ffb8aac1df9db49e9b SHA256 b324bffb06e47ef23b69a768309bcd35646dcb9c058470a1ee6d5121f0cec5f2
+MISC ChangeLog 3007 RMD160 945da24fa73bbc2f58d98ef89115f97bbebc0910 SHA1 f43fa9d4d782e475977c43686f9862ae8e437260 SHA256 193ced7420b15957e8670fbb4cfd36c63628b9cdb738bbd2c1e1cefe9ab8f75e
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPAarIAAoJEEdUh39IaPFNmtEIAJ5AZI7QOSpCYTD0r7hsBXf4
-3vtfw171doeRU1n5K2LMcaIHJC3ouwVP2vf0wS2ekGytRt9+XqNOPA0Npxhh64eO
-Ntsb/rqWx0EIr1g7F/HpNKcUmUGVzvOzaw+AhLGduQka1TRnCiXpTEeTbOdmp5Xz
-6rjxB+W4g1vJO0NejtFkmt9yyzR75ZGqWcsnBbnkb90Oq/L9NYMw3V+kgkfXaw4z
-GWIM1zMSsawF7ar3nhR69ouSJJl/fHVbcqSO2jd7o1MxyKm/N6rou7WmMJgFP/fX
-7faoEWtKvWwrkU9hSAh07s2Clg0dMTqHFMNZsKQBibw6XFCcP0Wbwh6sIlxgDDo=
-=jn2P
+iQEcBAEBAgAGBQJPAasAAAoJEEdUh39IaPFNUncH/ia6YYmrBSDl3TuEiwR/cxXJ
+4fCKVW4RwMU4TMKIIzH++BfIQ2RPad3q2EO9zetyyv1cETRPe0ZC3c/CU7eckUZo
+bper7EHzeDx/03xdwBmOt6tFgKGpt/xprU2tuXIXof78Bhej6z6wx1YiY0vKV3d4
+HZgcWlhfptUfV2Rjo2LLuCCmdG6tWi+ElKWBY4JHAuE1TZ1jARSNL4rLE7HTiyuD
++4V+MRg+7GlddCrY5JirX0XGHaMe1GauI8ghZA720McJWl67KQCW/b7vae001xrB
+SX7OiL+ZHnbRXVoaNJnxNR26nNPk9r5tmlb4B4O8lApOL+5mL8zKC+wD//mN7hA=
+=nyIZ
 -----END PGP SIGNATURE-----
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 )
-}