alpha/ia64/sparc stable wrt #358407

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

5 files changed, 7 insertions, 98 deletions

diff --git a/xfce-extra/xfce4-verve-plugin/ChangeLog b/xfce-extra/xfce4-verve-plugin/ChangeLog
index 7e2ba15b0abf..3398d782f858 100644
--- a/xfce-extra/xfce4-verve-plugin/ChangeLog
+++ b/xfce-extra/xfce4-verve-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-verve-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.12 2011/03/29 13:16:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.13 2011/04/23 17:45:15 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-verve-plugin-1.0.0.ebuild:
+  alpha/ia64/sparc stable wrt #358407
 
   29 Mar 2011; Jeroen Roovers <jer@gentoo.org> xfce4-verve-plugin-1.0.0.ebuild:
   Stable for HPPA (bug #358407).
diff --git a/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-exo.patch b/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-exo.patch
deleted file mode 100644
index 4ef337b5d94b..000000000000
--- a/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-exo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6616
-
---- configure.in
-+++ configure.in
-@@ -52,7 +52,8 @@
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
--XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3])
-+XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3], [],
-+  [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
diff --git a/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch b/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch
deleted file mode 100644
index dd94d632358a..000000000000
--- a/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6616
-http://bugs.gentoo.org/331493
-
---- configure.in
-+++ configure.in
-@@ -56,6 +56,7 @@
-   [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
- XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
---- panel-plugin/Makefile.am
-+++ panel-plugin/Makefile.am
-@@ -21,14 +21,16 @@
- 	@LIBEXO_CFLAGS@							\
- 	@LIBXFCE4PANEL_CFLAGS@						\
- 	@LIBXFCE4UTIL_CFLAGS@						\
-+	@LIBXFCEGUI4_CFLAGS@						\
- 	@LIBPCRE_CFLAGS@						\
- 	@GLIB_CFLAGS@							\
- 	@GTHREAD_CFLAGS@						
- 
--xfce4_verve_plugin_LDFLAGS = 						\
-+xfce4_verve_plugin_LDADD = 						\
- 	@LIBEXO_LIBS@							\
- 	@LIBXFCE4PANEL_LIBS@						\
- 	@LIBXFCE4UTIL_LIBS@						\
-+	@LIBXFCEGUI4_LIBS@						\
- 	@LIBPCRE_LIBS@							\
- 	@GLIB_LIBS@							\
- 	@GTHREAD_LIBS@
-@@ -43,7 +45,7 @@
- 	-DDBUS_API_SUBJECT_TO_CHANGE					\
- 	$(DBUS_CFLAGS)
- 
--xfce4_verve_plugin_LDFLAGS += 						\
-+xfce4_verve_plugin_LDADD += 						\
- 	$(DBUS_LIBS)
- 
- verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml 
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild
deleted file mode 100644
index 6c0b97fa7cf7..000000000000
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild
+++ /dev/null
@@ -1,39 +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-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild,v 1.6 2011/01/30 00:04:57 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Command line panel plugin"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="dbus debug"
-
-RDEPEND=">=xfce-base/exo-0.3.1.3
-	>=xfce-base/xfce4-panel-4.4
-	>=xfce-base/libxfce4util-4.4
-	>=xfce-base/libxfcegui4-4.4
-	>=dev-libs/libpcre-5
-	dbus? ( >=dev-libs/dbus-glib-0.88 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-exo.patch
-		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
-		)
-	XFCONF=(
-		--disable-dependency-tracking
-		$(use_enable dbus)
-		$(xfconf_use_debug)
-		)
-	DOCS="AUTHORS ChangeLog README THANKS TODO"
-}
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild
index a13859c262e8..a02cf4870908 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.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-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild,v 1.7 2011/03/29 13:16:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild,v 1.8 2011/04/23 17:45:15 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="dbus"
 
 RDEPEND=">=xfce-base/exo-0.3.1.3