From 95304d5e45691781d4fea19780b3f52d9797d297 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 4 Dec 2011 01:15:25 +0000 Subject: [PATCH] Revbump for new enigmail version Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- www-client/seamonkey/ChangeLog | 7 +- www-client/seamonkey/Manifest | 30 +- www-client/seamonkey/seamonkey-2.5-r1.ebuild | 349 +++++++++++++++++++ 3 files changed, 371 insertions(+), 15 deletions(-) create mode 100644 www-client/seamonkey/seamonkey-2.5-r1.ebuild diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index fdce50f43e6c..80ed1bb8dfd6 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,11 @@ # 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.346 2011/11/23 22:59:52 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.347 2011/12/04 01:15:25 polynomial-c Exp $ + +*seamonkey-2.5-r1 (04 Dec 2011) + + 04 Dec 2011; Lars Wendler +seamonkey-2.5-r1.ebuild: + Revbump for new enigmail version. 23 Nov 2011; Lars Wendler seamonkey-2.5.ebuild: Use nsplugins.eclass to handle the plugins directory. diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 9a72ac6d7153..9d5821cc4e08 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -14,6 +14,7 @@ AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6 +DIST enigmail-1.3.4.tar.gz 1369381 RMD160 5691a644368982038352c9da45a633ca72e85c36 SHA1 601ec7e4e8eb1a732d26d650392680b4415b56b9 SHA256 967b1c3ff24d87ab05207aff6f40adaa06b302f9e753c0012896e47f7ef75c39 DIST seamonkey-2.0.11-patches-01.tar.bz2 17740 RMD160 00747880b61bab159a48cca01766dd788fdbfcee SHA1 5f3be090d2d65d361b2b337fbd2c30b589cdfa3d SHA256 1d032cdb98a65910b4ec5c64e4649b7a25fc2a8f604b0ae2f7a24199d408e76e DIST seamonkey-2.0.14-be.xpi 482603 RMD160 c70bea0d4d877112d9624c20c82445599188b736 SHA1 a3413bdbaaea8032717bbb0e10fee24f1b89e9f9 SHA256 c803810ff7942252519cb89b25665416a11251281f435909626e5fb5a514f6a5 DIST seamonkey-2.0.14-ca.xpi 488176 RMD160 761a5ce8bc202156f98bd340f26c080614640314 SHA1 24d917d90a066360a9814d74a0e60a4d2037a3c5 SHA256 1fa18a23049110de5d08fa58796dce6fb3d71d6ef4aa73dec480a3b09e73726e @@ -95,23 +96,24 @@ DIST seamonkey-2.5.source.tar.bz2 89448141 RMD160 81e0f2d8e3a42504492aaa7518c6b7 EBUILD seamonkey-2.0.14-r1.ebuild 10054 RMD160 80bfa858c9aad60915a85350e5445543d420365c SHA1 4bf61a4afef3bdbc290090d3300dbecf0ae58b34 SHA256 a720515c9049acd997ca07bbb09598c67f7a1feac53f8edf590aa44fedb85dd3 EBUILD seamonkey-2.4.1-r1.ebuild 9966 RMD160 0d841f11a966b26c6ebc08282692c71ca770f04b SHA1 512025dd1d746507f4535e38a9f70fa6de6eb04b SHA256 79cc6cdd23ffd8c9ee40761a85023c410648352551808f6bf0e85ed16adfa413 EBUILD seamonkey-2.4.1-r2.ebuild 9975 RMD160 5bb07b3de91a49fc3db03690e3be380a660816fc SHA1 8819355202d0ec647abb331d2bb185ba2291eaa3 SHA256 7ab3e5b1c64aabfb9f09bbaeff6c2a438174d4c134481c5542a812fb4a43573e +EBUILD seamonkey-2.5-r1.ebuild 9889 RMD160 d96877d599953af29cde2cedc13b2a7b132c60fa SHA1 ba827d644489de6177f8fdca331b3eff86f9557f SHA256 05caab717a225ace09282ed84ca445d63fa4dda7c81a42deea073869185dfbe0 EBUILD seamonkey-2.5.ebuild 9886 RMD160 ee263fadb60e666c1c38d9f9c9722f243dadc7a7 SHA1 1b7b324eed52025b97568e05f32fa63f3fdfff45 SHA256 e04b7f8c5cb465eddca2582c9de4e3546bb05608cdee3f0bb2d29bdb8012a350 -MISC ChangeLog 47215 RMD160 0ce0eb1a8ddf2ff8fd98cbda8dc89255e82de60a SHA1 b3106cc8866e58a2f4fd0b724c413bc06a63e4ed SHA256 31bd0134fe34c37617b5106f42ade886480e230acbb1502f622191b8b77bed15 +MISC ChangeLog 47365 RMD160 78cf6cfdbc38f997935e728f1e61b6fcfde899e6 SHA1 aac97f62ab260a2b99c4a891dbc971800fd2f8f3 SHA256 a0752294f3f85ba635716e7bc3e5a6a793f043165d5b023e72c2d6827d518cdb MISC metadata.xml 1203 RMD160 07b5c5905b728e0b7521bb4439202ae1cec77c3a SHA1 f42d497b2df9c49c60cb90c12133cb606bef00ee SHA256 fb43305a3b286be0abe32304ef90b2a2611bd3f2fdc55419904b1e7b2af04178 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOzXruAAoJEPiazRVxLXTFXgcP/i5MUq1PAn6G5ThqVq2RHwXy -Hq3fWwou+aziiYyKsS2dBuxAmPKNsZrZV3dKxCPIwaypZ1wHAx6kVhfrSlCOccbq -u5gWzl2HVB2ph1yS4zB4a4buZwQY2K/6uaInkmRmXSn9rw5s1M4Zgh3RP5p5lyPh -x08f1meOxFKIOX92sZGz+iLjcgL/1ksXWbxTG/YGYdw+vRDaOt9Fnl9lRAhYnO5d -Yn1HJFqjoWeC0E0hzJV9a/Cb7JF4QTGRiUIx3DgZH33lB/m+PejjrFhynhgYV1Gz -Fpxo/hjb0ilGb1D+Nnwx7VzcHd8HOU9nOEM6IWjNcalM1Key3BMewTPOqwyOv2nj -C6sISjbP3+UNEClkLOIA1+NDBN7xx6/85X9wToTF2W4eYpjd3t5DLBYJOFo41SNC -PFAInDMDVbZTYrqHYqR0ApH6PqKMSQeaSYfJY3k+1/hiWxTr8qCVYgGcdDrLB0/L -rSHihe/q7+ysxgJg3qep+F6mep56LaGgaWd/3ghK7yHAJWLZdZT7Vh68dnRhzuc0 -cLdYmyNAeYOhnQxwSL9mokyuIUqajJujYeEljiCt+lFml/QplBogMgFVUZJSWPa2 -FHzT7LtdvfVByTsCY0uAe038pWTAlGN7D8kPJS825mtnpF15PwOddBeZMxa+fqNF -bR3Ww78TQxMJsnGyVn7F -=KYkQ +iQIcBAEBCgAGBQJO2smzAAoJEPiazRVxLXTFiBoP/j/o4wF4hjZKNIe22kDNsJQ5 +1Hwy/8nHhF4QiPnMxZoNjVU06yXl5adygxzW9fV9htODNwnhMMhvwTSM6pxCwjs0 +iuA8ZfUzQIEF6hvORO0upGIbkumT9AstCbSDtXbA7ARIIWJK8s0NqUob+NwvRoCc +IZgCTYFkoYOXz5zDNg7VkItAwQLnvVHKI8943h332uGkJDJ1Ty9bVXB6lYEPOkIo +0Y5sPj8pyCp+pwouc+wXV8yyAQ+Vd2Kvg5dHDgXNvpWgYR9F6NYbljoPP8uVHp5f +kh74okQurXhsWvPUJbLMGAZkLorH9TFDJ85+ypZIg2Oteikw1RlAg4WSVsGJxMqt +HaoB9JTImV0Og8uj7A2/OiwWYjFEnQbWA5kBWVeXBgnUk+0LG8fw985ltJRwQciI +Ch2TNzHMWRA0WRjNWBcsMEVJkEMjSWXqEqFzRHETuVZYl9DY0YMGHL1bN4ukcHYB +wks6xCKSFiHv22F90K4d4XrGnd/lKwxRp2CFA2EYkhyLiDXO/TvGx1XTgrLfNZ1N +CjiumWmf3y+BFoVOuuufrsUppnMAgG8eCgxElBSqwJzKEuXeKZQpD2RRhIwdbkr2 +KVKBYyoGMIPMwrimAmkCddbs+Vtq685WGhrEuy10tyOKc3G3PucWIkaOOtLI+xqk +rEwnE44CQcH1zc0dbX1F +=kbEG -----END PGP SIGNATURE----- diff --git a/www-client/seamonkey/seamonkey-2.5-r1.ebuild b/www-client/seamonkey/seamonkey-2.5-r1.ebuild new file mode 100644 index 000000000000..4b5c7f8f493b --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.5-r1.ebuild @@ -0,0 +1,349 @@ +# 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.5-r1.ebuild,v 1.1 2011/12/04 01:15:25 polynomial-c Exp $ + +EAPI="3" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins + +PATCH="${PN}-2.5-patches-01" +EMVER="1.3.4" + +MY_PV="${PV/_pre*}" +MY_PV="${MY_PV/_alpha/a}" +MY_PV="${MY_PV/_beta/b}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +# release versions usually have language packs. So be careful with changing this. +HAS_LANGS="true" +LANGPACK_PREFIX="${MY_P}." +LANGPACK_SUFFIX=".langpack" +if [[ ${PV} == *_pre* ]] ; then + # pre-releases. No need for arch teams to change KEYWORDS here. + + REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}" + #LANG_URI="${REL_URI}/langpack" + LANG_URI="${REL_URI}/linux-i686/xpi" + LANGPACK_PREFIX="" + LANGPACK_SUFFIX="" + #KEYWORDS="" + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" + #HAS_LANGS="false" +else + # This is where arch teams should change the KEYWORDS. + + #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}" + REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}" + LANG_URI="${REL_URI}/langpack" + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" + [[ ${PV} == *alpha* ]] && HAS_LANGS="false" +fi + +DESCRIPTION="Seamonkey Web Browser" +HOMEPAGE="http://www.seamonkey-project.org" + +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm" + +SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2 + http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz + crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )" + +if ${HAS_LANGS} ; then + 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) + + for X in "${LANGS[@]}" ; do + # en is handled internally + if [[ ${X} != en ]] ; then + SRC_URI+=" + linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" + fi + IUSE+=" linguas_${X/-/_}" + # Install all the specific locale xpis if there's no generic locale xpi + # Example: there's no pt.xpi, so install all pt-*.xpi + if ! has ${X%%-*} "${LANGS[@]}"; then + SRC_URI+=" + linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" + IUSE+=" linguas_${X%%-*}" + fi + done +fi + +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.12.10 + >=dev-libs/nspr-4.8.8 + >=dev-libs/glib-2.26 + >=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 + virtual/libffi + 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 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + webm? ( amd64? ( ${ASM_DEPEND} ) + x86? ( ${ASM_DEPEND} ) )" + +if [[ ${PV} == *beta* ]] ; then + S="${WORKDIR}/comm-beta" +else + S="${WORKDIR}/comm-release" +fi + +# TODO: Move all the linguas crap to an eclass +linguas() { + # Generate the list of language packs called "linguas" + # This list is used to install the xpi language packs + local LINGUA + for LINGUA in ${LINGUAS}; do + if has ${LINGUA} en ; then + # For mozilla products, en and en_US are handled internally + continue + # If this language is supported by ${P}, + elif has ${LINGUA} "${LANGS[@]//-/_}"; then + # Add the language to linguas, if it isn't already there + has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-}) + continue + # For each short LINGUA that isn't in LANGS, + # add *all* long LANGS to the linguas list + elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then + for LANG in "${LANGS[@]}"; do + if [[ ${LANG} == ${LINGUA}-* ]]; then + has ${LANG} "${linguas[@]}" || linguas+=(${LANG}) + continue 2 + fi + done + fi + ewarn "Sorry, but ${P} does not support the ${LINGUA} locale" + done +} + +src_unpack() { + unpack ${A} + + if ${HAS_LANGS} ; then + linguas + for X in "${linguas[@]}"; do + # FIXME: Add support for unpacking xpis to portage + xpi_unpack "${P}-${X}.xpi" + done + fi +} + +pkg_setup() { + if [[ ${PV} == *_pre* ]] ; then + ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" + ewarn "Gentoo's Bugtracker against this package in case it breaks for you." + ewarn "Those belong to upstream: https://bugzilla.mozilla.org" + fi + + moz_pkgsetup + + if ! use methodjit ; then + einfo + ewarn "You are disabling the method-based JIT in JägerMonkey." + ewarn "This will greatly slowdown JavaScript in ${PN}!" + fi +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/_seamonkey" + + # 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.3.1-scrollbar-mouse-interaction-improvement.patch + + # Allow user to apply any additional patches without modifing ebuild + epatch_user + + if use crypt ; then + mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail + epatch "${FILESDIR}"/enigmail/enigmail-1.3.3-bug373733.patch + cd "${S}"/mailnews/extensions/enigmail || die + ./makemake -r 2&>/dev/null + sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \ + -i Makefile.in || die + cd "${S}" + fi + + #Ensure we disable javaxpcom by default to prevent configure breakage + sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \ + || die "sed javaxpcom" + + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \ + || die "Failed to remove gnomevfs extension" + + eautoreconf +} + +src_configure() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="" + + #################################### + # + # 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 chatzilla ; then + MEXTENSIONS+=",-irc" + fi + if ! use roaming ; then + MEXTENSIONS+=",-sroaming" + fi + + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + mozconfig_annotate '' --enable-system-ffi + + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" + + mozconfig_use_enable system-sqlite + mozconfig_use_enable methodjit + + if use crypt ; then + mozconfig_annotate "mail crypt" --enable-chrome-format=jar + fi + + mozconfig_annotate '' --with-system-png + + # Finalize and report settings + mozconfig_final + + if [[ $(gcc-major-version) -lt 4 ]]; then + append-cxxflags -fno-stack-protector + elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then + if use amd64 || use x86; then + append-flags -mno-avx + fi + 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)" PYTHON="$(PYTHON)" econf +} + +src_compile() { + emake || die + + # Only build enigmail extension if conditions are met. + if use crypt ; 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" + cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die + + if use crypt ; then + cd "${T}" || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die + emid=$(sed -n '//!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) + + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die + cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die + fi + + sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ + -i "${T}"/${PN}.desktop || die + sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ + || die + + if ${HAS_LANGS} ; then + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" + done + fi + + # Add StartupNotify=true bug 290401 + if use startup-notification ; then + echo "StartupNotify=true" >> "${T}"/${PN}.desktop + fi + + # Install icon and .desktop for menu entry + newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \ + || die + domenu "${T}"/${PN}.desktop || die + + # Add our default prefs + sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \ + > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \ + || die + + # Handle plugins dir through nsplugins.eclass + share_plugins_dir + + doman "${S}"/suite/app/${PN}.1 || die +} + +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 + + if use chatzilla ; then + elog "chatzilla is now an extension which can be en-/disabled and configured via" + elog "the Add-on manager." + fi +} -- 2.26.2