old

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

6 files changed, 9 insertions, 139 deletions

diff --git a/xfce-extra/xfce4-sensors-plugin/ChangeLog b/xfce-extra/xfce4-sensors-plugin/ChangeLog
index a91624bf3152..b4094a8cef8d 100644
--- a/xfce-extra/xfce4-sensors-plugin/ChangeLog
+++ b/xfce-extra/xfce4-sensors-plugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-sensors-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.29 2012/01/06 11:05:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.30 2012/01/06 11:06:15 ssuominen Exp $
+
+  06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-sensors-plugin-1.0.0-r1.ebuild,
+  -files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch,
+  -files/xfce4-sensors-plugin-1.0.0-missing_includedir.patch,
+  -files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch,
+  -files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch:
+  old
 
   06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-sensors-plugin-1.2.3.ebuild:
diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
deleted file mode 100644
index 46a2178e2673..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6785
-
---- lib/hddtemp.c
-+++ lib/hddtemp.c
-@@ -102,7 +102,12 @@
-     if (!notify_is_initted())
-         notify_init(PACKAGE); /* NOTIFY_APPNAME */
- 
--    nn = notify_notification_new (summary, body, icon, NULL);
-+    nn = notify_notification_new (summary, body, icon
-+    #ifdef HAVE_LIBNOTIFY_07
-+    );
-+    #else
-+    , NULL);
-+    #endif
-     /* FIXME: Use channels or propagate private object or use static global variable */
-     //notify_notification_add_action (nn,
-                             //"confirmed",
---- lib/sensors-interface.c
-+++ lib/sensors-interface.c
-@@ -105,7 +105,12 @@
-                 if (!notify_is_initted())
-                     notify_init(PACKAGE); /* NOTIFY_APPNAME */
- 
--                nn = notify_notification_new(summary, body, icon, NULL);
-+                nn = notify_notification_new(summary, body, icon
-+                #ifdef HAVE_LIBNOTIFY_07
-+                );
-+                #else
-+                , NULL);
-+                #endif
-                 notify_notification_show(nn, &error);
-                 #else
-                 DBG("%s\n%s", summary, body);
diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-missing_includedir.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-missing_includedir.patch
deleted file mode 100644
index 0048608d3a9e..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-missing_includedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Missing -I flag for libxfce4panel/xfce-panel-plugin.h: No such file or directory
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -27,7 +27,8 @@
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- 	@LIBSENSORS_CFLAGS@	\
- 	@LIBXFCE4UTIL_CFLAGS@ \
--	@LIBXFCEGUI4_CFLAGS@
-+	@LIBXFCEGUI4_CFLAGS@ \
-+	@LIBXFCE4PANEL_CFLAGS@
- 
- # @GTK_CFLAGS@ 	\
- # @GLIB_CFLAGS@ \
diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch
deleted file mode 100644
index 97722fec1230..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/318755
-http://bugzilla.xfce.org/show_bug.cgi?id=6603
-
---- lib/configuration.c
-+++ lib/configuration.c
-@@ -107,7 +107,7 @@
-     xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
-                                 sensors->font_size_numerical);
- 
--    xfce_rc_write_entry (rc, "Font", font);
-+    /* xfce_rc_write_entry (rc, "Font", font); */
- 
-     xfce_rc_write_int_entry (rc, "Lines_Size", sensors->lines_size);
- 
diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch
deleted file mode 100644
index 06b0b81e7ca5..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/hddtemp.c
-+++ lib/hddtemp.c
-@@ -72,7 +72,9 @@
- 
- /* forward declaration for GCC 4.3 -Wall */
- 
-+#ifdef HAVE_LIBNOTIFY
- void notification_suppress_messages (NotifyNotification *n, gchar *action, gpointer *data);
-+#endif
- void quick_message_notify (gchar *message);
- void quick_message (gchar *message);
- void read_disks_netcat (t_chip *chip);
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild
deleted file mode 100644
index 750f4273933a..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,64 +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-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild,v 1.6 2011/05/19 21:40:13 ssuominen Exp $
-
-EAPI=4
-EAUTORECONF=yes
-inherit flag-o-matic xfconf
-
-DESCRIPTION="acpi, lm_sensors and hddtemp panel plugin"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="acpi debug hddtemp libnotify lm_sensors"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.4
-	>=xfce-base/libxfcegui4-4.4
-	>=xfce-base/xfce4-panel-4.4
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 )
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	append-cppflags -DHAVE_LIBNOTIFY_07
-
-	PATCHES=(
-		"${FILESDIR}"/${P}-missing_includedir.patch
-		"${FILESDIR}"/${P}-without_libnotify.patch
-		"${FILESDIR}"/${P}-segfault_workaround.patch
-		"${FILESDIR}"/${P}-libnotify-0.7.patch
-	)
-
-	XFCONF=(
-		--disable-static
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable lm_sensors libsensors)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable libnotify notification)
-		$(xfconf_use_debug)
-		)
-
-	if ! use hddtemp && ! use lm_sensors && ! use acpi; then
-		XFCONF+=(
-			--enable-procacpi
-			--enable-sysfsacpi
-			)
-	fi
-
-	DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
-}
-
-src_prepare() {
-	sed -i -e '/-no-undefined/d' src/Makefile.am || die
-	sed -i -e 's/-Werror//' -e '/^XDT_I18N/s/nl//' configure.in || die
-	xfconf_src_prepare
-}