commit: 3f9d20dfbe3471a653887991b782a4f64eb83872
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 5 23:10:18 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Nov 5 23:10:18 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3f9d20df
Synced some bug fixes with the tree, expanded system-gmps test to seamonkey
Also adjusted the old 1.1 gmp-openh264 plugin so that it installs the same as
the 1.2 bump.
Moved IUSE="selinux" to the eclass, same as in the portage tree.
---
eclass/mozconfig-v5.33.eclass | 5 ++++-
eclass/mozconfig-v5.34.eclass | 5 ++++-
...1.ebuild => gmp-openh264-1.1_p20141021-r1.ebuild} | 10 ++++++----
.../{firefox-33.0.ebuild => firefox-33.0-r1.ebuild} | 8 +++++---
...eamonkey-2.30.ebuild => seamonkey-2.30-r1.ebuild} | 20 ++++++++++++++++----
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index df196b8..6d85651 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -113,6 +113,9 @@ DEPEND="app-arch/zip
>=sys-devel/binutils-2.16.1
${RDEPEND}"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mozilla )"
+
# @FUNCTION: mozconfig_config
# @DESCRIPTION:
# Set common configure options for mozilla packages.
diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
index bb4c41f..020d6ec 100644
--- a/eclass/mozconfig-v5.34.eclass
+++ b/eclass/mozconfig-v5.34.eclass
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer pulseaudio startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification
system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -113,6 +113,9 @@ DEPEND="app-arch/zip
>=sys-devel/binutils-2.16.1
${RDEPEND}"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mozilla )"
+
# @FUNCTION: mozconfig_config
# @DESCRIPTION:
# Set common configure options for mozilla packages.
diff --git a/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild
b/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021-r1.ebuild
similarity index 83%
rename from media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild
rename to media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021-r1.ebuild
index 705e2a3..c31e770 100644
--- a/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021.ebuild
+++ b/media-plugins/gmp-openh264/gmp-openh264-1.1_p20141021-r1.ebuild
@@ -30,9 +30,11 @@ src_compile() {
}
src_install() {
- insinto /usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/${PV}
+ local
plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/system-installed"
+
+ insinto /${plugpath}
doins libgmpopenh264.so gmpopenh264.info
- echo
"MOZ_GMP_PATH=\"${EROOT}usr/$(get_libdir)/${PLUGINS_DIR}/gmp-${PN/-/}/${PV}\""
>"${T}"/98-moz-${PN}
+ echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-${PN}
doenvd "${T}"/98-moz-${PN}
}
@@ -42,9 +44,9 @@ pkg_postinst() {
elog "overridden in a user's profile (ie, about:config)."
elog ""
elog "Also, if a previous mozilla version has already installed
gmp-gmpopenh264"
- elog "into a user's profile, that version will take precedence over
this package"
+ elog "into a user's profile, that version may take precedence over this
package"
elog "and will need to be removed before the files installed by this
package"
- elog "will be used."
+ elog "are certain to be used."
elog ""
ewarn "You may need to modify each user's .mozilla profile"
ewarn "by hand, disabling autoupdates in about:config and deleting any"
diff --git a/www-client/firefox/firefox-33.0.ebuild
b/www-client/firefox/firefox-33.0-r1.ebuild
similarity index 97%
rename from www-client/firefox/firefox-33.0.ebuild
rename to www-client/firefox/firefox-33.0-r1.ebuild
index 9701a8f..82a572e 100644
--- a/www-client/firefox/firefox-33.0.ebuild
+++ b/www-client/firefox/firefox-33.0-r1.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.mozilla.com/firefox";
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +minimal pgo selinux system-gmps test"
+IUSE="bindist hardened +minimal pgo system-gmps test"
# More URIs appended below...
SRC_URI="${SRC_URI}
@@ -51,11 +51,9 @@ SRC_URI="${SRC_URI}
ASM_DEPEND=">=dev-lang/yasm-1.1"
-# Mesa 7.10 needed for WebGL + bugfixes
RDEPEND="
>=dev-libs/nss-3.17.1
>=dev-libs/nspr-4.10.6
- selinux? ( sec-policy/selinux-mozilla )
system-gmps? ( media-plugins/gmp-openh264 )"
DEPEND="${RDEPEND}
@@ -150,6 +148,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-jemalloc-configure.patch
epatch "${FILESDIR}"/${PN}-32.0-hppa-js-configure.patch # bug 524556
+ epatch "${FILESDIR}"/${PN}-31.0-webm-disallow-negative-samples.patch #
bug 527010
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -307,6 +306,9 @@ src_install() {
echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
|| die
+ echo "pref(\"media.${plugin}.version\", \"system-installed\");"
>> \
+
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
done
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
diff --git a/www-client/seamonkey/seamonkey-2.30.ebuild
b/www-client/seamonkey/seamonkey-2.30-r1.ebuild
similarity index 93%
rename from www-client/seamonkey/seamonkey-2.30.ebuild
rename to www-client/seamonkey/seamonkey-2.30-r1.ebuild
index b699a7f..05a4c23 100644
--- a/www-client/seamonkey/seamonkey-2.30.ebuild
+++ b/www-client/seamonkey/seamonkey-2.30-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30.ebuild,v 1.1
2014/10/21 18:29:15 polynomial-c Exp $
+# $Header:
/var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30.ebuild,v 1.2
2014/11/02 10:28:35 swift Exp $
EAPI=5
WANT_AUTOCONF="2.1"
@@ -49,7 +49,7 @@ fi
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt +ipc minimal pulseaudio +roaming selinux test"
+IUSE="+chatzilla +crypt +ipc minimal pulseaudio +roaming system-gmps test"
SRC_URI="${SRC_URI}
${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
@@ -69,7 +69,7 @@ RDEPEND=">=dev-libs/nss-3.17.1
)
)
=app-crypt/gnupg-1.4* ) )
- selinux? ( sec-policy/selinux-mozilla )
+ system-gmps? ( media-plugins/gmp-openh264 )
system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )"
DEPEND="${RDEPEND}
@@ -122,7 +122,8 @@ src_prepare() {
epatch "${WORKDIR}/seamonkey"
epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch \
- "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch
+ "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch \
+ "${FILESDIR}"/${PN}-2.30-webm-disallow-negative-samples.patch
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
@@ -281,6 +282,17 @@ src_install() {
"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js"
\
|| die
+ local plugin
+ use system-gmps && for plugin in \
+ gmp-gmpopenh264 ; do
+ echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ echo "pref(\"media.${plugin}.version\", \"system-installed\");"
>> \
+
"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || die
+ done
+
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
emake DESTDIR="${D}" install
cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
