revision bump to fix compilation with libetpan 1.0, see bug 314181. Also incorporate...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 8d03aa3c0ef5cd9c17c90993fc40005d7c5d079f..bb315514f53b7ee220e86c7a3b19e01a89a56662 100644 (file)
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.147 2010/04/18 14:30:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.148 2010/04/20 19:05:11 fauli Exp $
+
+*claws-mail-3.7.5-r1 (20 Apr 2010)
+
+  20 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  +claws-mail-3.7.5-r1.ebuild,
+  +files/claws-mail-3.7.5-fix-libetpan-check.patch:
+  revision bump to fix compilation with libetpan 1.0, see bug 314181. Also
+  incorporate EAPI 2 fixes and cleaner ebuild structure provided by Tim
+  Harder <radhermit AT gmail DOT com> in the same bug
 
   18 Apr 2010; <nixnut@gentoo.org> claws-mail-3.7.5.ebuild:
   ppc stable #304353

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 363b27a5f472c9729aff20d46f9c7069db84536c..2979dc9efef3721faea96267fd967cf357f65ad2 100644 (file)
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX claws-mail-3.7.5-fix-libetpan-check.patch 764 RMD160 9072c6232a8b0be0ce9b6b1be627f4d24a273991 SHA1 e7ac8fc4afb223d0e182e0b09b928121ca568363 SHA256 257192bb1b49d5e945f97200e5f391103392b9ef42e3d1ee4b229ad0f8fe5548
 DIST claws-mail-3.7.2.tar.bz2 5907134 RMD160 f37e7466f06fdf5dd878d45f1acdb04667c5d1b0 SHA1 4e988793ac6258c26d61c06af5b7ecf1e965389f SHA256 ff9adca111965e7785b99ee7a2a1ca2a09665a643f592c96030c16e44c7bdbee
 DIST claws-mail-3.7.3.tar.bz2 5941284 RMD160 321d0b0ab137748df3878d428716e9a8eedbb7e1 SHA1 c1cb978c272f42bfc4ffd20ee6e953c4d06d3702 SHA256 e201da90060bdb79581ed4d6fcc5273d54a5a2649eb9508e0c9e7e6d204ee369
 DIST claws-mail-3.7.4.tar.bz2 5971559 RMD160 e97eab068b1a2d68bae15139fa6adc8f1ffac9b9 SHA1 f848a71e348afd792954bb4eba698d2b54171d7f SHA256 96022a5a2982d945320ce0ffc4e572dbd6b2e9856a0a7de2336c8211cc66089d
@@ -5,6 +9,14 @@ DIST claws-mail-3.7.5.tar.bz2 6060781 RMD160 06ac2bd594d184ed6b5141f4f00e3508b93
 EBUILD claws-mail-3.7.2.ebuild 4638 RMD160 2b74aebd96aaa110b782a097b7b9f1b02878051f SHA1 8480138b9eaf4ea130d7c7e1c252bb2adea9c0c8 SHA256 6f115b58b82d10ebc0bea37fcbdb3d2ab65fc23c8d1e37f37768a46d3d5f600f
 EBUILD claws-mail-3.7.3-r1.ebuild 4677 RMD160 6525f92e78e1896ca44de34d5f6d4f41017670aa SHA1 66131dca9e11d347741bb4f43a2b45b8caa51e72 SHA256 622be66f645202136f36c0f48ca4eda4a5fdb0cd8c2bfc38240d76de8ad58627
 EBUILD claws-mail-3.7.4.ebuild 4674 RMD160 022591a4da5a0d5ea2047461d2ce6ee838214035 SHA1 595f1d3b8d712db264ba45c9aceeda588c43b262 SHA256 4f1b21f9fc85284bfdcfd588deacb3f57202e4e4f832db4ca549e2485e71c69a
+EBUILD claws-mail-3.7.5-r1.ebuild 4817 RMD160 06e3a3d7b3bb3d3808fb6c0f4920680a1cd692c5 SHA1 7745eb77ad13fc5424edb90f5732d9eb67528821 SHA256 98a0a3e3c70059e5c369e44f40bb7f0ee71fdc43574cbae4c1568e1a16f266ed
 EBUILD claws-mail-3.7.5.ebuild 4669 RMD160 1dac469fc6def2b16fe8aa5f637af49488373703 SHA1 2f86121bdd2699eadd89305cb8214eb32795665b SHA256 f86c6221a47b4d4be298f7bf9d73fba34fceb365184d74ab7699cac5f47394d1
