Port from obsolete libxfcegui4 to libxfce4ui. You can follow http://bugzilla.xfce.org/show_bug.cgi?id=8064.

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

4 files changed, 159 insertions, 10 deletions

diff --git a/xfce-extra/xfce4-datetime-plugin/ChangeLog b/xfce-extra/xfce4-datetime-plugin/ChangeLog
index 868d70d6edd8..f7a6761d6a6b 100644
--- a/xfce-extra/xfce4-datetime-plugin/ChangeLog
+++ b/xfce-extra/xfce4-datetime-plugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-datetime-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.7 2012/11/28 12:24:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.8 2012/12/17 23:09:57 ssuominen Exp $
+
+*xfce4-datetime-plugin-0.6.1-r1 (17 Dec 2012)
+
+  17 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-datetime-plugin-0.6.1-r1.ebuild,
+  +files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch:
+  Port from obsolete libxfcegui4 to libxfce4ui. You can follow
+  http://bugzilla.xfce.org/show_bug.cgi?id=8064.
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-datetime-plugin-0.6.1.ebuild:
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 97aad5fa71e3..cee8b530a0f0 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xfce4-datetime-plugin-0.6.1.tar.bz2 289328 SHA256 fb340c1c2170d4f33c7f278772966f3c01caaedcd4a7f58f670bf8e28580bb1b
+AUX xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch 3011 SHA256 8fb0a95d59479c4acd9041765b9dada472df60a2711b0b06587a8c4f0a4e95f8 SHA512 1232fb79ba0362a21723e19e4d000af53397aad651bcfed1bd05912d1c67d0f0ea991b4cb1daf4f8ceaf89e90da61c8cc750575ffe91d491429e153267f381e3 WHIRLPOOL 23f1146eb05fdc51085b513747db09b23155b7529ca9367b642553cb4ea26a56fb4076c790331154293f8f72f37650db5fe3ed5988e7e3a298a7e660a6fc0f6f
+DIST xfce4-datetime-plugin-0.6.1.tar.bz2 289328 SHA256 fb340c1c2170d4f33c7f278772966f3c01caaedcd4a7f58f670bf8e28580bb1b SHA512 2a6ffe248be22ad81e39b30b1f6af53a0be48b8795b922312c61baf0b9907e348976ac259ab79b8cab6f21476a0ce20afdcbd0414c6625ef6a58923c37eab0f7 WHIRLPOOL 2a370138a47d80402f7ecbaf75d027e57a16cd817f64628ecfe3906dfc9b7ea1b13db04b059e0bad842b2c6460dc0d303a446621f7ca8fd5b81800c7ce12772b
+EBUILD xfce4-datetime-plugin-0.6.1-r1.ebuild 1323 SHA256 6e4b55f54045681d587de77f3f749d64c3a0b6dcb9f2239d23109027704d6f66 SHA512 2a6e0e277de98d7f8b7b2202543f77375a64afdc8694a920fb06d7dfb93ffc752a54f1884b29e75cd659d5ce414770ebf3f4e6197eb9fec4af1fee56ca3875ff WHIRLPOOL 080daae1e73b5b7960dcfbb62871388e03a2da89c528e807d83b032ff3f020f354b0ef6cea22566274cfed3dbe4bd3f7ca034d401a8d48ec99119ff5692b58d1
 EBUILD xfce4-datetime-plugin-0.6.1.ebuild 1026 SHA256 d2f763abb6899ef2e076989775dca3d7e57d58b4c480086a6e578a85eb594a51 SHA512 f20e8dba21a4346c7754e4d40b28a9d36f1b423dc08ac4b9e632aea7b332652e3ebf99a2def41b842b978fb482e658e3315508289f6aa374f8b301adf64848f8 WHIRLPOOL e80330fda5d5893293049f85fb2c8827bfa384eea1562e213b72620caf3c2e9c0c8bd98b8688bf36d664be41039c5ffed29b5dcea36d245f7a880fe954d3c142
