Really fix python deps, drop old

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

3 files changed, 9 insertions, 126 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index eff1a9111dc8..b515125777b9 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.374 2013/07/28 10:19:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.375 2013/07/29 20:34:27 pacho Exp $
+
+  29 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-3.8.3.ebuild:
+  Really fix python deps, drop old
 
   28 Jul 2013; Pacho Ramos <pacho@gentoo.org>
   evolution-data-server-3.8.4.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index df5964e8767a..5ec9c3d20350 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -13,18 +13,16 @@ AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9
 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.6.4.tar.xz 4079620 SHA256 50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e SHA512 01f7537f4c7b4e2d837a5bf33e70fde4bce146af809e3d437010b5b2f73164bb91f2dd04b00136a9167337d619ffcafcbb2605e3fce954a8ae317d62dafe8374 WHIRLPOOL a5c34b4e1b677149232400be98916096983a01c8ae6c55e4c7a7eb2653fca12439460158f39bdbb0e2c2a593b6a6052efe12906e0383fd867884bb65dc4472ef
-DIST evolution-data-server-3.8.3.tar.xz 3929468 SHA256 4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870 SHA512 04a5b66ff7b00478bf6b984a0723cfcd4689ceb435b278c23e7de51e1f29c9503162a49cebe870536f6e99bf63ed1c5d7c5f4ffa55067d0ae5db764b90167576 WHIRLPOOL b0f3209b8b301034c9c4fb3dd2acbd6bc7e4e529678c66aa71ad2311d29c6b93792bdcbc2b902298f25f6f5c9094ec46886e3c1b803a1ff08799d59ad9f69edf
 DIST evolution-data-server-3.8.4.tar.xz 3932296 SHA256 0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e SHA512 fd4b54b896791186a48a7f01e66354eb02fd2ad9b452202869d9e1345b08133e952eb17677e3420469dbde425fbc347c82a40acaddba4766b84b32c42e1599cc WHIRLPOOL 95d937bc9783f1d3fd6a5637aaf837f612ef4669932cfb5f7fa21ed6e4a86dbcec7435d5c1baf0f9d2c7f4629aa27a204199a4cda608fe345869543f3621c975
 EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd
 EBUILD evolution-data-server-3.6.4.ebuild 3789 SHA256 d47ac2a0afdeee3647ba6742e2783ab4152524c353897513acd90cc63e065c77 SHA512 dd08b05dad4a7c44d8f8a670e120d804a90aa04e36a8310b62c208bb3a476f7bc313bbb6b85eedc27b7a00ebe75b7c1a77bb6ed228c1787ee738f6c802fc359e WHIRLPOOL fb282bdfb2b7fcbc2882378d4a10063f3654314baf4db15a42155fc8c7a48f3944c0641a98f936468402e76ab48258962f33547c61b4421aeb5e7abdeb7d2eb9
-EBUILD evolution-data-server-3.8.3.ebuild 3514 SHA256 2bfedf150c9abb0f756f1c5cf51af9995c8f417aecab89ac393f6f7cc771c81a SHA512 d35c3737629320c5f2d418ba2337837077ab00697335eddf6eaf725552431b84809788caa56c516bc9261139c81d50b6cb0dce5426df11f9a1b80eacc8f546bc WHIRLPOOL a860557629e7882badd460b3b406c21e391dbd287d6f0364eb00348ce16bed10d32c211e6b3abada6f83f76bf42ff88fe8e0ffc4d079bee7cf04a1ab69015b52
 EBUILD evolution-data-server-3.8.4.ebuild 3618 SHA256 37a15900045b153d52736b98822dff87d9783d6044b47877a28dda469892e139 SHA512 485bcb8ab8f8205377a8c6f147a021559f953c1fdafd0233fb02f784ffd750e34121c19c1aba5c2fcae62433135647085f39c2e7ab6fbbe087cf3bb42cb0e0bd WHIRLPOOL 9223a9c1ae2552d5f552b8caf159f1cd90b26a9c2ad28870a650f175f946bb1bbd2991ce4e30270417926f597106006b9aabd48ce083918028fc7138c86b0da8
-MISC ChangeLog 73338 SHA256 351221c034260470046a45fd8f2ad5a10e19820770b1e0138ada601928693686 SHA512 b097df9d1daff74d43210e19764b14443695f2400a781f6849b6edafb360ca5cf7bf06b33af9e5284bf29f0ee9a0f0883a5e43faa02308e512cc9a8b316dfbf7 WHIRLPOOL 2169e87534ef3289c4d0c4ad46a6811afc81371c918c72b3f33d8a9ce1ff0818fbb36034736e4ecb30edf444a93c4be76e8b38b233948e109941dbdcc6a14e50
+MISC ChangeLog 73459 SHA256 8dfeb0ebea5c65337ae6452ed8026ed65e9ddaf05dfc9cc895f2afcd06288e57 SHA512 ecc388502a63b9ed4140087ccbb36c35c4739d75eaa5d7c34511f5d3a4cd258ef56254947a96adc6d58e7d0b9309778bba7bb02f1b8d17c7a58513eb9e45c204 WHIRLPOOL 1e02d187e78719e07779ceec3c0fb58c18a9ff6a7de85473b293c451b259ad4750e789d11d9448a9ca12ec780cfe064f9aaea3eb2ace54d45dc1e6c94f8c956d
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH08CsACgkQCaWpQKGI+9T8ewCfSlcr7Cc4u9G/KjeE/edoRSQw
-UpcAnj3BbbrK/qCcH+TZssw+6ZXbcK0Q
-=SZSx
+iEYEAREIAAYFAlH20dUACgkQCaWpQKGI+9Rh7QCfS+9evvXUP+e8ASWWpocLFTjb
+tpsAn00yUsS92SCxe7paSlnKKmQW/+Ao
+=C3Vw
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.3.ebuild
deleted file mode 100644
index 8e01a44ee199..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 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.8.3.ebuild,v 1.1 2013/06/09 18:31:25 pacho Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3,3} )
-GCONF_DEBUG="no"
-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="http://projects.gnome.org/evolution/arch.shtml"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # 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
-	>=dev-libs/libical-0.43:=
-	>=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.7.90 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.5:2= )
-"
-DEPEND="${RDEPEND}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=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() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	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 introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		$(use_enable gtk) \
-		--enable-google \
-		--enable-nntp \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--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
-}