Version bump. Added new enigmail version to seamonkey-2.3.3-r1

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

3 files changed, 29 insertions, 10 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 6100f5637b0d..c74c496a8473 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.335 2011/09/05 10:18:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.336 2011/09/26 15:08:07 polynomial-c Exp $
+
+*seamonkey-2.4 (26 Sep 2011)
+*seamonkey-2.3.3-r1 (26 Sep 2011)
+
+  26 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> -seamonkey-2.3.2.ebuild,
+  -seamonkey-2.3.3.ebuild, +seamonkey-2.3.3-r1.ebuild, +seamonkey-2.4.ebuild:
+  Version bump. Added new enigmail version to seamonkey-2.3.3-r1.
 
   05 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.3.3.ebuild:
   Fixed patchset.
diff --git a/www-client/seamonkey/seamonkey-2.3.3.ebuild b/www-client/seamonkey/seamonkey-2.3.3-r1.ebuild
index 9bce348d4f40..a74b55d37587 100644
--- a/www-client/seamonkey/seamonkey-2.3.3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.3.ebuild,v 1.2 2011/09/05 10:18:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.3-r1.ebuild,v 1.1 2011/09/26 15:08:07 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
 PATCH="${PN}-2.3.3-patches-02"
-EMVER="1.3.1"
+EMVER="1.3.2"
 
 LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
 NOSHORTLANGS="en-GB en-US es-AR"
diff --git a/www-client/seamonkey/seamonkey-2.3.2.ebuild b/www-client/seamonkey/seamonkey-2.4.ebuild
index a4f8b51310d5..c4633787deaa 100644
--- a/www-client/seamonkey/seamonkey-2.3.2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.2.ebuild,v 1.1 2011/08/31 21:04:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.ebuild,v 1.1 2011/09/26 15:08:07 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
 
-PATCH="${PN}-2.3-patches-01"
-EMVER="1.3"
+PATCH="${PN}-2.4-patches-01"
+EMVER="1.3.2"
 
 LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
 NOSHORTLANGS="en-GB en-US es-AR"
@@ -83,8 +83,10 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	>=media-libs/mesa-7.10
 	>=media-libs/libpng-1.4.1[apng]
 	>=x11-libs/cairo-1.10
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14
 	dev-libs/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
 	crypt? ( >=app-crypt/gnupg-1.4 )
 	webm? ( media-libs/libvpx
 		media-libs/alsa-lib )"
@@ -157,15 +159,25 @@ src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patch"
+	epatch "${WORKDIR}/_seamonkey"
 
-	epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \
-		"${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/_mozilla"
+	popd &>/dev/null || die
 
 	# mailnews patches go here
 	#pushd "${S}"/mailnews &>/dev/null || die
+	#EPATCH_SUFFIX="patch" \
+	#EPATCH_FORCE="yes" \
+	#epatch "${WORKDIR}/_mailnews"
 	#popd &>/dev/null || die
 
+	epatch "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch \
+		"${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user