From 5b6759823a2ef89d7136ceb047fedf23d46da501 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 10 Dec 2007 00:13:37 +0000 Subject: revdump with the actual patch size != 0 (Portage version: 2.1.4_rc9) --- gnome-extra/evolution-data-server/ChangeLog | 10 +- .../evolution-data-server-1.12.2-r1.ebuild | 141 +++++++++++++++++++++ .../evolution-data-server-1.12.2.ebuild | 141 --------------------- .../files/digest-evolution-data-server-1.12.2 | 3 - .../files/digest-evolution-data-server-1.12.2-r1 | 3 + ...olution-data-server-1.12.2-local-delivery.patch | 13 ++ 6 files changed, 166 insertions(+), 145 deletions(-) create mode 100644 gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-1.12.2.ebuild delete mode 100644 gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2 create mode 100644 gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2-r1 (limited to 'gnome-extra/evolution-data-server') diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 3db1c9593e51..fa2b3b362ea2 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.162 2007/12/08 17:46:25 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.163 2007/12/10 00:13:36 eva Exp $ + +*evolution-data-server-1.12.2-r1 (09 Dec 2007) + + 09 Dec 2007; Gilles Dartiguelongue + files/evolution-data-server-1.12.2-local-delivery.patch, + -evolution-data-server-1.12.2.ebuild, + +evolution-data-server-1.12.2-r1.ebuild: + revbump with the actual fix 08 Dec 2007; Gilles Dartiguelongue +files/evolution-data-server-1.12.2-local-delivery.patch, diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild new file mode 100644 index 000000000000..bf7802d06343 --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2007 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.12.2-r1.ebuild,v 1.1 2007/12/10 00:13:36 eva Exp $ + +inherit db-use eutils flag-o-matic gnome2 autotools + +DESCRIPTION="Evolution groupware backend" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +LICENSE="LGPL-2 Sleepycat" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc ipv6 kerberos keyring krb4 ldap ssl" + +RDEPEND=">=x11-libs/gtk+-2.10 + >=gnome-base/orbit-2.9.8 + >=gnome-base/gnome-vfs-2.4 + >=gnome-base/libbonobo-2.4.2 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=dev-libs/libxml2-2 + keyring? ( gnome-base/gnome-keyring ) + ssl? ( + >=dev-libs/nspr-4.4 + >=dev-libs/nss-3.9 ) + >=gnome-base/libgnomeui-2 + >=net-libs/libsoup-2.2.91 + >=gnome-base/gnome-common-2 + sys-libs/zlib + =sys-libs/db-4* + ldap? ( >=net-nds/openldap-2.0 ) + kerberos? ( virtual/krb5 ) + krb4? ( virtual/krb5 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35.5 + doc? ( >=dev-util/gtk-doc-1.4 )" + +DOCS="ChangeLog MAINTAINERS NEWS TODO" + +pkg_setup() { + G2CONF="$(use_with ldap openldap) \ + $(use_with kerberos krb5 /usr) \ + $(use_enable ssl nss) \ + $(use_enable ssl smime) \ + $(use_enable ipv6) \ + $(use_enable keyring gnome-keyring) \ + --with-libdb=/usr/$(get_libdir)" + + if use krb4 && ! built_with_use virtual/krb5 krb4; then + ewarn + ewarn "In order to add kerberos 4 support, you have to emerge" + ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." + ewarn + ewarn "Skipping for now." + ewarn + G2CONF="${G2CONF} --without-krb4" + else + G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)" + fi +} + +src_unpack() { + gnome2_src_unpack + + # Fix what ? + epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch + + # Fix broken libdb build + epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch + + # Resolve symbols at execution time for setgid binaries + epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch + + # Rewind in camel-disco-diary to fix a crash + epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch + + # Don't assume that endian.h and byteswap.h exist on all non sun os's + epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch + + # Fix selection of mbox for local delivery (bug #201504) + epatch "${FILESDIR}"/${PN}-1.12.2-local-delivery.patch + +#-------------Upstream GNOME look here -----------------# + + # --as-needed fixes + epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch + + # fix for dep ordering so we can add libedataserverui to libexchange-storage + # we need to do this or: undefined reference to `e_passwords_get_password' + # are the kinds of errors you will get. + + # move the groupwise backend and provider for addressbook, camel, and + # calendar to its own folder called server.deps. + mkdir server.deps || die "mkdir server.deps failed" + mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed" + mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed" + mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed" + + # now fix the autotools foo for the new directory and the removed ones + echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed" + + # remove groupwise folder from Makefile's since they are in a diff location + sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed" + + # fix configure.in location of the Makefile's + sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed" + sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed" + # tack on the server.deps Makefile on our last edit + sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed" + + # fix file includes + sed -i -e 's::"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed" + + # Fix db version for FreeBSD users where -ldb is always db-1 + sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed" + +#---------------Upstream GNOME stop here--------------- + eautoreconf +} + +src_compile() { + # Use NSS/NSPR only if 'ssl' is enabled. + if use ssl ; then + sed -i -e "s|mozilla-nss|nss| + s|mozilla-nspr|nspr|" "${S}"/configure + G2CONF="${G2CONF} --enable-nss=yes" + else + G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ + --without-nss-libs --without-nss-includes" + fi + + # /usr/include/db.h is always db-1 on FreeBSD + # so include the right dir in CPPFLAGS + append-cppflags "-I$(db_includedir)" + + cd "${S}" + gnome2_src_compile +} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.2.ebuild deleted file mode 100644 index 9d46f92af62b..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2007 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.12.2.ebuild,v 1.2 2007/12/08 17:46:25 eva Exp $ - -inherit db-use eutils flag-o-matic gnome2 autotools - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://www.gnome.org/projects/evolution/" - -LICENSE="LGPL-2 Sleepycat" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc ipv6 kerberos keyring krb4 ldap ssl" - -RDEPEND=">=x11-libs/gtk+-2.10 - >=gnome-base/orbit-2.9.8 - >=gnome-base/gnome-vfs-2.4 - >=gnome-base/libbonobo-2.4.2 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=gnome-base/libgnome-2 - >=dev-libs/libxml2-2 - keyring? ( gnome-base/gnome-keyring ) - ssl? ( - >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) - >=gnome-base/libgnomeui-2 - >=net-libs/libsoup-2.2.91 - >=gnome-base/gnome-common-2 - sys-libs/zlib - =sys-libs/db-4* - ldap? ( >=net-nds/openldap-2.0 ) - kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35.5 - doc? ( >=dev-util/gtk-doc-1.4 )" - -DOCS="ChangeLog MAINTAINERS NEWS TODO" - -pkg_setup() { - G2CONF="$(use_with ldap openldap) \ - $(use_with kerberos krb5 /usr) \ - $(use_enable ssl nss) \ - $(use_enable ssl smime) \ - $(use_enable ipv6) \ - $(use_enable keyring gnome-keyring) \ - --with-libdb=/usr/$(get_libdir)" - - if use krb4 && ! built_with_use virtual/krb5 krb4; then - ewarn - ewarn "In order to add kerberos 4 support, you have to emerge" - ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." - ewarn - ewarn "Skipping for now." - ewarn - G2CONF="${G2CONF} --without-krb4" - else - G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)" - fi -} - -src_unpack() { - gnome2_src_unpack - - # Fix what ? - epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch - - # Fix broken libdb build - epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch - - # Resolve symbols at execution time for setgid binaries - epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch - - # Rewind in camel-disco-diary to fix a crash - epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch - - # Don't assume that endian.h and byteswap.h exist on all non sun os's - epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch - - # Fix selection of mbox for local delivery (bug #201504) - epatch "${FILESDIR}"/${PN}-1.12.2-local-delivery.patch - -#-------------Upstream GNOME look here -----------------# - - # --as-needed fixes - epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch - - # fix for dep ordering so we can add libedataserverui to libexchange-storage - # we need to do this or: undefined reference to `e_passwords_get_password' - # are the kinds of errors you will get. - - # move the groupwise backend and provider for addressbook, camel, and - # calendar to its own folder called server.deps. - mkdir server.deps || die "mkdir server.deps failed" - mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed" - mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed" - mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed" - - # now fix the autotools foo for the new directory and the removed ones - echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed" - - # remove groupwise folder from Makefile's since they are in a diff location - sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed" - - # fix configure.in location of the Makefile's - sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed" - sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed" - # tack on the server.deps Makefile on our last edit - sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed" - - # fix file includes - sed -i -e 's::"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed" - - # Fix db version for FreeBSD users where -ldb is always db-1 - sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed" - -#---------------Upstream GNOME stop here--------------- - eautoreconf -} - -src_compile() { - # Use NSS/NSPR only if 'ssl' is enabled. - if use ssl ; then - sed -i -e "s|mozilla-nss|nss| - s|mozilla-nspr|nspr|" "${S}"/configure - G2CONF="${G2CONF} --enable-nss=yes" - else - G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ - --without-nss-libs --without-nss-includes" - fi - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - cd "${S}" - gnome2_src_compile -} diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2 deleted file mode 100644 index f1d0b11510e8..000000000000 --- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 591170d71d7fe998236455c1a23860ca evolution-data-server-1.12.2.tar.bz2 7447549 -RMD160 d97219b8ef2d94d4ed0d328f3cb2a3831dc4bac6 evolution-data-server-1.12.2.tar.bz2 7447549 -SHA256 63d43503cd2a991feafd5323f45d38a81e5b72eed667e5e3c50e97e3148cb4b8 evolution-data-server-1.12.2.tar.bz2 7447549 diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2-r1 new file mode 100644 index 000000000000..f1d0b11510e8 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.2-r1 @@ -0,0 +1,3 @@ +MD5 591170d71d7fe998236455c1a23860ca evolution-data-server-1.12.2.tar.bz2 7447549 +RMD160 d97219b8ef2d94d4ed0d328f3cb2a3831dc4bac6 evolution-data-server-1.12.2.tar.bz2 7447549 +SHA256 63d43503cd2a991feafd5323f45d38a81e5b72eed667e5e3c50e97e3148cb4b8 evolution-data-server-1.12.2.tar.bz2 7447549 diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch index e69de29bb2d1..d2543f16e795 100644 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.2-local-delivery.patch @@ -0,0 +1,13 @@ +Index: camel/providers/local/camel-local-provider.c +=================================================================== +--- camel/providers/local/camel-local-provider.c (révision 8259) ++++ camel/providers/local/camel-local-provider.c (révision 8261) +@@ -74,7 +74,7 @@ + N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."), + "mail", + CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL, +- CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, ++ CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, + mbox_conf_entries, + /* ... */ + }; -- cgit v1.2.3-65-gdbad