From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q9bWk-00011g-4X for garchives@archives.gentoo.org; Tue, 12 Apr 2011 11:12:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 496DCE0512; Tue, 12 Apr 2011 11:12:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0A369E0512 for ; Tue, 12 Apr 2011 11:12:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2895B1B40F3 for ; Tue, 12 Apr 2011 11:12:46 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2262) id B9EE920054; Tue, 12 Apr 2011 11:12:44 +0000 (UTC) From: "Pacho Ramos (pacho)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pacho@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server: ChangeLog evolution-data-server-2.32.2-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog evolution-data-server-2.32.2-r1.ebuild X-VCS-Directories: gnome-extra/evolution-data-server X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos Content-Type: text/plain; charset=utf8 Message-Id: <20110412111244.B9EE920054@flycatcher.gentoo.org> Date: Tue, 12 Apr 2011 11:12:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9fd05c05641ebde9a0328b2c6c93b6d2 pacho 11/04/12 11:12:44 Modified: ChangeLog Added: evolution-data-server-2.32.2-r1.ebuild Log: Apply upstream fixes and backports from master and 2.32 branch, force s= sl usage as told by upstream in upstream bug #642984. =20 (Portage version: 2.1.9.45/cvs/Linux x86_64) Revision Changes Path 1.300 gnome-extra/evolution-data-server/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/ChangeLog?rev=3D1.300&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/ChangeLog?rev=3D1.300&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/ChangeLog?r1=3D1.299&r2=3D1.300 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/Chang= eLog,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- ChangeLog 10 Apr 2011 21:54:05 -0000 1.299 +++ ChangeLog 12 Apr 2011 11:12:44 -0000 1.300 @@ -1,6 +1,13 @@ # 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/Cha= ngeLog,v 1.299 2011/04/10 21:54:05 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/Cha= ngeLog,v 1.300 2011/04/12 11:12:44 pacho Exp $ + +*evolution-data-server-2.32.2-r1 (12 Apr 2011) + + 12 Apr 2011; Pacho Ramos + +evolution-data-server-2.32.2-r1.ebuild: + Apply upstream fixes and backports from master and 2.32 branch, force = ssl + usage as told by upstream in upstream bug #642984. =20 10 Apr 2011; Gilles Dartiguelongue -files/evolution-data-server-1.8.0-camel-rewind.patch, 1.1 gnome-extra/evolution-data-server/evolution-data-ser= ver-2.32.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/evolution-data-server-2.32.2-r1.ebuild?rev=3D1.1&view=3Dm= arkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/evolution-data-server-2.32.2-r1.ebuild?rev=3D1.1&content-= type=3Dtext/plain Index: evolution-data-server-2.32.2-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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/evol= ution-data-server-2.32.2-r1.ebuild,v 1.1 2011/04/12 11:12:44 pacho Exp $ EAPI=3D"3" GCONF_DEBUG=3D"no" inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx DESCRIPTION=3D"Evolution groupware backend" HOMEPAGE=3D"http://projects.gnome.org/evolution/" SRC_URI=3D"${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar= .bz2" LICENSE=3D"LGPL-2 BSD DB" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x= 86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" IUSE=3D"doc ipv6 kerberos gnome-keyring ldap +weather" RDEPEND=3D">=3Ddev-libs/glib-2.25.12:2 >=3Dx11-libs/gtk+-2.20:2 >=3Dgnome-base/gconf-2 >=3Ddev-db/sqlite-3.5 >=3Ddev-libs/libgdata-0.6.3 >=3Ddev-libs/libical-0.43 >=3Dnet-libs/libsoup-2.4:2.4 >=3Ddev-libs/libxml2-2 >=3Dsys-libs/db-4 sys-libs/zlib virtual/libiconv >=3Ddev-libs/nspr-4.4 >=3Ddev-libs/nss-3.9 gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=3Dnet-nds/openldap-2 ) weather? ( >=3Ddev-libs/libgweather-2.25.4:2 ) " DEPEND=3D"${RDEPEND} dev-util/gperf >=3Ddev-util/pkgconfig-0.9 >=3Ddev-util/intltool-0.35.5 sys-devel/bison >=3Dgnome-base/gnome-common-2 >=3Ddev-util/gtk-doc-am-1.9 doc? ( >=3Ddev-util/gtk-doc-1.9 )" # eautoreconf needs: # >=3Dgnome-base/gnome-common-2 # >=3Ddev-util/gtk-doc-am-1.9 pkg_setup() { DOCS=3D"ChangeLog MAINTAINERS NEWS TODO" # ssl stuff always enabled as recommended in upstream bug #642984 G2CONF=3D"${G2CONF} $(use_enable gnome-keyring) $(use_enable ipv6) $(use_with kerberos krb5 /usr) $(use_with ldap openldap) $(use_with weather) --disable-gtk3 --enable-largefile --with-libdb=3D/usr --enable-ssl --enable-smime" } src_prepare() { gnome2_src_prepare # Adjust to gentoo's /etc/service epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.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 =3D.*\)ebook/\1/' \ -i addressbook/tests/Makefile.{am,in} \ || die "failing test sed 1 failed" # Fix build with >=3Dlibgdata-0.7 epatch "${FILESDIR}/${PN}-2.32.1-libgdata07.patch" # Apply multiple backports and fixed from master and 2.32 branches epatch "${WORKDIR}/${P}-patches"/*.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=3D"\)$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=3D$(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/openlda= p/schema/evolutionperson.schema fi } src_test() { unset DBUS_SESSION_BUS_ADDRESS unset ORBIT_SOCKETDIR unset SESSION_MANAGER export XDG_DATA_HOME=3D"${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/s= chema" fi }