Version bump, drop old

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 24 insertions, 168 deletions

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/Manifest b/mail-client/evolution/Manifest
index cd20879336da..d77c7903de79 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -11,21 +11,19 @@ AUX evolution-2.32.3-libxml2-2.9.patch 1649 SHA256 1c9551df454b3fd824c8b9e1e0e0c
 AUX evolution-3.3.91-spamassassin-paths.patch 2223 SHA256 9f2ea27193ff299dd130f562c5b9eb44ddf7825c357db11c72e49bf792f97680 SHA512 9878295882d80d8933fdd8456aed9bd03d118a20b2cff5f364b412337ecd8dd1c4788de5b84db5d35d1ba97097d54b137fc07740764ccc136b2ea7a68687a045 WHIRLPOOL aa6db1419a2516f885ef3bce64723ee03079eb8f3f4a1da35bfed0787ffebfbb37afa66dab534be6885e9759c513ab2e7c5d2729348b8c22d9410cd40de0d5b4
 DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 SHA512 f8514ffc5079ba91448277365fadcec3f4ec949fdef8a5eebd1d529aaa73736721c405088eea363bbf5fc9cac6f8799ed329b53c5369e6acf93ac16eb8d2e7ac WHIRLPOOL 1a9fb503c921705d58ab89aa24495cb85cbd00df8ff6f2fd1f79750213759ee4d4856efe5bf7bd927eff3e250b2c06c0aec448d69fc974bc17a47fb67a49f8bc
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
-DIST evolution-3.6.3.tar.xz 12396872 SHA256 2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25 SHA512 cc2c47d844b5745f6b3632450b91a56b5aad652ce14c796f3f56a99dd52c80b2ccae1ab8fe2d5832022c0e8b1e5529f9bf38fe5efd2d2c5c24ef82d7acae1a27 WHIRLPOOL 43465c0805b019b5f174ad2f5605d5662c2657541452bd271dbf12c4fa95338308e3d968b28ee29d155a202ed9e3d6b085edfd6f43f92576173b117492828506
 DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1 SHA512 a7e162289ac7b29f748c3f3bb65b17b1362831131b5b5aed32f763259b6b54ba7d38d7a59f4df778384fbf2c90e2d4807299c0dc05f576df19ae6a9abf72e4e2 WHIRLPOOL bd86b79c45b8d01557999729b1dc12ab49e5791651c2ae885b30a0ef50a3e78670ca055eb0e242f8aa40f78c1edf8beab3f33a49d57532f0912c48cc58349123
-DIST evolution-3.8.0.tar.xz 12318896 SHA256 6f78bcce1d4da7640dad8d083cc90de3500d51f190a089c723b0dcced690f642 SHA512 ba4f51583476956d76ac1de8f7ee780e6c71d947d133dff3b516f4bfdf7e5732c513173435cdc81e1602c2b6cd42ff223449161a72cd95b50c99337e13f69fde WHIRLPOOL 9363e77c46fe40345af900d1513023321d1f2f9827e034c23e0eda30578e5ef6c27e5e69ce7756f161c6796f941d3b54bfa77b4eaf25ef580b0040244fe424eb
 DIST evolution-3.8.1.tar.xz 12307476 SHA256 89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b SHA512 cde3829a07ea296f007268d94f3e4bb744bd952f2c13a543c2daddfe72c51b396ea72da29d5da288bc33acda596714dac1896a9ad5527b86b2a187d9eb507f38 WHIRLPOOL 23f4612091ffa9a6392e44d0c960f80f72b7eae41e69caf18aa619ad92bf26d718be4e9767f5f87ef10175f7a1f652284d01d815ba9f252ddc1d26ed682fae10
+DIST evolution-3.8.2.tar.xz 12308968 SHA256 6333864015e83c2120ffe7adb262ac3055ac82995a915071440be96e08a73112 SHA512 fc6e53e8649deb7abab3d7f9889f3ee0819002aecf2538900d890e61e0e1cfee96dab414dbe39b7c9f95682fdd843a9168cd394522ee5cc5d87d0aba397a6af4 WHIRLPOOL 31fe1e17f45468c660461f1ec7fa1e9d2f150799e02faa3e7a14e65657e79c26010fb35a1f004cc09f092077f87da214ea47e1f1a12d180ea2841162507acb26
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
-EBUILD evolution-3.6.3.ebuild 4811 SHA256 f653f2a988d1b8e08158904269bc1a352801a208e763d08066e40a9e38b3820d SHA512 222fd6146f3c8425746a4e76df9a1bd0d2f6629e2c99736adca40d944d2e9c4201e6753dd0723c08ddd77479a339ce4afe3683a1d78ef4ace31a20b4ba682ee7 WHIRLPOOL 423dcd55c88043e21e2e5e590cfaf4453ae4b6d55edcbdb267f3e295c738a72444bccd9e29e9a3aa12027c375ac55b0338a127f6751fdabdd558ecbac3b332e8
 EBUILD evolution-3.6.4.ebuild 4771 SHA256 c5851e8b3f8dd190a8399a2b46bb3208ecda459cc9a491ac30e8c0f5cfcb3e63 SHA512 6195b02c98d4facd7ebd694ba7f0357420bccbea4318f41fc2adbf83f5da8bce0e6060d03a40a9444d7b5f5098d1f92a8d4575157c8398843909b26805739454 WHIRLPOOL b146041019c285cfc0d631ad05d4d29941a6d4b8833b784d4365554958f7fcba78d8003d8da724878ac26c3bdbeba7e2272a90f5f50ddade2ba87c214898825a
