diff options
author | Jory Pratt <anarchy@gentoo.org> | 2009-10-23 02:40:36 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2009-10-23 02:40:36 +0000 |
commit | ff9fab882e72aabe2dd317889efebbe8073bd55b (patch) | |
tree | 1d2165ae1c458bac7669f6efe41358771929e6de /www-client | |
parent | Bump, fixes #278205 (diff) | |
download | gentoo-2-ff9fab882e72aabe2dd317889efebbe8073bd55b.tar.gz gentoo-2-ff9fab882e72aabe2dd317889efebbe8073bd55b.tar.bz2 gentoo-2-ff9fab882e72aabe2dd317889efebbe8073bd55b.zip |
proxy commit for polynomal-c, update to 2.0-rc2 :)
(Portage version: 2.1.7.1/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/seamonkey/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/seamonkey/files/enigmail/0.95.0-replytolist.patch | 23 | ||||
-rw-r--r-- | www-client/seamonkey/files/enigmail/70_enigmail-fix.patch | 11 | ||||
-rw-r--r-- | www-client/seamonkey/seamonkey-2.0_rc2.ebuild | 292 |
4 files changed, 334 insertions, 1 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 9c2e258e6948..ccd54fb0c193 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.204 2009/10/12 03:01:03 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.205 2009/10/23 02:40:35 anarchy Exp $ + +*seamonkey-2.0_rc2 (23 Oct 2009) + + 23 Oct 2009; Jory A. Pratt <anarchy@gentoo.org> + +files/enigmail/0.95.0-replytolist.patch, +seamonkey-2.0_rc2.ebuild, + +files/enigmail/70_enigmail-fix.patch: + Update seamonkey-2, proxy commit for polynomal-c *seamonkey-2.0_rc1 (12 Oct 2009) diff --git a/www-client/seamonkey/files/enigmail/0.95.0-replytolist.patch b/www-client/seamonkey/files/enigmail/0.95.0-replytolist.patch new file mode 100644 index 000000000000..6840f86ccdd4 --- /dev/null +++ b/www-client/seamonkey/files/enigmail/0.95.0-replytolist.patch @@ -0,0 +1,23 @@ +--- mailnews/extensions/enigmail/ui/content/enigmailMessengerOverlay.js.orig 2007-05-22 17:08:53.000000000 +0000 ++++ mailnews/extensions/enigmail/ui/content/enigmailMessengerOverlay.js 2007-05-22 17:09:32.000000000 +0000 +@@ -139,7 +139,8 @@ + // the following headers are added for compatibility with DispMUA extension: + "x-mimeole", + "x-bugzilla-reason", +- "x-php-bug" ]; ++ "x-php-bug", ++ "list-post" ]; + + var addHdr = []; + +--- mailnews/extensions/enigmail/package/prefs/enigmail.js.orig 2007-05-22 17:10:41.000000000 +0000 ++++ mailnews/extensions/enigmail/package/prefs/enigmail.js 2007-05-22 17:10:53.000000000 +0000 +@@ -69,7 +69,7 @@ + pref("extensions.enigmail.handleDoubleClick",false); + + // headers to be retrieved from the mail backend, but hidden from the users +-pref("extensions.enigmail.hideHeaders", "x-enigmail-version openpgp content-transfer-encoding x-mimeole x-bugzilla-reason x-php-bug"); ++pref("extensions.enigmail.hideHeaders", "x-enigmail-version openpgp content-transfer-encoding x-mimeole x-bugzilla-reason x-php-bug list-post"); + + // disable '<' and '>' around email addresses + pref("extensions.enigmail.hushMailSupport",false);
\ No newline at end of file diff --git a/www-client/seamonkey/files/enigmail/70_enigmail-fix.patch b/www-client/seamonkey/files/enigmail/70_enigmail-fix.patch new file mode 100644 index 000000000000..0acf0c8760ed --- /dev/null +++ b/www-client/seamonkey/files/enigmail/70_enigmail-fix.patch @@ -0,0 +1,11 @@ +--- mozilla/extensions/enigmail/package/Makefile.in 14 Mar 2004 16:39:18 -0000 1.73 ++++ mozilla/extensions/enigmail/package/Makefile.in 20 Mar 2004 18:20:08 -0000 +@@ -48,6 +48,8 @@ + + XPIDLSRCS = nsIEnigmail.idl + ++PREF_JS_EXPORTS=prefs/enigmail.js ++ + include $(topsrcdir)/config/rules.mk + + XPIFILE = $(XPI_MODULE)-$(XPI_MODULE_VERS).xpi diff --git a/www-client/seamonkey/seamonkey-2.0_rc2.ebuild b/www-client/seamonkey/seamonkey-2.0_rc2.ebuild new file mode 100644 index 000000000000..b91258936e2f --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.0_rc2.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0_rc2.ebuild,v 1.1 2009/10/23 02:40:35 anarchy Exp $ + +EAPI="2" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 + +PATCH="${PN}-2.0-patches-0.1" +EMVER="0.97a0" + +LANGS="be ca cs de en-US es-AR es-ES fr gl hu ka lt nb-NO nl pl pt-PT ru sk sv-SE tr" +NOSHORTLANGS="es-AR es-ES nb-NO pt-PT sv-SE" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Seamonkey Web Browser" +HOMEPAGE="http://www.seamonkey-project.org" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa +crypt java ldap mozdevelop moznocompose moznoirc moznomail moznoroaming sqlite restrict-javascript" + +REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" +SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 + http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2 + crypt? ( !moznomail? ( http://dev.gentoo.org/~anarchy/dist/enigmail-${EMVER}-20091011.tar.gz ) )" + +for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then + if [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X%%-*}" + fi +done + +RDEPEND="java? ( virtual/jre ) + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.2 + >=dev-libs/nspr-4.8 + alsa? ( media-libs/alsa-lib ) + sqlite? ( >=dev-db/sqlite-3.6.10 ) + >=app-text/hunspell-1.2 + x11-libs/cairo[X] + x11-libs/pango[X] + crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + java? ( >=virtual/jdk-1.4 )" + +PDEPEND="restrict-javascript? ( www-plugins/noscript )" + +S="${WORKDIR}/comm-central" + +# Needed by src_compile() and src_install(). +# Would do in pkg_setup but that loses the export attribute, +# they become pure shell variables. +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 + +linguas() { + local LANG SLANG + for LANG in ${LINGUAS}; do + if has ${LANG} en en_US; then + has en ${linguas} || linguas="${linguas:+"${linguas} "}en" + continue + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" + continue + elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" == "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then + has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" + continue 2 + fi + done + fi + ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + done +} + +src_unpack() { + unpack ${A} + + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi" + done + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + + if use sqlite ; then + einfo + elog "You are enabling system sqlite. Do not file a bug with gentoo if you have" + elog "issues that arise from enabling system sqlite. All bugs will be concidered" + elog "invalid. All patches are welcomed to fix any issues that might be found with" + elog "system sqlite. If you are starting with a fresh profile you can enable sqlite" + elog "without any major issues." + epause 10 + fi +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + if use crypt && ! use moznomail; then + mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail + cd "${S}"/mailnews/extensions/enigmail || die + epatch "${FILESDIR}"/enigmail/70_enigmail-fix.patch + epatch "${FILESDIR}"/enigmail/0.95.0-replytolist.patch + makemake2 + cd "${S}" + fi + + eautoreconf +} + +src_configure() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="default" + + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + mozconfig_config + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + if use moznoirc ; then + MEXTENSIONS="${MEXTENSIONS},-irc" + fi + if use moznoroaming ; then + MEXTENSIONS="${MEXTENSIONS},-sroaming" + fi + + if ! use gnome ; then + MEXTENSIONS="${MEXTENSIONS},-gnomevfs" + fi + + if use moznomail ; then + mozconfig_annotate '+moznomail' --disable-mailnews + fi + + if use moznocompose ; then + if use moznoirc && use moznomail ; then + mozconfig_annotate '+moznocompose' --disable-composer + fi + fi + + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --enable-application=suite + mozconfig_annotate 'broken' --disable-mochitest + mozconfig_annotate 'broken' --disable-crashreporter + mozconfig_annotate '' --enable-system-hunspell + mozconfig_annotate '' --enable-system-sqlite + mozconfig_annotate '' --enable-image-encoder=all + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --with-system-nspr + mozconfig_annotate '' --with-system-nss + mozconfig_annotate '' --enable-system-lcms + mozconfig_annotate '' --enable-oji --enable-mathml + mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks + mozconfig_annotate '' --disable-installer + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + # Enable/Disable based on USE flags + mozconfig_use_enable alsa ogg + mozconfig_use_enable alsa wave + mozconfig_use_enable ldap + mozconfig_use_enable ldap ldap-experimental + mozconfig_use_enable sqlite system-sqlite + mozconfig_use_enable java javaxpcom + + # Finalize and report settings + mozconfig_final + + if [[ $(gcc-major-version) -lt 4 ]]; then + append-cxxflags -fno-stack-protector + fi + + #################################### + # + # Configure and build + # + #################################### + + # Work around breakage in makeopts with --no-print-directory + MAKEOPTS="${MAKEOPTS/--no-print-directory/}" + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf +} + +src_compile() { + # Should the build use multiprocessing? Not enabled by default, as it tends to break. + [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" + emake ${jobs} || die + + # Only build enigmail extension if conditions are met. + if use crypt && ! use moznomail; then + emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" + emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + declare emid + + emake DESTDIR="${D}" install || die "emake install failed" + + if use crypt && ! use moznomail; then + cd "${T}" + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf + emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) + + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} + cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi + fi + + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}" + done + + local LANG=${linguas%% *} + if [[ -n ${LANG} && ${LANG} != "en" ]]; then + elog "Setting default locale to ${LANG}" + dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \ + ${MOZILLA_FIVE_HOME}/defaults/pref/suite-l10n.js || \ + die "sed failed to change locale" + fi + + # Install icon and .desktop for menu entry + newicon "${S}"/suite/branding/content/icon64.png seamonkey.png + domenu "${FILESDIR}"/icon/seamonkey.desktop + + # Add vendor + echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \ + >> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js + + # Plugins dir + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir" + dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins + + # shiny new man page + doman "${S}"/suite/app/${PN}.1 +} + +pkg_preinst() { + declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" + + if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then + rm ${MOZILLA_FIVE_HOME}/plugins -rf + fi +} + +pkg_postinst() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # Update mimedb for the new .desktop file + fdo-mime_desktop_database_update +} |