New release: 1.4.2.1. Pruning old ebuilds.

(Portage version: 2.0.53_rc7)

7 files changed, 20 insertions, 120 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index e90c68a0ad3b..e9dee8841760 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.65 2005/11/05 05:14:14 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.66 2005/12/01 20:36:19 leonardop Exp $
+
+*evolution-data-server-1.4.2.1 (01 Dec 2005)
+
+  01 Dec 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +evolution-data-server-1.4.2.1.ebuild:
+  New version.
 
 *evolution-data-server-1.4.1.1 (05 Nov 2005)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index e686906cc290..3a9a62ca54f8 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,31 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 458fe2a741eb6e94f94f5c905c5f5311 ChangeLog 9372
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
-MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435
 MD5 e3a6586c651eb7025b3a7e6aec86c1b2 evolution-data-server-1.2.3.ebuild 2538
 MD5 36265d101a2a38d3dd1d8c529614017b evolution-data-server-1.4.1.1.ebuild 3599
-MD5 62dd958691eb50756052ee79439d8d8e evolution-data-server-1.4.1.ebuild 3597
+MD5 0d68c0fff811291c4e167b9c9361d97b evolution-data-server-1.4.2.1.ebuild 3497
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
-MD5 468aae2242720428d82b966c8066c9f8 files/digest-evolution-data-server-1.4.1 82
 MD5 669f789ef1cc9df48729b5edecef2d52 files/digest-evolution-data-server-1.4.1.1 84
+MD5 4355466348971909faf3899483361ad5 files/digest-evolution-data-server-1.4.2.1 84
 MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
 MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbD/DomPajV0RnrERAgR8AJ4rPRc/VDqOd9WFo3or1a+FjaDC+gCeJIS6
-/Ae/OJweHBgFonU9NAPJ9NM=
-=WKsX
------END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild
deleted file mode 100644
index 07ca0d4a9224..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 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-1.2.1-r1.ebuild,v 1.10 2005/07/17 14:38:09 allanonjl Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.ximian.com/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
-IUSE="doc ldap mozilla ssl ipv6 nntp kerberos"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.2.2
-	gnome-base/libgnomeui
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		  !mozilla? ( >=dev-libs/nspr-4.4
-					  >=dev-libs/nss-3.9 )
-		   )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} `use_with ldap openldap` \
-		`use_enable ssl nss` \
-		`use_enable ssl smime` \
-		`use_enable ipv6` \
-	    `use_enable nntp`"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR=1
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-	epatch ${FILESDIR}/${P}-local-provider.patch
-}
-
-src_compile() {
-	cd ${S}/libdb/dist
-	./s_config || die
-
-	cd ${S}
-	local myconf=""
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/$(get_libdir)/mozilla
-			NSPR_LIB=/usr/$(get_libdir)/mozilla
-			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
-			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/$(get_libdir)/nss
-			NSPR_LIB=/usr/$(get_libdir)/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-	emake || die "compile failed"
-
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild
index 3d50ba95c38c..9b850047c87e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-1.4.1.ebuild,v 1.2 2005/10/25 15:17:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild,v 1.1 2005/12/01 20:36:19 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ximian.com/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl static"
+IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl"
 
 RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libbonobo-2.4.2
@@ -53,10 +53,7 @@ pkg_setup() {
 		$(use_enable ssl nss)          \
 		$(use_enable ssl smime)        \
 		$(use_enable ipv6)             \
-		$(use_enable nntp)             \
-		$(use_enable static)"
-
-	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+		$(use_enable nntp)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
@@ -75,14 +72,17 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
 	# upstream gcc4 fix
-	epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
+	epatch "${FILESDIR}"/${PN}-1.2.3-gcc4.patch
 
 	# Resolve symbols at execution time for setgid binaries
-	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
 
-	export WANT_AUTOMAKE=1.7
+	sed -n -e '/GNOME_COMPILE_WARNINGS/,/dnl IT_PROG_INTLTOOL/p' \
+		aclocal.m4 > gnome.m4
+	export WANT_AUTOMAKE=1.9
+	aclocal -I . || die "aclocal failed"
 	automake || die "automake failed"
 }
 
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1
deleted file mode 100644
index 8feb176d6f6b..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c86cc41c1563f552015aebb563018936 evolution-data-server-1.2.1.tar.bz2 7454633
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1
deleted file mode 100644
index b6699e2936cb..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af8f53c4ea524df861a6f2eb1ea75ad9 evolution-data-server-1.4.1.tar.bz2 14175490
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.2.1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.2.1
new file mode 100644
index 000000000000..dc33ba6dd2da
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.2.1
@@ -0,0 +1 @@
+MD5 8b058aff089cf3a6c13cc9f51f536ae8 evolution-data-server-1.4.2.1.tar.bz2 14234151