Version bump, drop old

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

4 files changed, 17 insertions, 144 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index bc0bcab31983..6e39ce54963a 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.399 2014/07/23 15:17:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.400 2014/09/24 13:09:36 pacho Exp $
+
+*evolution-data-server-3.12.6 (24 Sep 2014)
+
+  24 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  +evolution-data-server-3.12.6.ebuild, -evolution-data-server-3.10.4.ebuild,
+  -evolution-data-server-3.12.3.ebuild:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org>
   evolution-data-server-3.12.4.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 5ad5d88822f6..1b541b6a3234 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -12,29 +12,17 @@ AUX evolution-data-server-2.32.3-libxml2-2.9.patch 4438 SHA256 db65f8053098409e1
 AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2 SHA512 bb6d512f00e976c708395d9552aaa30afab17ad09c04e57488a11505565542396f450d9121c6ff0d8becca84778ade24873a39fcc785aa62e523fc038f1fe054 WHIRLPOOL e94d4b6c51936b9184401cf36f7cf108cbec2f806bf0a4660289cdd7ebe8a370bb396f77d9cb9d463c741eeaacb655c7771f113b0a79f7b429b4569d1e28e43a
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
-DIST evolution-data-server-3.10.4.tar.xz 3961320 SHA256 5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d SHA512 6ca596f2a99e599316d897f78c0504d0f184c0a8726e48adb8b3450412b624cb388851539f9d7270213b5679404d9a8cd8323e61f4499ed674fdfbe3eb1ce21d WHIRLPOOL 4a37519c690993260c2965a1cdc17f3c2d818c2354ff9720509c8e92d18df8059f2a90fcb4906c707017362b1d91636e65464bd1af2b9f21c2789bfeea391dea
-DIST evolution-data-server-3.12.3.tar.xz 5446584 SHA256 342d96446a9d6bf95bb649f14738a032c1454069201b4743c806ce0d8ad9dd7b SHA512 b51434bd47efeb022eae8e40f35847465014dd31f9d58c35558d171b762bfad5a5c97b9ba27b1120aee4aaf6da044d2c3c17034ce1f3c89b5ec570dce329c622 WHIRLPOOL 1c59b2e065a780a14dd499252c2a48a909405015b4b088d767ae097dc77dcddf975da758616f3b6e68975777b2b855c42efc8fcc602aa4fbe9e3d8dda29be1b7
 DIST evolution-data-server-3.12.4.tar.xz 5450044 SHA256 5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7 SHA512 24e3ff14c54845c22e038034ea537e5a1f9a57cd7d7aab8a5b16db3a40bf394282c47467b2b5829ab577e275eaabcd566b4a9ba1a18dd185f4dbe0818ff94cc8 WHIRLPOOL f8989993970adbcd10fd3511d4ad0ceeff6897509c4f048c3c993be6ef6de858fe1a20889eaeebda096b31b159a5b0dfd68cea191bfad88330c2662cf295ee41
+DIST evolution-data-server-3.12.6.tar.xz 5396524 SHA256 f05ea462b591b24b927afd943258199a4c05f23ff07fa04355bc04bcec15a7c2 SHA512 2d751af6a9481806722031528d5405de006a1d30bcb7dca0a92f9b4f40160e66df7e960ed3d126a10165c9e67788a6663076eb8d8b3c696c0466bb64a269dcce WHIRLPOOL 51ff4a1c13aec816bc10530d583f9a15179584f33783a51efe35158f880c99a55a202802b220689ba2931cb71e4ad83d5c118b593d9093af4a37b5f08e1a80a5
 EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd
-EBUILD evolution-data-server-3.10.4.ebuild 3627 SHA256 1d105ecc1a084de7375e8037dc8d3480e2452de67ef6382d4f69549978d4c8f2 SHA512 9dc7e0d9d799802ed22ef354b6b61832185674acdddff342ae9c829498f2beb4a25cbf781de1a0a71a71b23fc260ba1b90d5a1f6a64b84e00208bd45b4c1c6bb WHIRLPOOL 82c544c105a192d87f5eb14974df500733b6faca380bbb023265a5849e984c156d62407cbe8fa864a49151c29656ba9a53bfadef4aa9be43d07632b4e8d68d90
-EBUILD evolution-data-server-3.12.3.ebuild 3370 SHA256 35e07c874b126c5e2b416bef6389c7fa823ba3441f8f3fa71e1842f3f3248e02 SHA512 ce4e7df6e0ebfd95baaba700495ac0e0ec5223391aa6d9602e1e0a1cd0718feb446e103afa4402b563ae5220bdd5b03a58130701012e3fd412ac4f947e7efabe WHIRLPOOL 1ef5dda2833736fc3f57253fed04d48b04e77e622ab85d5401dcd51b795aa6a2cf58582284de681bb8d582948f66e71d2c4b3f95418b08790475696fcf1bdf32
 EBUILD evolution-data-server-3.12.4.ebuild 3418 SHA256 fad4cbd71ebb534ab8349a655e9f708817736ed98fa9d3be7c858433ec45a0c7 SHA512 f329f0d073e21f473e98fc4b0a8b1945c13f776c540648a1673a8e299182fc8032623fb5eb063330090002754304acd9c06820c4d965d5c7e00356957140b647 WHIRLPOOL 284db3b3144be320d4f17f33beabd0c8dc1221804613a73ae5396a009e852109ad8ce263feca5970967d3e7ddff926b114ddda8feba456b3d9e7faf66a78ab91
