[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, eclass/

[Jory Pratt]

commit:     39b440b53723f0be18063dad21e0bbaebd6102bb
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 13:02:39 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 13:02:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=39b440b5

Revert "bumped to EAPI5 and added slot operators on lib deps per bug 467734"

This reverts commit ead86d1911f9c478a6b332abc111cdbdc7cc393b.

The is incorrect, need to rework completely before we recommit it

---
 eclass/mozlinguas.eclass                           |  2 +-
 ...d-24.0-r2.ebuild => thunderbird-24.0-r1.ebuild} | 36 +++++++--------
 ...refox-24.0-r2.ebuild => firefox-24.0-r1.ebuild} | 42 +++++++++---------
 ...monkey-2.21-r1.ebuild => seamonkey-2.21.ebuild} | 51 +++++++++++-----------
 4 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass
index fb2e24d..02984d2 100644
--- a/eclass/mozlinguas.eclass
+++ b/eclass/mozlinguas.eclass
@@ -17,7 +17,7 @@ inherit mozextension
 case "${EAPI:-0}" in
 	0|1)
 		die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";;
-	2|3|4|5)
+	2|3|4)
 		EXPORT_FUNCTIONS src_unpack src_install;;
 	*)
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers";;

diff --git a/mail-client/thunderbird/thunderbird-24.0-r2.ebuild b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
similarity index 93%
rename from mail-client/thunderbird/thunderbird-24.0-r2.ebuild
rename to mail-client/thunderbird/thunderbird-24.0-r1.ebuild
index b350b18..a46f767 100644
--- a/mail-client/thunderbird/thunderbird-24.0-r2.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI="3"
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
 
@@ -53,20 +53,20 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.15.1:=
-	>=dev-libs/nspr-4.10:=
+	>=dev-libs/nss-3.15.1
+	>=dev-libs/nspr-4.10
 	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10:=
