[gentoo-commits] gentoo-x86 commit in mail-client/mail-notification: mail-notification-5.4-r3.ebuild ChangeLog mail-notification-5.4-r2.ebuild

[Pacho Ramos (pacho)]

pacho       10/04/21 20:39:04

  Modified:             ChangeLog
  Added:                mail-notification-5.4-r3.ebuild
  Removed:              mail-notification-5.4-r2.ebuild
  Log:
  Use old e-d-s patch and add 'die' statements when needed.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.91                 mail-client/mail-notification/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/ChangeLog?r1=1.90&r2=1.91

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog	19 Mar 2010 11:13:54 -0000	1.90
+++ ChangeLog	21 Apr 2010 20:39:04 -0000	1.91
@@ -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 <pacho@g.o>
+  -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)
 



1.1                  mail-client/mail-notification/mail-notification-5.4-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r3.ebuild?rev=1.1&content-type=text/plain

Index: mail-notification-5.4-r3.ebuild
===================================================================
# 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"
}