From 15fe8a5bfce44b6843fee0311c7e06d98a20ac98 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Mon, 29 Aug 2005 14:46:39 +0000 Subject: [PATCH] New release: 1.3.8 Package-Manager: portage-2.0.51.22-r2 --- gnome-extra/evolution-data-server/ChangeLog | 9 +++- gnome-extra/evolution-data-server/Manifest | 32 ++++------- ...ild => evolution-data-server-1.3.8.ebuild} | 54 ++++++++++--------- .../files/digest-evolution-data-server-1.3.7 | 1 - .../files/digest-evolution-data-server-1.3.8 | 1 + ...olution-data-server-no_lazy_bindings.patch | 7 --- 6 files changed, 50 insertions(+), 54 deletions(-) rename gnome-extra/evolution-data-server/{evolution-data-server-1.3.7.ebuild => evolution-data-server-1.3.8.ebuild} (64%) delete mode 100644 gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7 create mode 100644 gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.8 diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 16b67e60dd53..381a5c49d62c 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.57 2005/08/22 22:23:37 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.58 2005/08/29 14:46:39 leonardop Exp $ + +*evolution-data-server-1.3.8 (29 Aug 2005) + + 29 Aug 2005; Leonardo Boshell + files/evolution-data-server-no_lazy_bindings.patch, + -evolution-data-server-1.3.7.ebuild, +evolution-data-server-1.3.8.ebuild: + New version. Fixed patch. Added 'firefox' USE flag. 22 Aug 2005; Bryan Østergaard evolution-data-server-1.2.3.ebuild: diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index da0d51d0d700..04220b500c24 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,29 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435 +MD5 a1f53081e411a455ef01bbb90b5c67b2 ChangeLog 8280 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065 -MD5 0b3c1730fda1bca5e6b717b5a300a45f evolution-data-server-1.2.3.ebuild 2538 -MD5 b55f743791e3461e995f4e097c654190 evolution-data-server-1.3.7.ebuild 3023 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983 -MD5 88cdfac6b1b0c170f1a172eda41643f6 ChangeLog 7993 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985 -MD5 4c61f05d129cfd23c538a74d9c125aa6 files/evolution-data-server-no_lazy_bindings.patch 706 +MD5 e632847e52150e28b4881f55c63fbffa evolution-data-server-1.3.8.ebuild 3460 +MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435 +MD5 0b3c1730fda1bca5e6b717b5a300a45f evolution-data-server-1.2.3.ebuild 2538 +MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81 -MD5 284833d0d5526c2c3317c0a1bd375a38 files/digest-evolution-data-server-1.3.7 82 +MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81 +MD5 f2d47934cc5c234ea714baceef77d563 files/digest-evolution-data-server-1.3.8 82 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 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81 +MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551 MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82 -MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDC8uugIKl8Uu19MoRAhYzAJ9bUWqcdPsQ7b3VploPJXSYUkeHrgCfTh3t -1v58vG6F/7pxzsPEy+xg9JM= -=L9Bl ------END PGP SIGNATURE----- +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 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.3.8.ebuild similarity index 64% rename from gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-1.3.8.ebuild index eaf10bca8917..206165c7dc84 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.3.8.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.3.7.ebuild,v 1.1 2005/08/17 22:00:43 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.3.8.ebuild,v 1.1 2005/08/29 14:46:39 leonardop Exp $ inherit eutils gnome2 @@ -10,31 +10,33 @@ HOMEPAGE="http://www.ximian.com/" LICENSE="GPL-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 firefox ipv6 kerberos krb4 ldap mozilla nntp ssl static" RDEPEND=">=dev-libs/glib-2.4 >=gnome-base/libbonobo-2.4.2 >=gnome-base/orbit-2.9.8 - gnome-base/libgnomeui + >=gnome-base/libgnomeui-2 >=gnome-base/gnome-vfs-2 >=gnome-base/libgnome-2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2 + >=x11-libs/gtk+-2 >=gnome-base/libglade-2 >=net-libs/libsoup-2.2.2 sys-libs/zlib ldap? ( >=net-nds/openldap-2.0 ) ssl? ( - mozilla? ( www-client/mozilla ) - !mozilla? ( + mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) ) + firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 ) + !mozilla? ( !firefox? ( >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) ) + >=dev-libs/nss-3.9 ) ) ) kerberos? ( virtual/krb5 ) krb4? ( virtual/krb5 )" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.30 + >=dev-util/intltool-0.28 doc? ( >=dev-util/gtk-doc-1 )" MAKEOPTS="${MAKEOPTS} -j1" @@ -49,27 +51,31 @@ pkg_setup() { use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)" - # 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 - + # Use NSS/NSPR only if 'ssl' is enabled. They can be used from + # mozilla/firefox if the relevant USE flags are enabled. 'firefox' take + # precedence over 'mozilla'. 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 + if use firefox; then + NSS_LIB=$(pkg-config --variable=libdir firefox-nss) + NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss + NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr) + NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr + elif use mozilla; then + NSS_LIB=$(pkg-config --variable=libdir mozilla-nss) + NSS_INC=$(pkg-config --variable=includedir mozilla-nss)/nss + NSPR_LIB=$(pkg-config --variable=libdir mozilla-nspr) + NSPR_INC=$(pkg-config --variable=includedir mozilla-nspr)/nspr else NSS_LIB=/usr/$(get_libdir)/nss - NSPR_LIB=/usr/$(get_libdir)/nspr NSS_INC=/usr/include/nss + NSPR_LIB=/usr/$(get_libdir)/nspr NSPR_INC=/usr/include/nspr fi - G2CONF="${G2CONF} --enable-nss=yes \ + G2CONF="${G2CONF} \ --with-nspr-includes=${NSPR_INC} \ - --with-nspr-libs=${NSPR_LIB} \ - --with-nss-includes=${NSS_INC} \ + --with-nspr-libs=${NSPR_LIB} \ + --with-nss-includes=${NSS_INC} \ --with-nss-libs=${NSS_LIB}" else G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ @@ -90,8 +96,8 @@ pkg_setup() { } src_unpack() { - unpack ${A} - cd ${S} + unpack "${A}" + cd "${S}" epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch # upstream gcc4 fix @@ -105,9 +111,9 @@ src_unpack() { } src_compile() { - cd ${S}/libdb/dist + cd "${S}/libdb/dist" ./s_config || die - cd ${S} + cd "${S}" gnome2_src_compile } diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7 deleted file mode 100644 index 0b9b7fa0bdab..000000000000 --- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 e05fe0e8607ed4403b19a9d3f407e8f9 evolution-data-server-1.3.7.tar.bz2 14453689 diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.8 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.8 new file mode 100644 index 000000000000..4ee5e13a7901 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.8 @@ -0,0 +1 @@ +MD5 c6b2992c9a8f758a4a77511a4c2d5cfd evolution-data-server-1.3.8.tar.bz2 15019129 diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch index cdd8f43c458d..a094433c8c93 100644 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch @@ -10,10 +10,3 @@ diff -NurdB evolution-data-server-1.3.7/camel/Makefile.am evolution-data-server- # NOTE: This needs to be cleaned up, it shouldn't link with all this crap, # because it might be setuid. camel_lock_helper_1_2_LDADD = \ -@@ -331,4 +333,4 @@ - ChangeLog.pre-1-4 \ - README - --DISTCLEANFILES = $(pkgconfig_DATA) -\ No newline at end of file -+DISTCLEANFILES = $(pkgconfig_DATA) -- 2.26.2