From 5497c14f1bae3f232184dca33f9672c2aa60fc7d Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Sun, 12 May 2013 16:19:58 +0000
Subject: Version bump, drop old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
---
 mail-client/evolution/ChangeLog              |   8 +-
 mail-client/evolution/evolution-3.6.3.ebuild | 148 ---------------------------
 mail-client/evolution/evolution-3.8.0.ebuild | 145 --------------------------
 mail-client/evolution/evolution-3.8.2.ebuild | 145 ++++++++++++++++++++++++++
 4 files changed, 152 insertions(+), 294 deletions(-)
 delete mode 100644 mail-client/evolution/evolution-3.6.3.ebuild
 delete mode 100644 mail-client/evolution/evolution-3.8.0.ebuild
 create mode 100644 mail-client/evolution/evolution-3.8.2.ebuild

(limited to 'mail-client')

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index fec51dd25ade..f4368c5043c8 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.394 2013/04/14 19:01:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.395 2013/05/12 16:19:58 pacho Exp $
+
+*evolution-3.8.2 (12 May 2013)
+
+  12 May 2013; Pacho Ramos <pacho@gentoo.org> +evolution-3.8.2.ebuild,
+  -evolution-3.6.3.ebuild, -evolution-3.8.0.ebuild:
+  Version bump, drop old
 
 *evolution-3.8.1 (14 Apr 2013)
 
diff --git a/mail-client/evolution/evolution-3.6.3.ebuild b/mail-client/evolution/evolution-3.6.3.ebuild
deleted file mode 100644
index b15600d364a0..000000000000
--- a/mail-client/evolution/evolution-3.6.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.3.ebuild,v 1.4 2013/04/11 19:14:57 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# 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] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# also supports gstreamer 1.0
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.0:3
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.38.1:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.8.0
-	!=net-libs/webkit-gtk-1.9.90
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	map? (
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx:1.0 )
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	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:= )
-	map? (
-		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-
-	app-text/yelp-tools
-	>=gnome-base/gnome-common-2.12"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	app-text/highlight
-	!<gnome-extra/evolution-exchange-2.32"
-
-src_prepare() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	# Fix paths for Gentoo spamassassin executables
-	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
-		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--disable-schemas-compile \
-		--without-glade-catalog \
-		--without-kde-applnk-path \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable map contact-maps) \
-		$(use_with ldap openldap) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, edit"
-	elog "~/.local/share/applications/mimeapps.list so it includes the"
-	elog "following content:"
-	elog ""
-	elog "[Default Applications]"
-	elog "x-scheme-handler/http=firefox.desktop"
-	elog "x-scheme-handler/https=firefox.desktop"
-	elog ""
-	elog "(replace firefox.desktop with the name of the appropriate .desktop"
-	elog "file from /usr/share/applications if you use a different browser)."
-	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-3.8.0.ebuild b/mail-client/evolution/evolution-3.8.0.ebuild
deleted file mode 100644
index 37682a157499..000000000000
--- a/mail-client/evolution/evolution-3.8.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.0.ebuild,v 1.4 2013/04/11 19:14:57 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# 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] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.34:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.0:3
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.10.0
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	map? (
-		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-0.99.0
-		x11-libs/mx:1.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? ( || (
-		 ( media-libs/gstreamer:1.0
-		   media-libs/gst-plugins-base:1.0 )
-		 ( media-libs/gstreamer:0.10
-		   media-libs/gst-plugins-base:0.10 )
-	) )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!<gnome-extra/evolution-exchange-2.32"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--disable-schemas-compile \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable bogofilter) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with ldap openldap) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.8.2.ebuild b/mail-client/evolution/evolution-3.8.2.ebuild
new file mode 100644
index 000000000000..7073b5e21af1
--- /dev/null
+++ b/mail-client/evolution/evolution-3.8.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.2.ebuild,v 1.1 2013/05/12 16:19:58 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="+bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# 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] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.4.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7:=
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+	>=gnome-extra/gtkhtml-4.5.2:4.0
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libxml2-2.7.3:2
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.10.0
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	map? (
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-0.99.0
+		x11-libs/mx:1.0 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	gstreamer? ( || (
+		 ( media-libs/gstreamer:1.0
+		   media-libs/gst-plugins-base:1.0 )
+		 ( media-libs/gstreamer:0.10
+		   media-libs/gst-plugins-base:0.10 )
+	) )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!<gnome-extra/evolution-exchange-2.32
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+src_prepare() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-image-inline \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable bogofilter) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gstreamer audio-inline) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spamassassin) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with ldap openldap) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
-- 
cgit v1.2.3-65-gdbad