Add Fedora patch to use Gnome 2.30 icons. Move to EAPI=2.

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

4 files changed, 166 insertions, 2 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index d7dd5ea0965a..23720ac2c3e1 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,13 @@
 # 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.95 2010/05/18 06:28:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.96 2010/06/20 07:56:46 graaff Exp $
+
+*mail-notification-5.4-r4 (20 Jun 2010)
+
+  20 Jun 2010; Hans de Graaff <graaff@gentoo.org>
+  +mail-notification-5.4-r4.ebuild,
+  +files/mail-notification-5.4-icons.patch:
+  Add Fedora patch to use Gnome 2.30 icons. Move to EAPI=2.
 
   18 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   mail-notification-5.4-r3.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index e0dea4f7521b..6bd4fdc57edb 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mail-notification-5.4-asneeded.patch 1104 RMD160 daa7d61bc773cedd13ffdc33b7a5dcbac7b90754 SHA1 6ede43eff242cc28327afc773a3b781dead66dc5 SHA256 46d7d0a90e486c143fe6fc11709611de55920fe9a7ce24d54fa6984a72f174ec
 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-icons.patch 1484 RMD160 29206aa19c701d92bd8e0535f3ee429bb9234061 SHA1 23369d518ab5935f44d86776feb47306381701ff SHA256 63e1c80a6bddf7381c1f490be61948455727bb4ea6b33009f32f2d02aaecfe7d
 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-r3.ebuild 3236 RMD160 d8bc0916705f9aa44886cbc911e0b0469fcd93f2 SHA1 eba90c7fa2a88d638281fe9329a1d4615bd1d6b4 SHA256 19f68501ed296df824c6eaa76fa08e8ad8687e17382514f0d090d23dfa58362b
-MISC ChangeLog 18546 RMD160 53a499801d27fa658bc1c535b4235b7aa451f8f7 SHA1 7c97f59dd46257371e0b6109dd0e12954eb3c6b8 SHA256 d0b455a34228166ab3b0c7b8f44f31f2d98a71fa5a76c86076e9b703216dbe1c
+EBUILD mail-notification-5.4-r4.ebuild 3299 RMD160 5b8cb35c6a536aa465b73fe1f8cc4baee85210ab SHA1 1d3eded54dace90101678c5c1c3ca4a011a46aea SHA256 d173165d693869fb053f77e211a66daa0e205c0642a36a6397e855ac76d4bc47
+MISC ChangeLog 18774 RMD160 2dc5e54ce4c91736aeea4f79e3af294bffbb49bf SHA1 f1c2d1befb5f547db4685387a3683ed01729927a SHA256 022b75ab117d20f65a2feb7f55402bb24f95c7410343dff86437e1d50d0180bd
 MISC metadata.xml 707 RMD160 2ba53e2a8e4eab0cd33e19a637f6a514393c7b33 SHA1 c19133019aba5ee60fa1cbb108c848ffd8df166f SHA256 383502af536e5918f620980c074170430a84e62ca61393c2f01898dd141c0e18
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwdycoACgkQZihJkut28SsPEAEAiBdM5e3pfgGRGGJ87mfA7OWi
+vdwVLNBKX+LuIXGCYgEA/05VJtHzutYM6+KqnyqMhjzqjlzg9eOYbaPmvXuF3mnO
+=VIdB
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-icons.patch b/mail-client/mail-notification/files/mail-notification-5.4-icons.patch
new file mode 100644
index 000000000000..66e09b2aa33e
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-icons.patch
@@ -0,0 +1,36 @@
+Patch by Fedora to use icons that are available in Gnome 2.30+
+
+https://bugzilla.redhat.com/show_bug.cgi?id=573809
+
+--- src/mn-stock.c.icons	2008-05-22 16:45:35.000000000 +0100
++++ src/mn-stock.c	2010-05-20 21:53:20.306859177 +0100
+@@ -32,11 +32,11 @@
+     const char	*icon_name;
+     const char	*source_stock_id;
+   } icons[] = {
+-    { MN_STOCK_MAIL,			NULL, "stock_mail" },
+-    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
++    { MN_STOCK_MAIL,			NULL, "mail-notification" },
++    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
+     { MN_STOCK_LOCAL,			NULL, "stock_folder" },
+     { MN_STOCK_REMOTE,			NULL, "stock_internet" },
+-    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
++    { MN_STOCK_UNKNOWN,			NULL, "unknown" },
+     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
+ #if WITH_GMAIL
+     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
+@@ -51,11 +51,11 @@
+     { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
+ #endif
+ #if WITH_EVOLUTION
+-    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
++    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "stock_mail-unread" },
+ #endif
+-    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
++    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-compose" },
+     { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
+-    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
++    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
+   };
+   GtkIconFactory *factory;
+   GtkIconTheme *icon_theme;
diff --git a/mail-client/mail-notification/mail-notification-5.4-r4.ebuild b/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
new file mode 100644
index 000000000000..9ac327b2081b
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
@@ -0,0 +1,109 @@
+# 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-r4.ebuild,v 1.1 2010/06/20 07:56:46 graaff Exp $
+
+EAPI=2
+
+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_prepare() {
+	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
+	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"
+
+	# Fix forced --as-needed, bug 317905
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	# Fix icons for gnome 2.30+
+	epatch "${FILESDIR}/${P}-icons.patch"
+}
+
+src_configure() {
+	./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
+}
+
+src_compile() {
+	./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"
+}