-MISC ChangeLog 77289 SHA256 71f4179930ab3a47af3aa62dff502536f1532670fea7f99df92f699e222ca254 SHA512 b1c657533c68738ceb3a97324154d14cd8c35cca716090adee36db7d7aaca0a08e3faa0be7bd7d988bbe91ab79a548ed23df2b9240ad05461145e40cff19c8d5 WHIRLPOOL d800e14ac8cc00d45d3b204290e83625a8defd6b5f6ce1b2dc78e69e6805fdd3c7ac51417c39af36dc2dfaaf34a2f1da432122acb7d045df28478e0a5ffa61e3
+EBUILD evolution-data-server-3.12.6.ebuild 3437 SHA256 5a974a8edaf20f8240c9c919146d565c0fcc91ae158e91d2d65636976b194abf SHA512 50b8f689d76a9f3807af949bc30c174cfee4b7193202154d3ac2facb427a101df1b222a51da1174a078129e19aaff494d03fd4b1430520376a5582bcbfeffbaf WHIRLPOOL 1faedf7118108c204eb622def47c09a1e70771a3d0824e067a447456d439b1d7bf618e8f7f75d6bf95b185b5a042ff6e5799d43e1f0b4a3a5466f23659f90623
+MISC ChangeLog 77526 SHA256 217ea40cf9c3818f77a45ad19b02ae6fdb61713f0148089aaed83e353911c83c SHA512 4576de1338781e071527bb6337265ac4e77ddd729724b9e48b0d9a793437ff34b45e13485342b54e8fea15314c9727c843c1bccd51ccf2c50d91f8a1c1391fc3 WHIRLPOOL ec93fb2d2efef93354a2fb2c0f4f3214fbd34020854d41bd64a32fd11cb99a908a6205b1fdb0cb722503b7befdf7946d4dc39a0c9361461797716f3ab2d5cce8
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9IiAAoJELp701BxlEWf+dMQAL5yaocTl/AzadsXrSX7wBYK
-4sD6OW2vqoRpgA4J6piEWFaJSYJX0P4bL9ch6BamwUAOwgKJq+tRdzeOAajrX9d7
-Lf8HY3+Fz0772euIc6n2MU9pzZSSy2zHg+wWl9OHY8g3rqCleuDI2dXyztHBDySW
-jlZQJn999KcepFW/0sBt5C/jVCzvvtD5D1fheehats3WabzZnAELDY5/RYOn/JrZ
-Vux0R8ToiHOdVT59k0XP4P9Aql6+rhPVqUWXJOYDTkQZQ2TzMLNdrw2siOnWL0HV
-7apUuH7y6rEzSKIyG0WoVDIz1dA+SwpDkqOKJRWYpujlqeaDyf8f8ek5H4SkB71w
-CjLoPgspTa9tlzTKoV59yGhLWP40pQ64OqDpUJXy4had+Mkjg/KHpgqwocUWOCxX
-DUOBS8+zEKpNnxfCLi8VtawkVyxCGwFxHzLT6CiJl2csHfgp8Mj/S5GI3ohuk5Ek
-R9bjnXXkRv2rz9DtMsQ8mW6xnv6vJfoDLFDChkwkeCEiVHwJRNoDj1A+jzjqXmSt
-3ullIMhJstUXEVhrOCNpGYian8CufCW7hNClDPyKGjcMmGFPHtnP46lHqQdpiUXf
-AnDlV4BcJOxd1aW4gk1iuwZMj0oGHbvysJJsAZUZY4IDRyUd5zuzsCy845sOyAd2
-Ui2iMZZjDsWcI5zxeqrs
-=JXVc
+iEYEAREIAAYFAlQiwpEACgkQCaWpQKGI+9T1XACeLB7+0XJkvpMEag4OBhwBnA8b
+RzUAn2144F94M3HeaqeW1lIRmaW3GbRs
+=BOhc
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild
deleted file mode 100644
index 8e2adf7be8ec..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.10.4.ebuild,v 1.6 2014/06/05 06:52:29 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/45" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/libgdata-0.10:=
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-libs/libical-0.43:=
-	<dev-libs/libical-1
-	>=net-libs/libsoup-2.40.3:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4:=
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=app-crypt/gcr-3.4
-
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? ( >=x11-libs/gtk+-3.2:3 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		--enable-google \
-		--enable-nntp \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-uoa
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# every .la file's relink_command field, forcing libtool to look there
-	# first during relinking. This will mangle the .la files installed by
-	# make install, but we don't care because we will be punting them anyway.
-	fix-la-relink-command . || die "fix-la-relink-command failed"
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild
index 62939172dedf..a889c8541af3 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.3.ebuild,v 1.1 2014/06/12 18:25:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild,v 1.1 2014/09/24 13:09:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
 #	>=gnome-base/gnome-common-2
 
 # Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
 # It looks like a nightmare to disable those for now.
 RESTRICT="test"
 
@@ -77,7 +78,7 @@ src_prepare() {
 
 	gnome2_src_prepare
 
-	# FIXME: Fix compilation flags crazyness
+	# Fix compilation flags crazyness, upstream bug #653157
 	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure || die "sed failed"
 }