-EBUILD evolution-3.8.0.ebuild 4590 SHA256 6e7fe16844ac3ce9e5aff6535268fd089357a8dca627ea9bb028ded8f7b64452 SHA512 f5603d41b3ba23e16d770708aaca2b8265fb982e8eb7e05d9ab15a003645bbf017be9e1ab5233459c12508bdcc13132a5a5be9df687384629bef14b02be0d3d3 WHIRLPOOL 68e8f8eb56b690f1af8e4a2c7d12a107613fa10f3ef977a5ada896304fb37b32579b934203187009247a227532ccae0d191859d6a4a22f1abd966fbcba366aa9
 EBUILD evolution-3.8.1.ebuild 4487 SHA256 379281291ca4483445884705a81b2168ad9687a80e509492730d65b120a778c4 SHA512 9d73bda79d20cb9e6c6c46dfdff094f93940d9e6a40de1ddc80c6111ffe5fe796e3ab00bc46bd58e3c4a2b67e0ea0cf45acb9c26f55c46ae155ddae87b4c98b6 WHIRLPOOL 6e5b000113578649739214e52b40d9fbf0b70c50197e76dfbfb2a3b0bb4eb0596b29706ccbf4bcb62cdaf2b60ae29425e1c7e0b90909efccefb890fb2fdf4c9a
-MISC ChangeLog 87968 SHA256 33eddb14e0ba615a266486c4c161bb8fe319a994c789e898d4ec3a8323bf94fd SHA512 d7ec7efa4168e26c084d7bf8bde5ad9bdfddcfdc1301d16e365bea24e7f3e60b08056980bf0d9184599ff37d6605b5462d459b9949ffce27b4fb046a63e67cfb WHIRLPOOL a4a87ac36b0446ab0998b1c10163adaea6349ae66a46726c99f4899bce85b87f5788552f1ad960fc5926899074792ed90e0bf60a24cfe83bed992b16b46cc49e
+EBUILD evolution-3.8.2.ebuild 4490 SHA256 0b463a98638841323d231c4feb317995c3f54a6830c5204b2dbfeaa84e6989a8 SHA512 a3478e77e00e66b46548ef0a666c1e4ad4be6e021981dcb5a142a9e638bd2305ddbcdb22767fe3d86de30d0132f5a827135c2d41e40334bfd3470e893ce7fe36 WHIRLPOOL 5bb6047e44fb3d33051ec32d69b42ee65d03537a5d283e1b35c2b373bdb1d9066e0b1cc26cde9e90f1af71f5b625bd02306c79eed26df764ecfdbe9244c4d497
+MISC ChangeLog 88149 SHA256 6d80210010b460cb407c6320475b9ef1298106879e6e72e846a87d90214cf978 SHA512 a1e12a0924fe3236e372277c1872b99032078c5747e7bdf2689e03bb08608dd0e21d33a189d4fe93f060166f4da5604215eff8804121ffb286ffbe940a7d8247 WHIRLPOOL bec6d44a4372dbfc2a34f49270908098cf81eec0959569403f713f0003fcbdce59eac862a17f582f4908292edf2011305ba1d963a93c9b90a7cfeaf0208068fc
 MISC metadata.xml 1402 SHA256 97c7c33d12acb93e8a196aabc4aeb583853566ccff20edc29c6f518e57455ffc SHA512 f84ab366cd1415ab2eeefb121ec6d90a98306a7445321f0850f96d95c750ff8e8c4a3f47fe0a83b5cb7f6d14e570040cc95bbac39e7432608b0d9547c5c23f93 WHIRLPOOL 9fee0a2143eb8b315e34959e3137eeae1398955c969133724c42833c62e41ac9ef4f5e9e6f7c0e130ea0d45e91cb00538c7849d8be6f54096c4be0e6144f7dd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFq/RUACgkQCaWpQKGI+9QcjQCfVKqrkQL6YzI9H3N3ejLhVAU3
-v6wAnAzGu8AtZtm47PhLUMp7ON/P41MZ
-=k9X/
+iEYEAREIAAYFAlGPwTAACgkQCaWpQKGI+9TZwACeJ6wHzEJaIKK9zsr/stniOqM4
+1aAAniaN8BucRQJL0i0iDSuWXp1/SQ7s
+=Ro2P
 -----END PGP SIGNATURE-----
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.2.ebuild
index 37682a157499..7073b5e21af1 100644
--- a/mail-client/evolution/evolution-3.8.0.ebuild
+++ b/mail-client/evolution/evolution-3.8.2.ebuild
@@ -1,17 +1,15 @@
 # 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 $
+# $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 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
+inherit eutils flag-o-matic readme.gentoo gnome2
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
+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"
@@ -25,7 +23,8 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # 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
+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=
@@ -33,7 +32,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 	>=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
@@ -69,12 +67,14 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
+	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"
+	virtual/pkgconfig
+"
 # eautoreconf needs:
 #	app-text/yelp-tools
 #	>=gnome-base/gnome-common-2.12
@@ -82,7 +82,8 @@ RDEPEND="${COMMON_DEPEND}
 	bogofilter? ( mail-filter/bogofilter )
 	highlight? ( app-text/highlight )
 	spamassassin? ( mail-filter/spamassassin )
-	!<gnome-extra/evolution-exchange-2.32"
+	!<gnome-extra/evolution-exchange-2.32
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
@@ -111,7 +112,6 @@ 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 \