Use g_setenv() instead of obsolete xfce_setenv() wrt #513568 by Patrick Lauer

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 83 insertions, 17 deletions

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 1ec711712a17..389ee7e175ba 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/libxfcegui4
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.184 2012/11/28 12:27:29 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.185 2014/06/24 13:37:07 ssuominen Exp $
+
+*libxfcegui4-4.10.0-r1 (24 Jun 2014)
+
+  24 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libxfcegui4-4.10.0-no-xfce_setenv.patch, +libxfcegui4-4.10.0-r1.ebuild,
+  libxfcegui4-4.10.0.ebuild:
+  Use g_setenv() instead of obsolete xfce_setenv() wrt #513568 by Patrick Lauer
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   libxfcegui4-4.10.0.ebuild:
@@ -36,4 +43,3 @@
   05 May 2012; Michał Górny <mgorny@gentoo.org> libxfcegui4-4.8.1.ebuild,
   libxfcegui4-4.10.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
-
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index f9eabe16b9a8..ead72ce5cab7 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libxfcegui4-4.10.0.tar.bz2 691012 SHA256 2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533
-EBUILD libxfcegui4-4.10.0.ebuild 1142 SHA256 5810ea2dbbd3ff60ae6f0f63d431696f02c89a3593d83a68ca98ed10bf85a140 SHA512 52e26d11dfb588370f12f589806b484884a2a1a6633ba03b552dea25c59750d41f3f32cd9eacf0d9f17fa0f1f934c63b6f17a31b049829481975d281e92901e4 WHIRLPOOL 6a56864465925febb1e8445aa6c42b3427b3faa2c244ef61af4dcf4fe5150a1738849465558eeb5f76e54235cb19e7430665b628440617a66434b1ac5f4a6321
-MISC ChangeLog 1312 SHA256 7f92ad097c61767f556f62cf865c06a0c31764cb2b5b217607e3c71ac38eeca5 SHA512 9af180e1fd12eab619eba5baefc32670b08d07d2f761b8713d2ded69848dbea261cef9eeff2a62102903fb5fd3d1190a72b59ab0068ae5550e3096c00a13d021 WHIRLPOOL 614893c9ac0cb567f08f301e7292b219a6c5178115aab0b1349c364212b1261a8d0edb2661cc2af9176570a6b0c603bb1a3e9472e69c57cb474d792661ea5978
+AUX libxfcegui4-4.10.0-no-xfce_setenv.patch 311 SHA256 d1f4603b5eeef92d5d256d8f766e516395947d72e16db68ce47e472130b94616 SHA512 f8d12be9e9d126d3a3a822cab872fb9dbfe2d5e23e40b529c2a637e0365e5b481ff44d564fcda5de60948342b9c1367d51ae20ae7e0e5abd69296f7dd3ea3f31 WHIRLPOOL 2779bbcd73146556ce21e1b8ac3db4945449531b1a887b32f3688a6dd82b6631ee771e0a6e5b69b6ef1a8b2455dabd6dfd3c5bf305ddae748729f8ebd84e797e
+DIST libxfcegui4-4.10.0.tar.bz2 691012 SHA256 2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533 SHA512 32fe3be287c84d1816154c7632a87025324c2cb9d9524ef3d7813c3b3619ca04e4b70aeb47a3e0fb59090e43e124476988774a0dc5186ebc1a0ccdfe635cbb45 WHIRLPOOL 7390c5d36bf2e3bdea6a8c7de4f9471be9f434e99a250c8925de8ae7fa69f307c43b029d52417118bf49764c0834cfb6b039320846b83488cb8d39ca79cc2e15
+EBUILD libxfcegui4-4.10.0-r1.ebuild 1209 SHA256 bd0d95441a69987cf9260e87a36dc40c57fe1b6ae837f3dc561ee47ecd2a49e2 SHA512 00548cee65ffdd23b6f8d862aeead405f0af9d0681ea4696d41c52a755bb859258b81e0b0f7e7034ac9655fd24465b165c1a3dfbfec2b62f67ab09de1e2407a3 WHIRLPOOL 4d6193d49e1d5da21175d4ecb34edcb25f309a4c78f310baa4bed3d647cb2ddb7acce0b59e0dbbf3e3790b5166da1c6e62c222618abb31f3cc53f5d00832dda2
+EBUILD libxfcegui4-4.10.0.ebuild 1173 SHA256 6cae1113100d5ba7b4c0269b6f57956bd7d548cf7105559edda63fd4a2048cc6 SHA512 bcdd2aab969aa0be63cdb930aacc72b1240be33b2d25b1a4d4a918dbca52b82f17be9210b2b959607a66d151c3447515a32df7a0ea1568d62a22b3c6bff84481 WHIRLPOOL 3fc1f300e660b8a3536ec077d0cf6b6870eb4cf718778c18930ad39c58dd378bf597071879a1e428525afa4f9960ad67131e24cc36b01262e1ceef524a6fa166
+MISC ChangeLog 1594 SHA256 b6756083e53641d31313b35dcfbca28270ad03e51fbda27a05dd027c1f748da6 SHA512 750f94ca6dfadfc89dbb0c4cab7c4be91e8355ae7794681fbcb8d7c4f5ca68fbe638ba1fd0187cbceb0c8efc79f0136f74acf429118796c8e086ca7771388de6 WHIRLPOOL 9efcff64064cda62e12ec2d2b28a602cfe52c3399e2ba6c681e063572077569c51e28e5b7c4efe27242272a7f443283a95dae40c2d2204da1c60ef981de52c0e
 MISC metadata.xml 227 SHA256 82c293b5d834b607586f75cfa8b1420259298d748a19edfea3eaaabfe211b8d1 SHA512 f53564a9f476fe6c9a74e83d4396e6e52c3c5c3ca6aa67332192751fa0ceef4ec1056b62a2c8abdf73b25e678454bad43474362043f1ffc1b32d768033fecf62 WHIRLPOOL 6ae084efd36c60d35d84fd561d54313e5f1b1b83487b85d5be9ab399a668d0b3a45bba0c8a293cafefe8e45abcea801c3eb29a129e6528af30c5bad4ad30e815
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgL8AAoJEEdUh39IaPFNhAUH/R8OVThj/gtlUERKPkF2s7Vh
-LlBsOHwxi3naYibbHUn1OAHXS2yZSSu43ME/aNeC9xUFjAkzRsG1S3DkJfy6539c
-sJIfblpnjCTfQqXyTeAHRHwCVT/H6GPHVeoR/d5kSm9XS5mkf+4sLbxtgsteI9Az
-5xgvVdMgu9jWfS2ueddSXP1njh0rkgzHr9bDOZmZuwoUr+jWj/qPt3IgShbcaabX
-DTzjkPUDUzqRCdI6O/yaIcCjxgRV86DRFkPeWdEKROamRdJmQdGs2K3lnG4Xs0UT
-WbVVn54LrN2567qGxAAUD0BnZrk08vYGWED4OZMLxF4pt5i46UsBsj19K4sb9/Y=
-=hiJX
+iQEcBAEBCAAGBQJTqX4rAAoJEEdUh39IaPFNUm8H/iiermBMbDH509O8YpVR+DQW
+T+8TXJSlO99AzpzpG9/IamKDu7JJ96VBgbMSqwaE+NnPd4eeeiV1J5thJU4NPY8v
+tSc0kRr+hmxdG7SeiK5ybZovw6UJfaL8iVpw0YwUNMHxlQdSpDNwE7AvBy5S6a9B
+o/37QofPRf+4HTBu1OCg2+ABy3E2T5W/uUt4iNXWZWXFDF91TBa5eiJ2v+zVTmQU
+I44PTGwIbwLPL5IYptH4sN9KG7WJDQa/4dL03VoVp3SIPv7Sj7ObOgyLw/iGs4B9
+tz9vQq/4LgSwwhhQPc9pfDcwCVURz5zusJ4VEf80XDIMkwRltd7caEl7MH9+NvY=
+=Dfzb
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch b/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch
new file mode 100644
index 000000000000..ffb2160827ca
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/libxfcegui4-4.10.0-no-xfce_setenv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/513568
+http://bugzilla.xfce.org/show_bug.cgi?id=10974
+
+--- libxfcegui4/xfce-exec.c
++++ libxfcegui4/xfce-exec.c
+@@ -79,7 +79,7 @@
+ #ifndef G_OS_WIN32
+     gchar *dpyname = user_data;
+     
+-    xfce_setenv ("DISPLAY", dpyname, TRUE);
++    g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+ 
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..439dbe7c36d5
--- /dev/null
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r1.ebuild,v 1.1 2014/06/24 13:37:07 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A compability library for unported Xfce 4.6 plugins"
+HOMEPAGE="http://www.xfce.org/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+IUSE="glade startup-notification"
+
+RDEPEND="gnome-base/libglade
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4util-4.10
+	glade? ( dev-util/glade:3 )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-no-xfce_setenv.patch )
+
+	XFCONF=(
+		--disable-static
+		$(use_enable startup-notification)
+		$(use_enable glade gladeui)
+		--with-html-dir="${EPREFIX}"/deprecated
+		)
+}
+
+src_install() {
+	xfconf_src_install
+	rm -rf "${ED}"/deprecated
+}
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
index 18c928360321..e827a23dfb02 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild,v 1.10 2012/11/28 12:27:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.10.0.ebuild,v 1.11 2014/06/24 13:37:07 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -18,7 +18,8 @@ RDEPEND="gnome-base/libglade
 	x11-libs/libSM
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfce4util-4.10
+	<xfce-base/libxfce4util-4.11
 	glade? ( dev-util/glade:3 )
 	startup-notification? ( x11-libs/startup-notification )"
 DEPEND="${RDEPEND}