Fix slot-deps on gnome libs, remove old

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

5 files changed, 15 insertions, 124 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 86dd748a0bcc..7aa3cbaa50dd 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.135 2011/03/22 19:23:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.136 2011/03/23 08:01:35 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -evolution-exchange-2.30.2.ebuild, evolution-exchange-2.30.3.ebuild,
+  -evolution-exchange-2.32.1.ebuild, evolution-exchange-2.32.2.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   evolution-exchange-2.32.2.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.30.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.30.2.ebuild
deleted file mode 100644
index ae69f36cd4b6..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.30.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.30.2.ebuild,v 1.8 2010/10/17 15:43:46 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	>=net-nds/openldap-2.1.30-r2
-	virtual/krb5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-krb5=/usr
-		--with-openldap
-		--disable-static
-		$(use_with debug e2k-debug)
-		$(use_with static static-ldap)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-
-	sed 's:-DG.*DISABLE_SINGLE_INCLUDES::g' -i configure.ac configure \
-		|| die "sed 3 failed"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild
index ff51c95e1edf..43cd003be6a1 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild,v 1.1 2010/09/13 17:46:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild,v 1.2 2011/03/23 08:01:35 nirbheek Exp $
 
 EAPI="2"
 
@@ -17,10 +17,10 @@ IUSE="debug doc static"
 RDEPEND="
 	>=mail-client/evolution-${PV}
 	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	dev-libs/libxml2
+	>=dev-libs/glib-2.16.0:2
+	>=x11-libs/gtk+-2.10:2
+	>=gnome-base/gconf-2.0:2
+	dev-libs/libxml2:2
 	net-libs/libsoup:2.4
 	>=net-nds/openldap-2.1.30-r2
 	virtual/krb5"
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.1.ebuild
deleted file mode 100644
index c8702cf4213e..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.32.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.1.ebuild,v 1.1 2010/11/16 20:34:13 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	>=net-nds/openldap-2.1.30-r2
-	virtual/krb5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-krb5=/usr
-		--with-openldap
-		--disable-static
-		--disable-maintainer-mode
-		--disable-gtk3
-		$(use_enable debug e2k-debug)
-		$(use_with static static-ldap)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure.ac configure || die "sed 1 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild
index 2f2f988e4dfc..e19ebdbefe03 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild,v 1.6 2011/03/22 19:23:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild,v 1.7 2011/03/23 08:01:35 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -20,8 +20,8 @@ RDEPEND="
 	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
 	>=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2
-	dev-libs/libxml2
+	>=gnome-base/gconf-2:2
+	dev-libs/libxml2:2
 	net-libs/libsoup:2.4
 	>=net-nds/openldap-2.1.30-r2
 	virtual/krb5"