-	>=media-libs/libpng-1.5.13:0=[apng]
-	virtual/libffi:=
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-cairo? ( >=x11-libs/cairo-1.12:=[X] )
-	system-icu? ( dev-libs/icu:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] )
-	>=media-libs/libvpx-1.0.0:=
-	kernel_linux? ( media-libs/alsa-lib:= )
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.5.13[apng]
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	pulseaudio? ( media-sound/pulseaudio )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-icu? ( dev-libs/icu )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.0.0
+	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-thunderbird )
 	!x11-plugins/enigmail
 	crypt?  ( || (
@@ -257,8 +257,8 @@ src_compile() {
 		cd "${S}"/mailnews/extensions/enigmail || die
 		./makemake -r 2&> /dev/null
 		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake -j1
-		emake -j1 xpi
+		emake -j1 || die "make enigmail failed"
+		emake -j1 xpi || die "make enigmail xpi failed"
 	fi
 }
 
@@ -282,7 +282,7 @@ src_install() {
 	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# Install language packs
 	mozlinguas_src_install
@@ -304,7 +304,7 @@ src_install() {
 		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
 		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
 
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
 	fi

diff --git a/www-client/firefox/firefox-24.0-r2.ebuild b/www-client/firefox/firefox-24.0-r1.ebuild
similarity index 92%
rename from www-client/firefox/firefox-24.0-r2.ebuild
rename to www-client/firefox/firefox-24.0-r1.ebuild
index 5dbb9e7..23eaae4 100644
--- a/www-client/firefox/firefox-24.0-r2.ebuild
+++ b/www-client/firefox/firefox-24.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI="3"
 VIRTUALX_REQUIRED="pgo"
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
@@ -51,20 +51,20 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.15.1:=
-	>=dev-libs/nspr-4.10:=
-	>=dev-libs/glib-2.26:2=
-	>=media-libs/mesa-7.10:=
-	>=media-libs/libpng-1.5.13:0=[apng]
-	virtual/libffi:=
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] )
+	>=dev-libs/nss-3.15.1
+	>=dev-libs/nspr-4.10
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.5.13[apng]
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
 	pulseaudio? ( media-sound/pulseaudio )
-	system-cairo? ( >=x11-libs/cairo-1.12:=[X] )
-	system-icu? ( dev-libs/icu:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] )
-	>=media-libs/libvpx-1.0.0:=
-	kernel_linux? ( media-libs/alsa-lib:= )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-icu? ( dev-libs/icu )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.0.0
+	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
@@ -277,7 +277,7 @@ src_compile() {
 	else
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-		emake -f client.mk
+		emake -f client.mk || die "emake failed"
 	fi
 
 }
@@ -311,7 +311,7 @@ src_install() {
 		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# Install language packs
 	mozlinguas_src_install
@@ -334,16 +334,16 @@ src_install() {
 	# Install icons and .desktop for menu entry
 	for size in ${sizes}; do
 		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
 	done
 	# The 128x128 icon has a different name
 	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png"
+	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop"
+		"${ED}/usr/share/applications/${PN}.desktop" || die
 
 	# Add StartupNotify=true bug 237317
 	if use startup-notification ; then

diff --git a/www-client/seamonkey/seamonkey-2.21-r1.ebuild b/www-client/seamonkey/seamonkey-2.21.ebuild
similarity index 91%
rename from www-client/seamonkey/seamonkey-2.21-r1.ebuild
rename to www-client/seamonkey/seamonkey-2.21.ebuild
index 02f16a4..ff65a4f 100644
--- a/www-client/seamonkey/seamonkey-2.21-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.21.ebuild,v 1.4 2013/09/25 14:15:10 polynomial-c Exp $
 
-EAPI=5
+EAPI="3"
 WANT_AUTOCONF="2.1"
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
@@ -59,27 +59,27 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.15.1:=
-	>=dev-libs/nspr-4.10:=
-	>=dev-libs/glib-2.26:2=
-	>=media-libs/mesa-7.10:=
-	>=media-libs/libpng-1.5.13:0=[apng]
-	>=x11-libs/pango-1.14.0:=
-	>=x11-libs/gtk+-2.14:2=
-	virtual/libffi:=
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10=[ffmpeg] )
-	system-cairo? ( >=x11-libs/cairo-1.12:=[X] )
-	system-icu? ( dev-libs/icu:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3=[secure-delete,debug=] )
-	>=media-libs/libvpx-1.0.0:=
+	>=dev-libs/nss-3.15.1
+	>=dev-libs/nspr-4.10
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.5.13[apng]
+	>=x11-libs/pango-1.14.0
+	>=x11-libs/gtk+-2.14:2
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-icu? ( dev-libs/icu )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.7.16.1:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.0.0
 	crypt? ( >=app-crypt/gnupg-1.4 )
-	kernel_linux? ( media-libs/alsa-lib:= )
+	kernel_linux? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
-	!elibc_glibc? ( dev-libs/libexecinfo:= )
+	!elibc_glibc? ( dev-libs/libexecinfo )
 	virtual/pkgconfig
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
@@ -257,15 +257,15 @@ src_configure() {
 src_compile() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake -f client.mk
+	emake -f client.mk || die
 
 	# Only build enigmail extension if conditions are met.
 	if use crypt ; then
 		cd "${S}"/mailnews/extensions/enigmail || die
 		./makemake -r 2&> /dev/null
 		cd "${S}"/seamonk/mailnews/extensions/enigmail
-		emake
-		emake xpi
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
 	fi
 }
 
@@ -300,7 +300,7 @@ src_install() {
 		|| die
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
 	cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
 
 	if use crypt ; then
@@ -308,7 +308,7 @@ src_install() {
 		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
 		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
 
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
 
@@ -329,8 +329,9 @@ src_install() {
 	fi
 
 	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
+		|| die
+	domenu "${T}"/${PN}.desktop || die
 
 	# Required in order to use plugins and even run seamonkey on hardened.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
@@ -342,7 +343,7 @@ src_install() {
 	# Handle plugins dir through nsplugins.eclass
 	share_plugins_dir
 
-	doman "${S}"/${obj_dir}/suite/app/${PN}.1
+	doman "${S}"/${obj_dir}/suite/app/${PN}.1 || die
 }
 
 pkg_preinst() {