Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 6 insertions, 274 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index c53a13034bc9..6f184851bba5 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.296 2011/03/22 19:22:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.297 2011/03/23 08:00:26 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -evolution-data-server-2.30.2.ebuild,
+  -evolution-data-server-2.32.1-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   evolution-data-server-2.32.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild
deleted file mode 100644
index 5dc64345c326..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 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-2.30.2.ebuild,v 1.12 2011/01/15 19:55:02 nirbheek Exp $
-
-EAPI="2"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 kerberos gnome-keyring ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.18
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.4
-	>=dev-libs/libgweather-2.25.4:2
-	>=dev-libs/libical-0.43
-	>=dev-libs/dbus-glib-0.6
-	>=sys-libs/db-4
-	sys-libs/zlib
-	virtual/libiconv
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	sys-devel/bison
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with kerberos krb5 /usr)
-		$(use_with ldap openldap)
-		$(use_enable gnome-keyring)
-		$(use_enable ipv6)
-		$(use_enable ssl ssl)
-		$(use_enable ssl smime)
-		--with-weather
-		--enable-largefile
-		--with-libdb=/usr/$(get_libdir)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
-
-	# GNOME bug 611353 (skips failing test atm)
-	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	sed -i -e '/test-ebook-stress-factory--fifo/d' addressbook/tests/ebook/Makefile.am \
-		|| die "failing test sed 1 failed"
-	sed -i -e '/test_ebook_stress_factory__fifo/d' addressbook/tests/ebook/Makefile.am \
-		|| die "failing test sed 2 failed"
-
-	# Revert "Bug 619347 - Return formatted address in e_destination_get_address"
-	epatch "${FILESDIR}/${P}-revert-addressbook.patch"
-
-	# /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_CPPFLAGS="$WARNING_FLAGS/AM_CPPFLAGS="/' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	Xemake check || die "Tests failed."
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libedata-cal-1.2.so.6
-	preserve_old_lib /usr/$(get_libdir)/libedataserver-1.2.so.11
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libedata-cal-1.2.so.6
-	preserve_old_lib_notify /usr/$(get_libdir)/libedataserver-1.2.so.11
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.1-r1.ebuild
deleted file mode 100644
index 51e714801e4b..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 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-2.32.1-r1.ebuild,v 1.4 2011/01/15 19:55:02 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-SRC_URI="${SRC_URI} mirror://gentoo/${P}-patches.tar.bz2"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 kerberos gnome-keyring ldap ssl +weather"
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.6.3
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.4:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	sys-libs/zlib
-	virtual/libiconv
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	weather? ( >=dev-libs/libgweather-2.25.4:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	G2CONF="${G2CONF}
-		$(use_enable gnome-keyring)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
-		$(use_with ldap openldap)
-		$(use_enable ssl ssl)
-		$(use_enable ssl smime)
-		$(use_with weather)
-		--disable-gtk3
-		--enable-largefile
-		--with-libdb=/usr"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
-
-	# Fix building without kerberos, bug #348260
-	epatch "${FILESDIR}/${PN}-2.32.1-no-kerberos.patch"
-
-	# Apply upstream patches committed to gnome-2.32 branch
-	epatch "${WORKDIR}"/${P}-patches/*.patch
-
-	# GNOME bug 611353 (skips failing test atm)
-	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-		-i addressbook/tests/Makefile.{am,in} \
-		|| die "failing test sed 1 failed"
-
-	# Fix build with >=libgdata-0.7
-	epatch "${FILESDIR}/${PN}-2.32.1-libgdata07.patch"
-
-	# /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_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	export XDG_DATA_HOME="${T}"
-	unset DISPLAY
-	Xemake check || die "Tests failed."
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib /usr/$(get_libdir)/$lib
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib_notify /usr/$(get_libdir)/$lib
-	done
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}