From f84f85e10ff7bc27c4bc55533a43f7d1690349e6 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 21 Apr 2010 20:39:05 +0000 Subject: Use old e-d-s patch and add 'die' statements when needed. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- mail-client/mail-notification/ChangeLog | 11 ++- mail-client/mail-notification/Manifest | 11 +-- .../files/mail-notification-5.4-e-d-s.patch | 102 -------------------- .../mail-notification-5.4-r2.ebuild | 104 --------------------- .../mail-notification-5.4-r3.ebuild | 104 +++++++++++++++++++++ 5 files changed, 119 insertions(+), 213 deletions(-) delete mode 100644 mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch delete mode 100644 mail-client/mail-notification/mail-notification-5.4-r2.ebuild create mode 100644 mail-client/mail-notification/mail-notification-5.4-r3.ebuild (limited to 'mail-client') diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog index 3c4bc2abcb3f..4e4e42ca1d12 100644 --- a/mail-client/mail-notification/ChangeLog +++ b/mail-client/mail-notification/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for mail-client/mail-notification # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.90 2010/03/19 11:13:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.91 2010/04/21 20:39:04 pacho Exp $ + +*mail-notification-5.4-r3 (21 Apr 2010) + + 21 Apr 2010; Pacho Ramos + -mail-notification-5.4-r2.ebuild, +mail-notification-5.4-r3.ebuild, + -files/mail-notification-5.4-e-d-s.patch: + Use old e-d-s patch, this will need review when e-d-s-2.30 hits stable, + but current fedora patch makes build fail against 2.28. Also add 'die' + statements when needed. *mail-notification-5.4-r2 (19 Mar 2010) diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest index 22f732de9b32..df81771e6d67 100644 --- a/mail-client/mail-notification/Manifest +++ b/mail-client/mail-notification/Manifest @@ -3,20 +3,19 @@ Hash: SHA1 AUX mail-notification-5.4-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73 AUX mail-notification-5.4-e-d-s-2.24.patch 521 RMD160 db3ae8438d054d3434605fb5d7cf90a965f806ff SHA1 75fac93f173f715bc4c7cbedf9c553e522785274 SHA256 e8bde8df77a51b1b06846ac37e7df2b3f0d1ee28716ce171b21150bcfd75094b -AUX mail-notification-5.4-e-d-s.patch 3525 RMD160 840a3e684b87dc98ba617b7083a4ee1b7b8ffa54 SHA1 3f7074851b6539a3b499fd02d6b39f0aaa1961dd SHA256 95f506b595966609e35ba9db6a17631f8f3e31b82736f0dff16cdbae506cd96e AUX mail-notification-5.4-evolution-gtkhtml.patch 690 RMD160 50b8670fdb02b80b2d9789dc2f28ef4e1c013780 SHA1 a93ec8ac04f361473ddce2fda24362edf3c10c46 SHA256 5c3d9004d03688e663c78045c101366ddc6e9f246947f7ab955a341d5693cb78 AUX mail-notification-5.4-gmime.patch 3110 RMD160 8b26994250689c2962f7a7a5b8f77b4b59a21f0d SHA1 9e3de8a7a0a01effc2236826bf83bed20e52fdbf SHA256 9d7d5b8d72023138f00050baaecf2cbdd3e9ba372c45b275ba0677d7118ed784 AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 RMD160 0d6eeb7f3fee7a799b391c9195f9e94610ac40ff SHA1 50c7e4ae43dbf7542862f38b85ed8567d7f556c3 SHA256 0b05f41072a859254b6dfb672f6654c630f116c80b86eac6fe1f39318a4a6050 AUX mail-notification-5.4-sasl_encode64.patch 1298 RMD160 c1fec77994de9c4c58807b66882da4ecb92a80f2 SHA1 f371d9fec4b6e1a1e2be13b4b578c40ab8223313 SHA256 2d7b8132d6498d75d57cd44b1586ff9a9df74048a5e7724d96c05ed5c3cb079e DIST mail-notification-5.4.tar.bz2 570008 RMD160 64946509ef99fdeba8ff547ffac3830c36131484 SHA1 c148449c5d2fd0a75571e4e42932da1f1ae013f6 SHA256 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5 EBUILD mail-notification-5.4-r1.ebuild 2825 RMD160 6b6fe3020e77a0b3dcbb0348f27e0a61045b0b6f SHA1 b889100e1b8e79e845b0f778e4959121a42006ec SHA256 cd2a3cff8d733617cd23f17a5a46a8792a9bfe2cb5cbce6b9afbf9f8aedff893 -EBUILD mail-notification-5.4-r2.ebuild 3155 RMD160 9623bcf0e94e345ec2203a8f6208f19cc3b1b66b SHA1 ddbbede978f5de6e6b208ddab913ed6b6f9e0296 SHA256 f25b90238b10396442113f8a22a6429fa7b0c0dfbc6881282c42f922f56c8adb -MISC ChangeLog 17409 RMD160 654aa61ffb036a7232dadd1b308be1ad7073701b SHA1 2feaa065ea91817347d49476b8a9aa415cc25b3d SHA256 99ff20479eb5c1ab001d434078d7177a919764752ae04552e60fae9bf5897412 +EBUILD mail-notification-5.4-r3.ebuild 3148 RMD160 768a4d49d4fddf3d76a35aeb4d372c6614e599a9 SHA1 f79d7a944450f0c044efd8aa73d8f84f8ae95fd8 SHA256 9df39583725e06311614910272c83c83f9021055e9137887e69d99e8688ea77c +MISC ChangeLog 17784 RMD160 ee809393b0b9f0977b3a608312f6a43a948f5beb SHA1 a58feea6d584f9b4de5cdb0bd4026ada3718d2dd SHA256 fa4552ea0843475db0d8d72bfe333b851ea09b4358202b38e01ce35dcb0ca4fb MISC metadata.xml 707 RMD160 2ba53e2a8e4eab0cd33e19a637f6a514393c7b33 SHA1 c19133019aba5ee60fa1cbb108c848ffd8df166f SHA256 383502af536e5918f620980c074170430a84e62ca61393c2f01898dd141c0e18 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkujXHYACgkQCaWpQKGI+9SCnwCfaVyxN5PzPr3892mTJeRXKlWY -FW0An1wCydkTgxTC5THEcDpaKBG5qLbU -=rl62 +iEYEARECAAYFAkvPYm4ACgkQCaWpQKGI+9T4+QCfXsVvptDhGn3fqusNMcjD5FOq +cx0AoIdzi1X7dI3j2diUKIsZsuCY7/Fa +=J4aG -----END PGP SIGNATURE----- diff --git a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch b/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch deleted file mode 100644 index 073818afed2d..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- build/src/mn-evolution-server.c.orig 2008-09-30 15:30:07.756216978 +0200 -+++ build/src/mn-evolution-server.c 2008-09-30 15:30:49.950220711 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -595,7 +596,12 @@ - - for (i = 0; i < summary->len; i++) - { -+#if EDS_CHECK_VERSION(2,23,5) -+ char *uid = summary->pdata[i]; -+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid); -+#else - CamelMessageInfo *info = summary->pdata[i]; -+#endif - - if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) - g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); ---- build/src/mn-evolution-folder-tree-server.c.evolution 2010-02-01 10:00:12.128683776 -0500 -+++ build/src/mn-evolution-folder-tree-server.c 2010-02-01 10:02:32.809697243 -0500 -@@ -26,5 +26,8 @@ - #include -+#include -+#if !EDS_CHECK_VERSION(2,29,0) - #include -+#endif - #include - #include "mn-evolution-plugin.h" - #include "mn-evolution.h" -@@ -396,7 +399,11 @@ mn_evolution_folder_tree_server_construc - -+#if EDS_CHECK_VERSION(2,29,0) -+ selfp->tree = em_folder_tree_new(); -+#else - EMFolderTreeModel *model; - - model = mail_component_peek_tree_model(mail_component_peek()); - selfp->tree = em_folder_tree_new_with_model(model); -+#endif - - selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); ---- build/src/mn-evolution-server.c.evolution 2010-02-01 10:06:36.484698060 -0500 -+++ build/src/mn-evolution-server.c 2010-02-01 10:09:01.946682081 -0500 -@@ -28,9 +28,14 @@ - #include - #include - #include -+#if EDS_CHECK_VERSION(2,29,0) -+#include -+#include -+#else - #include - #include - #include -+#endif - #include - #include - #include -@@ -568,6 +573,19 @@ mn_evolution_server_open_message (MNEvol - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(2,29,0) -+ EShell *shell; -+ EShellBackend *shell_backend; -+ GtkWidget *browser; -+ -+ shell = e_shell_get_default (); -+ shell_backend = e_shell_get_backend_by_name (shell, "mail"); -+ -+ browser = e_mail_browser_new (shell_backend); -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); -+ gtk_widget_show (browser); -+#else - GtkWidget *browser; - - /* modelled after Evolution's handleuri_got_folder() */ -@@ -578,6 +596,7 @@ mn_evolution_server_open_message (MNEvol - em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri); - em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE); - gtk_widget_show(((EMMessageBrowser *) browser)->window); -+#endif - - camel_object_unref(folder); - } ---- src/mn-evolution-plugin.c.evolution 2008-05-22 11:45:35.000000000 -0400 -+++ src/mn-evolution-plugin.c 2010-02-01 11:52:06.141664757 -0500 -@@ -204,7 +204,7 @@ connect_to_session_bus (void) - } - - int --e_plugin_lib_enable (EPluginLib *ep, int enable) -+e_plugin_lib_enable (EPlugin *ep, int enable) - { - static gboolean enabled = FALSE; - GError *err = NULL; diff --git a/mail-client/mail-notification/mail-notification-5.4-r2.ebuild b/mail-client/mail-notification/mail-notification-5.4-r2.ebuild deleted file mode 100644 index 99f9d70222a2..000000000000 --- a/mail-client/mail-notification/mail-notification-5.4-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r2.ebuild,v 1.1 2010/03/19 11:13:54 pacho Exp $ - -EAPI=1 - -inherit gnome2 multilib flag-o-matic toolchain-funcs - -DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats." -HOMEPAGE="http://www.nongnu.org/mailnotify/" -SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2" - -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -SLOT="0" -LICENSE="GPL-3" - -IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed" - -# gmime is actually optional, but it's used by so much of the package -# it's pointless making it optional. gnome-keyring is required for -# several specific access methods, and thus linked to those USE flags -# instead of adding a keyring USE flag. -RDEPEND=">=x11-libs/gtk+-2.12 - >=dev-libs/glib-2.14 - >=gnome-base/gconf-2.4.0 - >=gnome-base/gnome-panel-2.6 - >=gnome-base/gconf-2.6 - >=gnome-base/libgnomeui-2.14 - >=gnome-base/libglade-2.0 - dev-libs/dbus-glib - dev-libs/gmime:2.4 - >=x11-libs/libnotify-0.4.1 - pop? ( gnome-base/gnome-keyring ) - imap? ( gnome-base/gnome-keyring ) - gmail? ( gnome-base/gnome-keyring ) - ssl? ( >=dev-libs/openssl-0.9.6 ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - evo? ( >=mail-client/evolution-2.24 ) - sylpheed? ( mail-client/sylpheed )" - -DEPEND="${RDEPEND} - app-text/scrollkeeper - dev-util/pkgconfig - >=dev-util/intltool-0.35.0" - -# this now uses JB (the Jean-Yves Lefort's Build System) as a build system -# instead of autotools, this is a little helper function that basically does -# the same thing as use_enable -use_var() { - echo -n "${2:-$1}=" - use "${1}" && echo "yes" || echo "no" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-dont-update-cache.patch" - - # We are not Ubuntu, and I suspect that this is the cause of #215281 - epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch" - - # Make it work ok with eds-2.24 and 2.29, thanks to Fedora folks - epatch "${FILESDIR}/${P}-e-d-s.patch" - - # Fix gtkhtml depend to solve building against evo-2.28, see bug #293374 - epatch "${FILESDIR}/${P}-evolution-gtkhtml.patch" - - # Add patch for new cyrus-sasl's ABI, see: - # https://bugzilla.redhat.com/501456 - epatch "${FILESDIR}/${P}-sasl_encode64.patch" - - # Fedora patch to build against dev-libs/gmime:2.4 - epatch "${FILESDIR}/${P}-gmime.patch" -} - -src_compile() { - ./jb configure destdir="${D}" prefix="/usr" libdir=/usr/$(get_libdir) \ - sysconfdir="/etc" localstatedir="/var" cc="$(tc-getCC)" \ - cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \ - scrollkeeper-dir="/var/lib/scrollkeeper" \ - $(use_var evo evolution) \ - $(use_var gmail) \ - $(use_var imap) \ - $(use_var ipv6) \ - $(use_var maildir) \ - $(use_var mbox) \ - $(use_var mh) \ - $(use_var mozilla) \ - $(use_var pop pop3) \ - $(use_var sasl) \ - $(use_var ssl) \ - $(use_var sylpheed) - - ./jb build -} - -src_install() { - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install - - dodoc NEWS README AUTHORS TODO TRANSLATING - - rm -rf "${D}/var/lib/scrollkeeper" -} diff --git a/mail-client/mail-notification/mail-notification-5.4-r3.ebuild b/mail-client/mail-notification/mail-notification-5.4-r3.ebuild new file mode 100644 index 000000000000..c9202bb09790 --- /dev/null +++ b/mail-client/mail-notification/mail-notification-5.4-r3.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild,v 1.1 2010/04/21 20:39:04 pacho Exp $ + +EAPI=1 + +inherit gnome2 multilib flag-o-matic toolchain-funcs + +DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats." +HOMEPAGE="http://www.nongnu.org/mailnotify/" +SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2" + +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +SLOT="0" +LICENSE="GPL-3" + +IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed" + +# gmime is actually optional, but it's used by so much of the package +# it's pointless making it optional. gnome-keyring is required for +# several specific access methods, and thus linked to those USE flags +# instead of adding a keyring USE flag. +RDEPEND=">=x11-libs/gtk+-2.12 + >=dev-libs/glib-2.14 + >=gnome-base/gconf-2.4.0 + >=gnome-base/gnome-panel-2.6 + >=gnome-base/gconf-2.6 + >=gnome-base/libgnomeui-2.14 + >=gnome-base/libglade-2.0 + dev-libs/dbus-glib + dev-libs/gmime:2.4 + >=x11-libs/libnotify-0.4.1 + pop? ( gnome-base/gnome-keyring ) + imap? ( gnome-base/gnome-keyring ) + gmail? ( gnome-base/gnome-keyring ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + evo? ( >=mail-client/evolution-2.24 ) + sylpheed? ( mail-client/sylpheed )" + +DEPEND="${RDEPEND} + app-text/scrollkeeper + dev-util/pkgconfig + >=dev-util/intltool-0.35.0" + +# this now uses JB (the Jean-Yves Lefort's Build System) as a build system +# instead of autotools, this is a little helper function that basically does +# the same thing as use_enable +use_var() { + echo -n "${2:-$1}=" + use "${1}" && echo "yes" || echo "no" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-dont-update-cache.patch" + + # We are not Ubuntu, and I suspect that this is the cause of #215281 + epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch" + + # Make it work ok with eds-2.24 + epatch "${FILESDIR}/${P}-e-d-s-2.24.patch" + + # Fix gtkhtml depend to solve building against evo-2.28, see bug #293374 + epatch "${FILESDIR}/${P}-evolution-gtkhtml.patch" + + # Add patch for new cyrus-sasl's ABI, see: + # https://bugzilla.redhat.com/501456 + epatch "${FILESDIR}/${P}-sasl_encode64.patch" + + # Fedora patch to build against dev-libs/gmime:2.4 + epatch "${FILESDIR}/${P}-gmime.patch" +} + +src_compile() { + ./jb configure destdir="${D}" prefix="/usr" libdir=/usr/$(get_libdir) \ + sysconfdir="/etc" localstatedir="/var" cc="$(tc-getCC)" \ + cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \ + scrollkeeper-dir="/var/lib/scrollkeeper" \ + $(use_var evo evolution) \ + $(use_var gmail) \ + $(use_var imap) \ + $(use_var ipv6) \ + $(use_var maildir) \ + $(use_var mbox) \ + $(use_var mh) \ + $(use_var mozilla) \ + $(use_var pop pop3) \ + $(use_var sasl) \ + $(use_var ssl) \ + $(use_var sylpheed) || die + + ./jb build || die +} + +src_install() { + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die + + dodoc NEWS README AUTHORS TODO TRANSLATING + + rm -rf "${D}/var/lib/scrollkeeper" +} -- cgit v1.2.3-65-gdbad