Version bump.

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

5 files changed, 39 insertions, 75 deletions

diff --git a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
index 28f994c4cd80..26ac8a119b70 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-cpugraph-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.10 2010/11/27 18:06:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.11 2010/12/05 16:52:44 ssuominen Exp $
+
+*xfce4-cpugraph-plugin-1.0.1 (05 Dec 2010)
+
+  05 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-cpugraph-plugin-1.0.1.ebuild:
+  Version bump.
 
   27 Nov 2010; Raúl Porcel <armin76@gentoo.org>
   xfce4-cpugraph-plugin-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
deleted file mode 100644
index ed7bbb002c10..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- panel-plugin/cpu.c
-+++ panel-plugin/cpu.c
-@@ -27,6 +27,7 @@
- #include "settings.h"
- #include "cpu_os.h"
- 
-+#include <stdlib.h>
- 
- static GtkTooltips *tooltips = NULL;
- 
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
deleted file mode 100644
index ac2f2be26fc7..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-0.4.0-link_to_libxfcegui4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fixed in upstream:
-
-http://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin/patch/?id=505a9fa19a7b9c3ff48a161cd1c392e07a2db94b
-
---- configure.ac
-+++ configure.ac
-@@ -31,6 +31,7 @@
- 
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
- 
- dnl translations
- XDT_I18N([be ca cs en_GB eu fr hu nb_NO pl pt_PT sq uk])
---- panel-plugin/Makefile.am
-+++ panel-plugin/Makefile.am
-@@ -3,10 +3,12 @@
- 
- xfce4_cpugraph_plugin_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
--	@LIBXFCE4PANEL_CFLAGS@
-+	@LIBXFCE4PANEL_CFLAGS@					\
-+	@LIBXFCEGUI4_CFLAGS@
- 
- xfce4_cpugraph_plugin_LDADD =					\
--	@LIBXFCE4PANEL_LIBS@
-+	@LIBXFCE4PANEL_LIBS@					\
-+	@LIBXFCEGUI4_LIBS@
- 
- xfce4_cpugraph_plugin_SOURCES =					\
- 	mode.c		\
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild
deleted file mode 100644
index a5e9c01a4c61..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-0.4.0.ebuild,v 1.4 2010/08/30 14:44:21 ssuominen Exp $
-
-EAPI=2
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="CPU load panel plugin"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.4/${P}.tar.gz"
-
-LICENSE="BSD"
-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=">=xfce-base/xfce4-panel-4.3.20
-	>=xfce-base/libxfcegui4-4.3.20"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-free_and_realloc.patch
-		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
-		)
-	XFCONF="--disable-dependency-tracking
-		$(xfconf_use_debug)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.1.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.1.ebuild
new file mode 100644
index 000000000000..28d365ca8f19
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.1.ebuild,v 1.1 2010/12/05 16:52:44 ssuominen Exp $
+
+EAPI=3
+inherit xfconf
+
+DESCRIPTION="Xfce's system load panel plug-in"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
+
+LICENSE="BSD 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=">=xfce-base/libxfcegui4-4.3.20
+	>=xfce-base/xfce4-panel-4.3.20
+	>=x11-libs/gtk+-2.12:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+}