Version bump

Package-Manager: portage-2.1.4.4

5 files changed, 168 insertions, 6 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index cfcd6f9ff33b..6078b2e3cd92 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.69 2008/05/03 06:19:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.70 2008/07/22 09:50:37 graaff Exp $
+
+*mail-notification-5.4 (22 Jul 2008)
+
+  22 Jul 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/mail-notification-5.4-dont-update-cache.patch,
+  +files/mail-notification-5.4-remove-ubuntu-special-case.patch,
+  +mail-notification-5.4.ebuild:
+  Version bump: fix regression for IMAP mailboxes. Also attempt to fix #215281.
 
   03 May 2008; Hans de Graaff <graaff@gentoo.org>
   mail-notification-5.0.ebuild, mail-notification-5.0-r1.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index 366157d88250..bd575bee1d54 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -6,20 +6,24 @@ AUX mail-notification-4.1-find-evo-2.12.patch 1212 RMD160 08202b50d5bad3095acdf7
 AUX mail-notification-5.2-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73
 AUX mail-notification-5.2-evo-crash-fix.patch 391 RMD160 7cc7b94d6ee7c1485003aef928b28eb0e50115d7 SHA1 a197050c83750dbc7b4f86b74e93bafa736bc763 SHA256 b32c1c5974416b2076466da5988f7ab5848ff8aa08371fe03ebc5a311d3efd03
 AUX mail-notification-5.3-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73
+AUX mail-notification-5.4-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73
+AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 RMD160 0d6eeb7f3fee7a799b391c9195f9e94610ac40ff SHA1 50c7e4ae43dbf7542862f38b85ed8567d7f556c3 SHA256 0b05f41072a859254b6dfb672f6654c630f116c80b86eac6fe1f39318a4a6050
 DIST mail-notification-5.0.tar.bz2 774039 RMD160 a24c6a02844ef01c8a8be026a78e4c061c2275f5 SHA1 d43c070957c60d0ffd975475ae1c27c29dd83764 SHA256 c991b895da02d5830a37e81ad86f4ff2bf6020a63b75f4cf475c3b7900788258
 DIST mail-notification-5.2.tar.bz2 561703 RMD160 aba13f4d4e602b6da975ee56c6e0c81afdffbeff SHA1 71e7c159da310eaf0ccaea04a6906ccaa9778432 SHA256 c4e38756a2dd5bc7eff66f557291ad1ac44adde92a8339d1e172a5df7aa2c467
 DIST mail-notification-5.3.tar.bz2 563075 RMD160 4ba96c7d80d53465af12454880c7d15a2e8c4626 SHA1 349e92c193569d974c114cad09abfa0a8a9d3230 SHA256 dea793df1b33ab4c6e2381b5486db6c2c5b6776347e15af029528dad7c720f94
+DIST mail-notification-5.4.tar.bz2 570008 RMD160 64946509ef99fdeba8ff547ffac3830c36131484 SHA1 c148449c5d2fd0a75571e4e42932da1f1ae013f6 SHA256 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5
 EBUILD mail-notification-5.0-r1.ebuild 2475 RMD160 8f8ea8f1dc0411236f479e9f29c7707398ed6999 SHA1 1d122660e185c37502bcd00da162ae748fac5e1e SHA256 085a1196cf4703e3a150892cbb2223a97e5cfbae21c880e7f6e8ab4b0fb8585e
 EBUILD mail-notification-5.0.ebuild 2414 RMD160 750730548c20d71782e4dc8cd6bdd45d92cc60b2 SHA1 f5f6eb319fc7d4cd44337da103dea1ef48253b7f SHA256 899aede571825a75e06f457b0fe9f5b4d1f628808ed78243390de770a37f6af4
 EBUILD mail-notification-5.2-r1.ebuild 2767 RMD160 62cbe1941956eb5b6e5fbe469b42fe905626f23b SHA1 7eda2eb1b493712cfb6f4d234deabd63137aad53 SHA256 7df02602fdb0422b4c51d7921777889411b21158ab0105edacd7701b1a7b23fa
 EBUILD mail-notification-5.2.ebuild 2829 RMD160 e15df3277a9ad2b3ac9d6ca66ce7ff38cebe188d SHA1 1f33fd6fb364f47dc7c447d7b165b5c28e02801d SHA256 985e80d22afbd5cdd06159119815f0eb3d0c5dd22dbc1ebc91c519a791e7970e
 EBUILD mail-notification-5.3.ebuild 2666 RMD160 d42c698c9cfe842eb54710486c83926bd2508f2a SHA1 187cc041bc131b665d997d65e382d32709fc8057 SHA256 374022219ac7438f5a6bfff065cb19dd08657859872a16f1addc0c13de4fc28a
