old

(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 6 insertions, 140 deletions

diff --git a/xfce-extra/xfce4-datetime-plugin/ChangeLog b/xfce-extra/xfce4-datetime-plugin/ChangeLog
index 4c87379d46a7..08fa9ac0431a 100644
--- a/xfce-extra/xfce4-datetime-plugin/ChangeLog
+++ b/xfce-extra/xfce4-datetime-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-datetime-plugin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.9 2013/02/14 21:22:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.10 2013/02/14 21:23:18 ssuominen Exp $
+
+  14 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-datetime-plugin-0.6.1-r1.ebuild,
+  -files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch:
+  old
 
 *xfce4-datetime-plugin-0.6.2 (14 Feb 2013)
 
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
deleted file mode 100644
index 875e92baaed5..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/files/xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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
deleted file mode 100644
index 63bb7b1d447d..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
-}