From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QDum5-0000ea-Ou for garchives@archives.gentoo.org; Sun, 24 Apr 2011 08:34:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DD011C090; Sun, 24 Apr 2011 08:34:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3995F1C090 for ; Sun, 24 Apr 2011 08:34:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A95941B4038 for ; Sun, 24 Apr 2011 08:33:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1557B803E3 for ; Sun, 24 Apr 2011 08:33:59 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/seamonkey/Manifest www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild X-VCS-Directories: www-client/seamonkey/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e64d404db5956fece917550b7b8c2567e4e614a5 Date: Sun, 24 Apr 2011 08:33:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9d5e29965d98798ac7c387b1827ea9ce commit: e64d404db5956fece917550b7b8c2567e4e614a5 Author: Lars Wendler gentoo org> AuthorDate: Sun Apr 24 08:33:38 2011 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Apr 24 08:33:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3De64d404d seamonkey: Revbump for new patchset --- www-client/seamonkey/Manifest | 2 + www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild | 323 ++++++++++++++= ++++++ 2 files changed, 325 insertions(+), 0 deletions(-) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifes= t index e33fab8..fe5ca6c 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -19,9 +19,11 @@ DIST seamonkey-2.1b3-es-ES.xpi 795595 RMD160 b9d8df24c= cb3c85abcf21e1d3fdfec72f16 DIST seamonkey-2.1b3-fr.xpi 899042 RMD160 a81088870ac0562e95d06ffe14e982= 93eece926a SHA1 bf885313365e289ce1e07c40c218c0ac68611b95 SHA256 656c5fcfe= b6526b58d2e1acf72c205a91a25b02e0839791e45b8f4a3df398dde DIST seamonkey-2.1b3-lt.xpi 993451 RMD160 cd83a927611b850f9c52a53295085a= f500748e02 SHA1 bc0c5222a5e0b91a68143657214021b3f7fb917e SHA256 d30fa819a= 56c80c25f528fbe6f5450e1a97c5d7f7dff7c8f6d62b8288639c210 DIST seamonkey-2.1b3-nl.xpi 807901 RMD160 1fc8aefaff8f898b0c3db507fa4bc0= 93252c8667 SHA1 7ca2ef1549d2536f620aa2f3c253f37e30aa00bc SHA256 e22254667= 634c0313a224eacd956a0420497e000416291a84459b60d365c4440 +DIST seamonkey-2.1b3-patches-01.tar.xz 63920 RMD160 b4af63cb56b6f455c02a= c4b647d4c5e8a74088c1 SHA1 8a1bf68dee37b92925daa16386e4f6cb37efb711 SHA256= 44c2ac3f234aa60f101c25e5aa283611ef8e6af872f63724bf45be6e23676512 DIST seamonkey-2.1b3-pl.xpi 829704 RMD160 82f40e4283cc3dc953257f767784b7= c42949955f SHA1 6d315f2f9e77c5549ca1024a2b45b741cb6a4425 SHA256 5488c9069= cf0b186199d17a53ce44688d568907c929b04a245a5140e5c6387f4 DIST seamonkey-2.1b3-pt-PT.xpi 845362 RMD160 847939fad173f1359210a36685d= 528af622cf1ee SHA1 6c9559a02a4f9ab1b2b41a3a6b5e831e336747f6 SHA256 f5250b= e0a077d1d77d51d0d0eb7d8339d967a8310e093fc42e5ef345e070f9f8 DIST seamonkey-2.1b3-ru.xpi 891638 RMD160 58ea86a0c9552ec939782ae07245e6= fb65bdf201 SHA1 9da64d0a0c20cf15f1dff177b0cf79cca9c1a7a9 SHA256 7b6e332e9= bc77d294675c773ce0bc09a7f1b0515313d24e108bda1ca5408d0f6 DIST seamonkey-2.1b3-sk.xpi 843090 RMD160 32f1c70a1bb5635c7e57d6b7862601= 398ba31594 SHA1 9d87f6882d2548a68df190d8f47ed0f63a2c0431 SHA256 01d4a0e2a= ae52ee6acc7388e16cbb5b00f370a30d9e2335ed22c23fb7e9d9f6a DIST seamonkey-2.1b3.source.tar.bz2 84193584 RMD160 6d4f1d224d680e6fed77= 3ba5306cbabcbae4ca62 SHA1 7b4ba58cf5df42cec8e840f2f0416604a1ad87d9 SHA256= 97afefa90d86c873d3e78238bab44f57efedba296291fe0320458b26df9d9ec9 EBUILD seamonkey-2.1_beta3-r1.ebuild 9819 RMD160 0e7cd56fe3f37ea5770adf4= e386d1d8873cb09ab SHA1 f8d63347e7d4b63112adb15823573bfcc4346349 SHA256 1a= b19daef0fcd52a37229a1981ab758eb5a5caa2d5811ec862968adb7d7fe2db +EBUILD seamonkey-2.1_beta3-r2.ebuild 9501 RMD160 e898b7b3d0f52c6fab542b7= 706324f358a48550f SHA1 8a6b1da8d528ccf62c632a993cde6184a8c5f816 SHA256 de= d45509fb5822cac0c1bba0d7f185b5740e70cda6bba66964311c9451d0c2d6 diff --git a/www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild b/www-cli= ent/seamonkey/seamonkey-2.1_beta3-r2.ebuild new file mode 100644 index 0000000..da68314 --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.1_beta3-r2.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-= r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $ + +EAPI=3D"3" +WANT_AUTOCONF=3D"2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multili= b fdo-mime autotools mozextension python + +PATCH=3D"${PN}-2.1b3-patches-01" +EMVER=3D"1.1.2" + +LANGS=3D"be cs de en en-US es-AR es-ES fr lt nl pl pt-PT ru sk" +NOSHORTLANGS=3D"en-US es-AR" + +MY_PV=3D"${PV/_pre*}" +MY_PV=3D"${MY_PV/_alpha/a}" +MY_PV=3D"${MY_PV/_beta/b}" +MY_PV=3D"${MY_PV/_rc/rc}" +MY_P=3D"${PN}-${MY_PV}" + +[[ ${MY_PV} =3D=3D 2.1b3 ]] && MY_PV=3D"${MY_PV}-real" + +# release versions usually have language packs. So be careful with chang= ing this. +HAS_LANGS=3D"true" +if [[ ${PV} =3D=3D *_pre* ]] ; then + # pre-releases. No need for arch teams to change KEYWORDS here. + + REL_URI=3D"ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}= -candidates/build${PV##*_pre}" + #KEYWORDS=3D"" + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + #HAS_LANGS=3D"false" +else + # This is where arch teams should change the KEYWORDS. + + REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/$= {MY_PV}" + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + [[ ${PV} =3D=3D *alpha* ]] && HAS_LANGS=3D"false" +fi + +DESCRIPTION=3D"Seamonkey Web Browser" +HOMEPAGE=3D"http://www.seamonkey-project.org" + +SLOT=3D"0" +LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE=3D"+alsa +chatzilla +composer +crypt gconf ldap +mailclient +roamin= g +webm" + +SRC_URI=3D"${REL_URI}/source/${MY_P}.source.tar.bz2 + http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz + crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enig= mail-${EMVER}-20110410.tar.bz2 ) )" + +if ${HAS_LANGS} ; then + for X in ${LANGS} ; do + if [ "${X}" !=3D "en" ] ; then + SRC_URI=3D"${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi ->= ${MY_P}-${X}.xpi )" + fi + IUSE=3D"${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then + #if [ "${X}" !=3D "en-US" ]; then + SRC_URI=3D"${SRC_URI} + linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -= > ${MY_P}-${X}.xpi )" + #fi + IUSE=3D"${IUSE} linguas_${X%%-*}" + fi + done +fi + +RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 + >=3Ddev-libs/nss-3.12.9 + >=3Ddev-libs/nspr-4.8.7 + >=3Dmedia-libs/libpng-1.4.1[apng] + >=3Dx11-libs/pango-1.14.0[X] + gconf? ( >=3Dgnome-base/gconf-1.2.1:2 ) + crypt? ( mailclient? ( >=3Dapp-crypt/gnupg-1.4 ) ) + webm? ( media-libs/libvpx + media-libs/alsa-lib )" + +DEPEND=3D"${RDEPEND} + dev-util/pkgconfig + dev-lang/yasm" + +S=3D"${WORKDIR}/comm-central" + +linguas() { + local LANG SLANG + for LANG in ${LINGUAS}; do + if has ${LANG} en en_US; then + has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" + continue + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${= LANG//_/-}" + continue + elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then + has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" + continue 2 + fi + done + fi + ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + done +} + +src_unpack() { + unpack ${A} + + if ${HAS_LANGS} ; then + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} !=3D "en" ]] && xpi_unpack "${MY_P}-${X}.xpi" + done + if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi + fi +} + +pkg_setup() { + if [[ ${PV} =3D=3D *_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 +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX=3D"patch" \ + EPATCH_FORCE=3D"yes" \ + epatch "${WORKDIR}/patch" + + epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch + + EPATCH_OPTS=3D"-R" \ + epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b= 2.diff + + if use crypt && use mailclient ; then + mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail + cd "${S}"/mailnews/extensions/enigmail || die + epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfi= x.patch + epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff + eautomake + makemake2 + sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \ + -i Makefile.in || die + cd "${S}" + fi + + #pushd "${S}"/mozilla &>/dev/null || die pushd + #popd &>/dev/null || die popd + + #Ensure we disable javaxpcom by default to prevent configure breakage + sed -i -e s:MOZ_JAVAXPCOM\=3D1::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 + cd "${S}"/mozilla || die + eautoreconf + cd "${S}"/mozilla/js/src || die + eautoreconf +} + +src_configure() { + declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" + MEXTENSIONS=3D"" + + #################################### + # + # 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=3D"${MEXTENSIONS},-irc" + fi + if ! use roaming ; then + MEXTENSIONS=3D"${MEXTENSIONS},-sroaming" + fi + + if ! use composer ; then + if ! use chatzilla && ! use mailclient ; then + mozconfig_annotate '-composer' --disable-composer + fi + fi + + mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE= _HOME} + + mozconfig_use_enable gconf + mozconfig_use_enable ldap + mozconfig_use_enable ldap ldap-experimental + mozconfig_use_enable mailclient mailnews + + if use mailclient && use crypt ; then + mozconfig_annotate "mail crypt" --enable-chrome-format=3Djar + fi + + # ZOMG! Mozilla guys wanna have APNG in libpng if building with + # system-libpng. Kids, leave your fingers from drugs that make y= ou + # do such nasty "extensions"!!! + # See https://bugs.gentoo.org/183370 for details. + mozconfig_annotate '' --with-system-png + + # 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=3D"${MAKEOPTS/--no-print-directory/}" + + CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" PYTHON=3D"$(= PYTHON)" econf +} + +src_compile() { + # Should the build use multiprocessing? Not enabled by default, as it t= ends to break. + [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" + emake ${jobs} || die + + # Only build enigmail extension if conditions are met. + if use crypt && use mailclient ; then + emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail fai= led" + emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enig= mail xpi failed" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" + declare emid + + emake DESTDIR=3D"${D}" install || die "emake install failed" + cp -f "${FILESDIR}"/icon/seamonkey.desktop "${T}" || die + + if use crypt && use mailclient ; then + cd "${T}" || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die + emid=3D$(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 + + sed 's|^\(MimeType=3D.*\)$|\1MimeType=3Dtext/x-vcard;text/directory;ap= plication/mbox;message/rfc822;x-scheme-handler/mailto;|' \ + -i "${T}"/${PN}.desktop || die + sed 's|^\(Categories=3D.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ + || die + fi + + if ${HAS_LANGS} ; then + linguas + for X in ${linguas}; do + [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}" + done + fi + + # Install icon and .desktop for menu entry + newicon "${S}"/suite/branding/nightly/content/icon64.png seamonkey.png = \ + || die + domenu "${T}"/seamonkey.desktop || die + + # Add StartupNotify=3Dtrue bug 290401 + if use startup-notification ; then + echo "StartupNotify=3Dtrue" >> "${D}"/usr/share/applications/seamonkey= .desktop + fi + + # Add our default prefs + sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \ + > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \ + || die + + # Plugins dir + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove exis= ting plugins dir" + dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die + + doman "${S}"/suite/app/${PN}.1 || die +} + +pkg_preinst() { + declare MOZILLA_FIVE_HOME=3D"${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=3D"/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 conf= igured via" + elog "the Add-on manager." + fi +}