Clean up old revisions.

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

6 files changed, 7 insertions, 405 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index c4bfaaf5e61a..67187d9067b7 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.335 2011/04/12 11:14:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.336 2011/04/17 17:07:25 eva Exp $
+
+  17 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-2.30.1.2-configure.patch, -evolution-2.30.2-r1.ebuild,
+  -files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch,
+  -evolution-2.32.2-r1.ebuild, metadata.xml:
+  Clean up old revisions.
 
 *evolution-2.32.2-r3 (12 Apr 2011)
 
diff --git a/mail-client/evolution/evolution-2.30.2-r1.ebuild b/mail-client/evolution/evolution-2.30.2-r1.ebuild
deleted file mode 100644
index 461c56e184f0..000000000000
--- a/mail-client/evolution/evolution-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.13 2011/03/21 00:38:47 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 flag-o-matic python versionator
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.30.2-patches.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 OPENLDAP"
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt doc gstreamer kerberos ldap networkmanager nntp pda profile python ssl"
-# pst
-# mono - disabled because it just crashes on startup :S
-
-# Pango dependency required to avoid font rendering problems
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-RDEPEND=">=dev-libs/glib-2.22:2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
-	>=gnome-base/gnome-desktop-2.26.0:2
-	>=gnome-extra/gtkhtml-3.29.6:3.14
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomecanvas-2
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1.1.2:1
-	>=dev-libs/libxml2-2.7.3:2
-	>=dev-libs/libgweather-2.25.3:2
-	>=net-libs/libsoup-2.4:2.4
-	>=media-gfx/gtkimageview-1.6
-	media-libs/libcanberra[gtk]
-	<x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.20
-
-	crypt? ( || (
-				  ( >=app-crypt/gnupg-2.0.1-r2
-					|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt3] ) )
-				  =app-crypt/gnupg-1.4* ) )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	pda? (
-		>=app-pda/gnome-pilot-2.0.16
-		>=app-pda/gnome-pilot-conduits-2 )
-	python? ( =dev-lang/python-2* )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-
-	!<gnome-extra/evolution-exchange-2.30"
-# champlain, geoclue, clutter, gtkimageview
-#	mono? ( >=dev-lang/mono-1 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--enable-image-inline
-		--enable-canberra
-		--enable-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable nntp)
-		$(use_enable gstreamer audio-inline)
-		--disable-pst-import
-		$(use_enable pda pilot-conduits)
-		$(use_enable profile profiling)
-		$(use_enable python)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		--disable-contacts-map"
-
-#		$(use_enable mono)
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	# Do not require unstable libunique
-	epatch "${FILESDIR}/${PN}-2.30.1.2-configure.patch"
-
-	# Apply upstream patches committed to gnome-2.30 branch
-	epatch "${WORKDIR}"/${P}-patches/*.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed"
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-	elog ""
-	elog "Junk filters are now a run-time choice. You will get a choice of"
-	elog "bogofilter or spamassassin based on which you have installed"
-	elog ""
-	elog "You have to install one of these for the spam filtering to actually work"
-}
diff --git a/mail-client/evolution/evolution-2.32.2-r1.ebuild b/mail-client/evolution/evolution-2.32.2-r1.ebuild
deleted file mode 100644
index fb41c3d09628..000000000000
--- a/mail-client/evolution/evolution-2.32.2-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r1.ebuild,v 1.4 2011/03/21 00:38:47 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="python? 2:2.4"
-
-inherit autotools flag-o-matic gnome2 python versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 LGPL-2 OPENLDAP"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt doc gstreamer kerberos ldap networkmanager python ssl"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# contacts-map plugin requires libchaimplain and geoclue
-# glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
-# pst is not mature enough and changes API/ABI frequently
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/libunique-1.1.2:1
-	>=gnome-base/gnome-desktop-2.26:2
-	>=dev-libs/libgweather-2.25.3:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/libnotify-0.3
-	>=gnome-extra/evolution-data-server-${PV}[weather]
-	>=gnome-extra/gtkhtml-3.31.90:3.14
-	>=gnome-base/gconf-2:2
-	dev-libs/atk
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.4:2.4
-	>=media-gfx/gtkimageview-1.6
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.4
-
-	clutter? ( media-libs/clutter:1.0[gtk] )
-	connman? ( net-misc/connman )
-	crypt? ( || (
-				  ( >=app-crypt/gnupg-2.0.1-r2
-					${PINENTRY_DEPEND} )
-				  =app-crypt/gnupg-1.4* ) )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-
-	!<gnome-extra/evolution-exchange-2.32"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	app-text/docbook-xml-dtd:4.1.2
-	>=gnome-base/gnome-common-2.12
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-	G2CONF="${G2CONF}
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--enable-image-inline
-		--enable-canberra
-		--enable-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
-		$(use_enable gstreamer audio-inline)
-		--disable-profiling
-		--disable-pst-import
-		$(use_enable python)
-		$(use_with clutter)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		--disable-contacts-map
-		--without-glade-catalog
-		--disable-mono
-		--disable-gtk3"
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF}
-			--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes"
-	fi
-
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
-
-	# Fix invalid use of la file in contact-editor, upstream bug #635002
-	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac configure || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/-D.*_DISABLE_DEPRECATED//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/plugins \
-		-name "*.la" -delete || die "la files removal failed 1"
-	find "${ED}"/usr/$(get_libdir)/evolution/${MY_MAJORV}/modules \
-		-name "*.la" -delete || die "la files removal failed 2"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
-	elog ""
-	elog "Replace 'firefox %s' with which ever browser you use."
-	elog ""
-	elog "Junk filters are now a run-time choice. You will get a choice of"
-	elog "bogofilter or spamassassin based on which you have installed"
-	elog ""
-	elog "You have to install one of these for the spam filtering to actually work"
-}
diff --git a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
deleted file mode 100644
index 2d94072c62a0..000000000000
--- a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr evolution-2.30.1.2.ORIG//configure.ac evolution-2.30.1.2/configure.ac
---- evolution-2.30.1.2.ORIG//configure.ac	2010-06-14 01:06:50.342000001 +0100
-+++ evolution-2.30.1.2/configure.ac	2010-06-14 01:07:42.948000001 +0100
-@@ -47,7 +47,6 @@
- m4_define([libxml_minimum_version], [2.7.3])
- m4_define([shared_mime_info_minimum_version], [0.22])
- m4_define([libpst_minimum_version], [0.6.41])
--m4_define([unique_minimum_version], [1.1.2])
- m4_define([dbus_glib_minimum_version], [0.74])
- 
- dnl Optional Packages
-@@ -64,14 +63,7 @@
- dnl Compiler Warning Flags
- dnl ******************************
- AS_COMPILER_FLAGS(WARNING_FLAGS,
--	"-DG_DISABLE_DEPRECATED
--	-DPANGO_DISABLE_DEPRECATED
--	-DGDK_PIXBUF_DISABLE_DEPRECATED
--	-DGDK_DISABLE_DEPRECATED
--	-DGTK_DISABLE_DEPRECATED
--	-DG_DISABLE_SINGLE_INCLUDES
--	-DGTK_DISABLE_SINGLE_INCLUDES
--	-Wall -Wextra
-+	"-Wall -Wextra
- 	-Wno-missing-field-initializers
- 	-Wno-sign-compare
- 	-Wno-unused-parameter
-@@ -224,7 +216,7 @@
- 	 libxml-2.0 >= libxml_minimum_version
- 	 shared-mime-info >= shared_mime_info_minimum_version
- 	 gnome-desktop-2.0 >= gnome_desktop_minimum_version
--	 unique-1.0 >= unique_minimum_version])
-+	 unique-1.0 ])
- AC_SUBST(GNOME_PLATFORM_CFLAGS)
- AC_SUBST(GNOME_PLATFORM_LIBS)
- 
diff --git a/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch b/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch
deleted file mode 100644
index 47bd44536325..000000000000
--- a/mail-client/evolution/files/evolution-2.30.3-fix-linking-issues-in-libeshell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7ae36c45c81c8f1f4e837b564ea73c035c34a395 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 8 Sep 2010 18:39:35 +0200
-Subject: [PATCH] Fix linking issues in libeshell
-
----
- shell/Makefile.am |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index 7b742de..64ced47 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -2,6 +2,12 @@ if ENABLE_TEST_COMPONENT
- SUBDIRS = . test
- endif
- 
-+if OS_WIN32
-+eggsm_libs =
-+else
-+eggsm_libs = -lSM -lICE
-+endif
-+
- # Executable
- bin_PROGRAMS = evolution
- 
-@@ -82,7 +88,8 @@ libeshell_la_LIBADD =					\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
- 	$(top_builddir)/widgets/menus/libmenus.la	\
- 	$(GNOME_PLATFORM_LIBS)				\
--	$(SHELL_LIBS)
-+	$(SHELL_LIBS)					\
-+	$(eggsm_libs)
- 
- # Evolution executable
- 
--- 
-1.7.2.2
-
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 19cf151c7cc8..aeb80e407b4a 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -13,10 +13,5 @@
 		<flag name="networkmanager">Allows Evolution to automagically toggle
 			online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
 			and getting the current network state</flag>
-		<flag name="pda">Enable support for syncing Evolution Calendar and
-			Addressbooks with PDAs using <pkg>app-pda/gnome-pilot</pkg> and
-			<pkg>app-pda/gnome-pilot-conduit</pkg></flag>
-		<flag name="profile">Build support for profiling Evolution for
-			development purposes</flag>
 	</use>
 </pkgmetadata>