-MISC ChangeLog 34129 RMD160 3f4640930b5ba19e7e1b9acb5fa75adc836a257c SHA1 852e052ba45e594d7956357ccbaea1d5ae41837e SHA256 86833507b9b70a965b7f643d53277f439e588e595e7964393abdf5c682505f76
+MISC ChangeLog 34504 RMD160 f9d0e63cfdc5c8466336a664a644a7295f1b4f07 SHA1 8fbcc329720bcc9f7dcfbed55d80254e6883d632 SHA256 80307d4132d0364e16f7d7a64a4e705193ffdaf03ccab8b6f3e017509247f405
 MISC metadata.xml 875 RMD160 2e7246f025433a4116aa96c7ce779bedfbc3fc52 SHA1 f5fdcbbae2591bd599c1769566fb8b3031787b4e SHA256 6702b8eb1b7b299682083cfee3b986aa6855534bd5ecf0b98eb09a1e55d0243a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvN+u4ACgkQNQqtfCuFneO9wwCfac9dFsqQdLF3bhdp6WIghPfr
+RlsAnjSukkTR7UwYMfF5/VVqGl3CN3Zx
+=xw9a
+-----END PGP SIGNATURE-----

diff --git a/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild b/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild
new file mode 100644 (file)
index 0000000..707cbdd
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild,v 1.1 2010/04/20 19:05:11 fauli Exp $
+
+EAPI="2"
+
+inherit eutils multilib autotools
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bogofilter crypt dbus dillo doc gnome +gnutls +imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.6
+       pda? ( >=app-pda/jpilot-0.99 )
+       ssl? ( >=net-libs/gnutls-2.0.3 )
+       ldap? ( >=net-nds/openldap-2.0.7 )
+       crypt? ( >=app-crypt/gpgme-0.4.5 )
+       dbus? ( >=dev-libs/dbus-glib-0.60 )
+       dillo? ( www-client/dillo )
+       spell? ( >=app-text/enchant-1.0.0 )
+       imap? ( >=net-libs/libetpan-0.57 )
+       nntp? ( >=net-libs/libetpan-0.57 )
+       gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+       gnutls? ( >=net-libs/gnutls-2.0.3 )
+       startup-notification? ( x11-libs/startup-notification )
+       bogofilter? ( mail-filter/bogofilter )
+       session? ( x11-libs/libSM
+                       x11-libs/libICE )
+       smime? ( >=app-crypt/gpgme-0.4.5 )"
+
+DEPEND="${COMMONDEPEND}
+       xface? ( >=media-libs/compface-1.4 )
+       dev-util/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+       app-misc/mime-types
+       x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier archive att-remover attachwarner bsfilter cachesaver fancy fetchinfo gtkhtml mailmbox newmail notification perl rssyl spam_report tnef_parse vcalendar"
+
+src_prepare() {
+       # fix configure check for >libetpan-0.57 (bug #314181, fixed upstream)
+       epatch "${FILESDIR}"/${P}-fix-libetpan-check.patch
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+       # libetpan is needed if user wants nntp or imap functionality
+       if use imap || use nntp; then
+               myconf="--enable-libetpan"
+       else
+               myconf="--disable-libetpan"
+       fi
+
+       # The usage of openssl was discarded once and USE=ssl is mapped to
+       # USE=gnutls now.  Maybe USE=ssl can fade out sometime
+       if use ssl || use gnutls; then
+               myconf="${myconf} --enable-gnutls"
+       else
+               myconf="${myconf} --disable-gnutls"
+       fi
+
+       econf \
+               $(use_enable gnome gnomeprint) \
+               $(use_enable ipv6) \
+               $(use_enable ldap) \
+               $(use_enable dbus) \
+               $(use_enable pda jpilot) \
+               $(use_enable spell enchant) \
+               $(use_enable xface compface) \
+               $(use_enable doc manual) \
+               $(use_enable startup-notification) \
+               $(use_enable session libsm) \
+               $(use_enable crypt pgpmime-plugin) \
+               $(use_enable crypt pgpinline-plugin) \
+               $(use_enable crypt pgpcore-plugin) \
+               $(use_enable dillo dillo-viewer-plugin) \
+               $(use_enable spamassassin spamassassin-plugin) \
+               $(use_enable bogofilter bogofilter-plugin) \
+               $(use_enable smime smime-plugin) \
+               --docdir=/usr/share/doc/${PF} \
+               --enable-trayicon-plugin \
+               --disable-maemo ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+
+       # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+       # => also install it in /usr/share/pixmaps for other desktop envs
+       # => also install higher resolution icons in /usr/share/icons/hicolor/...
+       insinto /usr/share/pixmaps
+       doins ${PN}.png || die
+       local res resdir
+       for res in 64x64 128x128 ; do
+               resdir="/usr/share/icons/hicolor/${res}/apps"
+               insinto ${resdir}
+               newins ${PN}-${res}.png ${PN}.png || die
+       done
+
+       dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+       docinto tools
+       dodoc tools/README*
+
+       insinto /usr/share/applications
+       doins ${PN}.desktop
+
+       einfo "Installing extra tools"
+       cd "${S}"/tools
+       exeinto /usr/$(get_libdir)/${PN}/tools
+       doexe *.pl *.py *.conf *.sh || die
+       doexe tb2claws-mail update-po uudec uuooffice || die
+
+       # kill useless plugin files
+       rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
+}
+
+pkg_postinst() {
+       gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+
+       UPDATE_PLUGINS=""
+       RENAME_PLUGINS=""
+       for x in ${PLUGIN_NAMES}; do
+               has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+               has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
+       done
+       if [ -n "${RENAME_PLUGINS}" ]; then
+               elog
+               elog "The following sylpheed-claws plugins were found on your system:"
+               elog
+               for x in ${RENAME_PLUGINS}; do
+                       elog "    mail-client/sylpheed-claws-$x"
+               done
+               elog
+               elog "If you want to continue using those you need to merge their "
+               elog "renamed counterparts:"
+               elog
+               for x in ${RENAME_PLUGINS}; do
+                       elog "    mail-client/${PN}-$x"
+               done
+               elog
+       fi
+       if [ -n "${UPDATE_PLUGINS}" ]; then
+               elog
+               elog "You have to re-emerge or update the following plugins:"
+               elog
+               for x in ${UPDATE_PLUGINS}; do
+                       elog "    mail-client/${PN}-$x"
+               done
+               elog
+       fi
+}
+
+pkg_postrm() {
+       gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
+}

