summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-04-23 17:35:17 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-04-23 17:35:17 +0000
commit4cd0b161fc72136363bf16e2ca90efa2f136e3fa (patch)
tree5ebed7e74f715e106725bc20bde81325e023fc5d /xfce-extra
parentalpha/ia64/sparc stable wrt #358407 (diff)
downloadgentoo-2-4cd0b161fc72136363bf16e2ca90efa2f136e3fa.tar.gz
gentoo-2-4cd0b161fc72136363bf16e2ca90efa2f136e3fa.tar.bz2
gentoo-2-4cd0b161fc72136363bf16e2ca90efa2f136e3fa.zip
alpha/ia64/sparc stable wrt #358407
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/ChangeLog6
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch38
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild33
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild4
4 files changed, 7 insertions, 74 deletions
diff --git a/xfce-extra/xfce4-diskperf-plugin/ChangeLog b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
index 0114aacfe199..32d72adbf976 100644
--- a/xfce-extra/xfce4-diskperf-plugin/ChangeLog
+++ b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-extra/xfce4-diskperf-plugin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.9 2011/03/29 13:12:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.10 2011/04/23 17:35:17 ssuominen Exp $
+
+ 23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-diskperf-plugin-2.3.0.ebuild:
+ alpha/ia64/sparc stable wrt #358407
29 Mar 2011; Jeroen Roovers <jer@gentoo.org>
xfce4-diskperf-plugin-2.3.0.ebuild:
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch
deleted file mode 100644
index e75850c95752..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.2.0-link_to_libxfcegui4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6609
-http://bugs.gentoo.org/show_bug.cgi?id=331505
-
---- configure.in
-+++ configure.in
-@@ -35,6 +35,7 @@
- AC_PROG_CC()
- AC_PROG_LD()
- AC_PROG_INSTALL()
-+AC_PROG_LIBTOOL()
- AC_PROG_INTLTOOL()
-
- dnl **********************************
-@@ -51,6 +52,7 @@
- dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
-
- dnl ***********************************
- dnl *** Check for debugging support ***
---- panel-plugin/Makefile.am
-+++ panel-plugin/Makefile.am
-@@ -22,10 +22,12 @@
- devperf.h
-
- xfce4_diskperf_plugin_CFLAGS = \
-- $(LIBXFCE4PANEL_CFLAGS)
-+ $(LIBXFCE4PANEL_CFLAGS) \
-+ $(LIBXFCEGUI4_CFLAGS)
-
- xfce4_diskperf_plugin_LDADD= \
-- $(LIBXFCE4PANEL_LIBS)
-+ $(LIBXFCE4PANEL_LIBS) \
-+ $(LIBXFCEGUI4_LIBS)
-
- #
- # Desktop file
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
deleted file mode 100644
index cb51fa0a4c3b..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
+++ /dev/null
@@ -1,33 +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-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild,v 1.4 2011/02/04 17:55:51 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Disk usage and performance panel plugin"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/2.2/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfcegui4-4.3.90
- >=xfce-base/xfce4-panel-4.3.90"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
-
-pkg_setup() {
- PATCHES=( "${FILESDIR}"/${P}-link_to_libxfcegui4.patch )
-
- XFCONF=(
- --disable-dependency-tracking
- $(xfconf_use_debug)
- )
-
- DOCS="AUTHORS ChangeLog NEWS README"
-}
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
index ee49dd32c192..c4eaf653c907 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.6 2011/03/29 13:12:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.7 2011/04/23 17:35:17 ssuominen Exp $
EAPI=3
inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/2.3/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="debug"
RDEPEND=">=xfce-base/libxfcegui4-4.3.90