-MISC ChangeLog 13140 RMD160 3dc156835caeccb763696fe391ca23894055bcab SHA1 501370374f2a98cf41b006a2985158f208cb5a5e SHA256 e3f389d8f609da0ddca3927727cd78c72aa1a8025ece45fa1e3fb8bbf4d2155d
+EBUILD mail-notification-5.4.ebuild 2797 RMD160 d29600fb457af85b6f3d1d0c750c3a4e08bf6351 SHA1 1e6df6da575d7e17f6f630340523ea7535d305b5 SHA256 86d695e23507bc8d1f3a1f25ae9ac393805e32d0ad0d3fa512dde873ead96ae1
+MISC ChangeLog 13463 RMD160 71869bb3175ef0c290267d62168e22e78a8fb0f4 SHA1 5d59f38161a3105ece7f933d415571b4afa522f6 SHA256 fbf39124ccf09c7e1881250d4b4f180136c2fe915c4db0e8419cad7a75e5457e
 MISC metadata.xml 434 RMD160 97e45535164286b92193149a0fb75dbbd7220918 SHA1 9590bd4ce56f8da1014f8fd21eda547e24be6f41 SHA256 ea813029b54782c8db3c92a38b23a19bfce002eec793862b008452ad77d5a839
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIHAQDQUozDL2JlH4RAtLpAJ9txYeQycqkL72JueiDHSzOodBMagCePRJC
-oj9nC0o4oItZYox+IS4shqc=
-=J0Tq
+iEYEARECAAYFAkiFrXkACgkQCzgcb6sPj49ChACgnIvN1SbBlsZosslTQeE181NY
+hdkAni4J7kSZj8OmHll+4tpVf1U62xc9
+=Uox0
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch b/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch
new file mode 100644
index 000000000000..6cdade158a71
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch
@@ -0,0 +1,25 @@
+Our gnome2 eclass takes care of proper rebuilding on the icon
+cache. We have to remove this also because it causes access
+violations.
+--- jbsrc/jb.c.~1~	2008-03-20 16:53:02.000000000 +0100
++++ jbsrc/jb.c	2008-03-26 20:51:45.641363619 +0100
+@@ -327,7 +327,6 @@
+ jb_package_add_resources (void)
+ {
+   JBGroup *group;
+-  JBRule *rule;
+   JBObject *object;
+ 
+   if (jb_variable_get_bool("compile-warnings"))
+@@ -362,11 +361,6 @@
+   if (jb_variable_get_bool("hotmail"))
+     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
+ 
+-  rule = jb_rule_new();
+-  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
+-  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
+-  jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
+-
+   jb_group_add(group);
+ 
+   /*** data ******************************************************************/
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch b/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch
new file mode 100644
index 000000000000..4516f32c6f52
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch
@@ -0,0 +1,33 @@
+--- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
++++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
+@@ -164,8 +164,6 @@
+ static void
+ gconf_configure (void)
+ {
+-  JBVariable *variable;
+-
+   jb_require_program("gconftool-2");
+ 
+   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
+@@ -178,21 +176,6 @@
+       jb_variable_set_string("gconf-config-source", config_source);
+       g_free(config_source);
+     }
+-
+-  /* fix the default schemas dir on Ubuntu */
+-  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
+-  if (! variable->user_set)
+-    {
+-      static const char *ubuntu_dir = "$datadir/gconf/schemas";
+-      char *expanded;
+-
+-      expanded = jb_variable_expand(ubuntu_dir, NULL);
+-
+-      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
+-	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
+-
+-      g_free(expanded);
+-    }
+ }
+ 
+ static void
diff --git a/mail-client/mail-notification/mail-notification-5.4.ebuild b/mail-client/mail-notification/mail-notification-5.4.ebuild
new file mode 100644
index 000000000000..7933e1c860bf
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/07/22 09:50:37 graaff Exp $
+
+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 yahoo"
+
+# 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/eel-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.2.7
+	>=x11-libs/libnotify-0.4.1
+	pop? ( gnome-base/gnome-keyring )
+	imap? ( gnome-base/gnome-keyring )
+	gmail? ( gnome-base/gnome-keyring )
+	yahoo? ( gnome-base/gnome-keyring net-mail/fetchyahoo )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	evo? ( >=mail-client/evolution-2.12 )
+	sylpheed? ( virtual/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"
+}
+
+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) \
+		$(use_var yahoo)
+
+	./jb build
+}
+
+src_install() {
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install
+
+	dodoc NEWS README AUTHORS TODO TRANSLATING
+
+	rm -rf "${D}/var/lib/scrollkeeper"
+}