diff --git a/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch b/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch
new file mode 100644 (file)
index 0000000..3685227
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch
@@ -0,0 +1,15 @@
+--- configure.ac.orig  2010-04-20 20:55:13.775539738 +0200
++++ configure.ac       2010-04-20 20:57:56.872533578 +0200
+@@ -973,7 +973,12 @@
+       if test "x$libetpan_result" = "xyes"; then
+          LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
+          LIBETPAN_LIBS="`$libetpanconfig --libs`"
++         LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
+          LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
++         if test x"$LIBETPAN_STABLE" != "x"; then
++              LIBETPAN_VERSION="100"
++           fi
++
+          if test "$LIBETPAN_VERSION" -lt "057"; then
+               AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
+               AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])

diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
index d2ab2a319ef0f8c75ed2ce6adadfc1d147792f04..eefb09160c7f92a31fbd0942699ee8b9dda02e2a 100644 (file)
--- a/mail-client/etpan-ng/Manifest
+++ b/mail-client/etpan-ng/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX etpan-ng-0.7.1-as-needed.patch 2032 RMD160 24e98a8268767b1ae82ddf57ccfde358d172704b SHA1 aededd059cac5f13bf662e278bc08fcfa36c2a48 SHA256 b11dcb23a9949db3ef12e991013095ea06d14634e84119bd7b1aa33f79059879
 DIST etpan-ng-0.7.1.tar.gz 364394 RMD160 bbd196a2151f99032dbdfc0ebb652a50567792f8 SHA1 2261913d31bbe64efe64a24cc37740eaf21d1d89 SHA256 085b030e6ddebd816600b5fc9ca92eae1b6301e60691cfaf36e38140934d5dc3
+EBUILD etpan-ng-0.7.1-r1.ebuild 1007 RMD160 4b45728ace5360065bc3dff002a27040c9950170 SHA1 5f243849713972ceb024a26dea84a91cd85f34a6 SHA256 ad28a08cff7e43b8748d700dedee5629919c8b6b35949f3b34a3d296143a39d0
 EBUILD etpan-ng-0.7.1.ebuild 877 RMD160 72febe0c2baa11b8ffcbb1bffde550cfc4085315 SHA1 8b6d7cc90c1566def17bc0e4e4f7f2d4677aacdf SHA256 ea27c88d7bb355fada9bff2c8b81c75411fb44f5ec3e2295b22a8d7a4fa9cd2a
-MISC ChangeLog 1249 RMD160 84dd1fe51887323aaa301bc524d67988ae3bdb61 SHA1 4adf06960dd0c03b43ceafb111fd00d60e0f6c8f SHA256 442d5433d8822c5f99397c739116d2567dc9f4de809b87ff2e1ebf4abecdc48d
+MISC ChangeLog 1525 RMD160 c408b3741a0d06c6e1210d5191e5fc17f1cdecde SHA1 596fa1e43d56c5bf58c21c82acab0cba543a7006 SHA256 cbb2de2c0df9b0863197a73b807233e0bb5c818ab2d931d6f37298e28e6612f1
 MISC metadata.xml 254 RMD160 1ce4e2f4ba2276f20d9a7c5b5b02d8a621a9f0ac SHA1 dbd10fb6477f1b49213d0d3e7fe071082fcdc10c SHA256 0704eb717b3bd19f8318ec03dcf44bf713fed5d28ccf7f5d92bdc45286d81900
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvN9NcACgkQNQqtfCuFneOHzgCfesjoAULVgmphmLYpUFHdBJdt
-Y4oAniwH+3wS8kk9Ibwr2f4Z/5VmGXtt
-=o4YD
+iEYEARECAAYFAkvN+54ACgkQNQqtfCuFnePy0gCeOKaRh3QKTO6/QdnnyUGmj4ZX
+uLgAnjD8lXSulNBpFL2Ym8O9LGg5UUkT
+=vgPa
 -----END PGP SIGNATURE-----