alpha/ia64/sparc stable wrt #358407

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

4 files changed, 6 insertions, 73 deletions

diff --git a/app-office/orage/ChangeLog b/app-office/orage/ChangeLog
index 43eabb354912..a2c962a14d40 100644
--- a/app-office/orage/ChangeLog
+++ b/app-office/orage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/orage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.43 2011/03/29 13:04:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.44 2011/04/23 17:27:59 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> orage-4.8.1.ebuild:
+  alpha/ia64/sparc stable wrt #358407
 
   29 Mar 2011; Jeroen Roovers <jer@gentoo.org> orage-4.8.1.ebuild:
   Stable for HPPA (bug #358407).
diff --git a/app-office/orage/files/orage-4.7.5-asneeded.patch b/app-office/orage/files/orage-4.7.5-asneeded.patch
deleted file mode 100644
index 094404809b03..000000000000
--- a/app-office/orage/files/orage-4.7.5-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur orage-4.7.5.16.orig/globaltime/Makefile.am orage-4.7.5.16/globaltime/Makefile.am
---- orage-4.7.5.16.orig/globaltime/Makefile.am	2010-03-04 09:34:55.000000000 +0200
-+++ orage-4.7.5.16/globaltime/Makefile.am	2010-04-19 18:35:33.000000000 +0300
-@@ -26,6 +26,7 @@
- 
- globaltime_CFLAGS =							\
- 	$(LIBXFCEGUI4_CFLAGS)					\
-+	$(LIBXFCE4PANEL_CFLAGS)					\
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"		\
- 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
- 
-diff -ur orage-4.7.5.16.orig/panel-plugin/Makefile.am orage-4.7.5.16/panel-plugin/Makefile.am
---- orage-4.7.5.16.orig/panel-plugin/Makefile.am	2010-03-04 09:34:55.000000000 +0200
-+++ orage-4.7.5.16/panel-plugin/Makefile.am	2010-04-19 18:32:05.000000000 +0300
-@@ -9,6 +9,7 @@
- 
- xfce4_orageclock_plugin_LDFLAGS =						\
- 	@LIBXFCE4PANEL_LIBS@                            \
-+	@LIBXFCEGUI4_LIBS@				\
- 	-lX11
- 
- xfce4_orageclock_plugin_SOURCES = 						\
diff --git a/app-office/orage/orage-4.7.5.ebuild b/app-office/orage/orage-4.7.5.ebuild
deleted file mode 100644
index 6fd9922bdd66..000000000000
--- a/app-office/orage/orage-4.7.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.7.5.ebuild,v 1.12 2011/01/30 08:20:29 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-inherit flag-o-matic xfconf
-
-DESCRIPTION="Xfce's calendar suite (with panel plug-in)"
-HOMEPAGE="http://www.xfce.org/projects/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/4.7/${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 ~x86-linux ~x86-solaris"
-IUSE="berkdb dbus debug libnotify"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfce4-panel-4.6
-	>=dev-libs/libical-0.43
-	berkdb? ( >=sys-libs/db-4 )
-	libnotify? ( <x11-libs/libnotify-0.7 )
-	dbus? ( >=dev-libs/dbus-glib-0.88 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${P}.16
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-asneeded.patch )
-
-	XFCONF=(
-		--disable-dependency-tracking
-		$(use_enable dbus)
-		$(use_enable libnotify)
-		$(use_with berkdb bdb4)
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_configure() {
-	append-flags -I/usr/include/libical
-	xfconf_src_configure
-}
diff --git a/app-office/orage/orage-4.8.1.ebuild b/app-office/orage/orage-4.8.1.ebuild
index 0ca99b989354..c9f865e4d108 100644
--- a/app-office/orage/orage-4.8.1.ebuild
+++ b/app-office/orage/orage-4.8.1.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/app-office/orage/orage-4.8.1.ebuild,v 1.6 2011/03/29 13:04:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.1.ebuild,v 1.7 2011/04/23 17:27:59 ssuominen Exp $
 
 EAPI=3
 inherit flag-o-matic xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/4.8/${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 ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
 
 RDEPEND=">=dev-libs/libical-0.43