-MISC ChangeLog 1207 SHA256 c723a55addb585ff26c9ed1484efee427a9ab72d80e168df7d3b5e9b7bf057d4 SHA512 af22ba23050bc8474c4804099d9da0b9ec323cbe2c498c31f3c04500bd9758bea6f2ef1ccf54bedceaa4c883dc95552c43068a2b5581151df538b4adde023d1e WHIRLPOOL e4b182c1859277b6748d6d50352be99cdf6a9d67f045352d37cbd3e7fc3685a124227d1b21780caaf562dff82e7218611e1053a80e51135dce0e0265e0512ef5
+MISC ChangeLog 1526 SHA256 33a6e8225c82ec6136fe89d8941467b6f83598dc4ca6735fe8ad46c16f699c41 SHA512 a419348506464f33ac9d646dfdff38767152eb5a8dad8612d87b39251013515836d066c57e3d3c23a0f04560a0c4141f03a37f970c0fe90c30e70c871a9e7998 WHIRLPOOL e7e8863225ded5f50ad694eace479422911236d6f995b33128401e4953ece49fd32cc5797040c5a27a3d1a8851d772908682fd796fab2087b70dce09a3d586ca
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgJLAAoJEEdUh39IaPFNtzMH/irFMOzMqevnvClUCP4OKSNm
-HsBRG157RlhBEpG45Af7ggm7MmH5C3Hu6D0Z2AqvEFgJwY82jed5X7BgCrXiYq7J
-qzc8B9fX4MvvSkDkg64pwEXlNHpi7usmMcxlvsxOHq9bnBfYRwiAFP4+Y6lPFVmt
-B5254NSBT8f5dEheSUmNfk3Vrk6aFMP0/GJgY6sTis5X428CJELd4SRg7wTq62yc
-F/ZR88nYpK7HlTrthBvm6XSxx4xoWJ/ElItk3WGI0aGQPVhvIgT+BUjQs+ji8B29
-86424QqCyl2bEdGxhI0G+I0Ao4AHqT8jOWdwwPkl0yYajOLvkjabmkbPjfflo/w=
-=PyuE
+iQEcBAEBCAAGBQJQz6ZDAAoJEEdUh39IaPFNTUsH/0k+SBtqrtk0uRMHLWksM88w
+xEhVGKXKL+O/59eVsenCW3ARpOR0tukYPJ+xgFyKNV98kndJYN1FLplIdBhWA56l
+Rtud4BYKU6KrrYkOCzKhoCfIKduUX3Y3sPZVw8NR4igFtRjnx2oSxK+HSjgjF063
+qyVRFPlaMOKJSAD1SBz3BOyenrlzFi2cJ7gMAvgkzgQqjw23LFJyvgDcZ5FZNGmb
+Tir76kLHfcJ04voByzEgez8MnPWFDnsY8m8NfAcPPzGGfsZW946ffNVg7sgAcQOv
+VlTu1rBx4BtCma9ALELZEM27s60TrtsW4SAy3RP3FgOmCnQaLEaJr4l7LsnIlq0=
+=0RYu
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-datetime-plugin/files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch b/xfce-extra/xfce4-datetime-plugin/files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch
new file mode 100644
index 000000000000..875e92baaed5
--- /dev/null
+++ b/xfce-extra/xfce4-datetime-plugin/files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch
@@ -0,0 +1,93 @@
+This is from http://bugzilla.xfce.org/show_bug.cgi?id=8064 and will require at least
+http://bugzilla.xfce.org/show_bug.cgi?id=8064#c2 too for current xfce4-dev-tools
+compability.
+
+Thanks,
+Samuli
+
+--- configure.in
++++ configure.in
+@@ -30,10 +30,10 @@
+ XDT_I18N([ar da el en_GB es eu fr gl hu ja lv nl pt_BR pt_PT tr uk ur])
+ 
+ dnl Check for required packages
+-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
+-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
+-XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.3.99.2])
++XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
++XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.10.0])
+ 
+ #CFLAGS="$CFLAGS -Wall -Werror"
+ 
+--- panel-plugin/datetime.c
++++ panel-plugin/datetime.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ 
+ /* xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ #include <libxfce4panel/xfce-panel-convenience.h>
+--- panel-plugin/datetime-dialog.c
++++ panel-plugin/datetime-dialog.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ 
+ /* xfce includes */
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ 
+@@ -388,7 +388,7 @@
+   /*
+    * layout frame
+    */
+-  frame = xfce_create_framebox(_("Layout"), &bin);
++  frame = xfce_gtk_frame_box_new(_("Layout"), &bin);
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame,
+       FALSE, FALSE, 0);
+   gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
+@@ -422,7 +422,7 @@
+   /*
+    * Date frame
+    */
+-  datetime->date_frame = xfce_create_framebox(_("Date"), &bin);
++  datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin);
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->date_frame,
+       FALSE, FALSE, 0);
+   gtk_container_set_border_width(GTK_CONTAINER(datetime->date_frame), 6);
+@@ -525,7 +525,7 @@
+   /*
+    * time frame
+    */
+-  datetime->time_frame = xfce_create_framebox(_("Time"), &bin);
++  datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin);
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->time_frame,
+       FALSE, FALSE, 0);
+   gtk_container_set_border_width(GTK_CONTAINER(datetime->time_frame), 6);
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -14,7 +14,7 @@
+ 	-DLOCALEDIR=\"$(localedir)\"		\
+ 	$(GTK_CFLAGS)				\
+ 	$(LIBXFCE4PANEL_CFLAGS)			\
+-	$(LIBXFCEGUI4_CFLAGS)			\
++	$(LIBXFCE4UI_CFLAGS)			\
+ 	$(LIBXFCE4UTIL_CFLAGS)
+ 
+ libdatetime_la_LDFLAGS = 			\
+@@ -29,7 +29,7 @@
+ libdatetime_la_LIBADD = 			\
+ 	$(GTK_LIBS)				\
+ 	$(LIBXFCE4PANEL_LIBS)			\
+-	$(LIBXFCEGUI4_LIBS)			\
++	$(LIBXFCE4UI_LIBS)			\
+ 	$(LIBXFCE4UTIL_LIBS)
+ 
+ desktopdir = $(datadir)/xfce4/panel-plugins
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.1-r1.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..63bb7b1d447d
--- /dev/null
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.1-r1.ebuild,v 1.1 2012/12/17 23:09:57 ssuominen Exp $
+
+EAPI=5
+EAUTORECONF=1
+inherit xfconf
+
+DESCRIPTION="A panel plug-in with date, time and embedded calender"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.6/${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.24:2
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/xfce4-panel-4.10"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-port-to-libxfce4ui.patch )
+
+	XFCONF=(
+		--disable-static
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS THANKS )
+}
+
+src_prepare() {
+	# http://bugzilla.xfce.org/show_bug.cgi?id=9654
+	sed -i -e '/Encoding/d' panel-plugin/datetime.desktop.in.in || die
+
+	# http://bugzilla.xfce.org/show_bug.cgi?id=8064#c2
+	sed -i -e 's:BM_DEBUG_SUPPORT:XDT_FEATURE_DEBUG:' configure.in || die
+
+	xfconf_src_prepare
+}