From: Raúl Porcel Date: Wed, 24 Jan 2007 16:21:30 +0000 (+0000) Subject: Version bump, bug 162767, thanks to Lars (Polynomial-C) for the patch Package-Manager: portage-2.1.2-r2 --- diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 1be0f3f6a4af..09e71a1a3267 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.45 2007/01/20 10:57:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.46 2007/01/24 16:21:30 armin76 Exp $ + +*seamonkey-1.1 (24 Jan 2007) + + 24 Jan 2007; Raúl Porcel +seamonkey-1.1.ebuild: + Version bump, bug 162767, thanks to Lars (Polynomial-C) for the patch 20 Jan 2007; Raúl Porcel -seamonkey-1.0.2.ebuild, -seamonkey-1.0.3.ebuild, -seamonkey-1.0.5.ebuild, -seamonkey-1.0.6.ebuild: diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index e7ff9e73af98..a56f61e8ff47 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -21,14 +21,20 @@ SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af files/se DIST enigmail-0.94.1.tar.gz 513084 RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 SHA1 d507757c065b607edecd193406ad60fcb7a67ace SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1 DIST seamonkey-1.0.7-patches-0.1.tar.bz2 18634 RMD160 2099422b7d327c327a8f9104e1d7103925847379 SHA1 c6327568430ce22750d387e9e317fecdfa92aa2b SHA256 731147d5c5d02be16e719ae6373258a4b1a9d08c32a8e3135114df7571d1867e DIST seamonkey-1.0.7.source.tar.bz2 35944994 RMD160 a5e0d7cf5bf86665da3e29ac83f353e20917321d SHA1 55ecc2caad917b2a3e280267a0e74a9951d6e557 SHA256 6b1462791c2230dbaf8be2dcb010054b4398e9d63ded251500f5d8f969065ed7 +DIST seamonkey-1.1-patches-0.1.tar.bz2 14304 RMD160 759f02b9b4d892341b9ee5fd0bcfd904e52057b7 SHA1 1046dad457c8b804291f79b0dba245a2b723d1e8 SHA256 7a38eed9f04491f67b2dcdf3f00173df22ad088a11f44a7782860a3745ad11ea +DIST seamonkey-1.1.source.tar.bz2 34965668 RMD160 ffb85d9871f52527c571d6d7ec9f1f9a262ae7d6 SHA1 8e778d72d0bab597a641ce02cc2872bc1e3d9f82 SHA256 8999843cf0f42e824d026a863cc58e4be5fcf7eed20f5eb14a3246197b22bfca EBUILD seamonkey-1.0.7.ebuild 8648 RMD160 131e4ae36e6957332a2af98b7fd3173e9d0833bf SHA1 b88f89b34b448130a1746ff1a8a28bd41063cf68 SHA256 74295a8dfad9e2b12cf6688e35754d855cba8a4fc2b4d7ec496a881614690d26 MD5 07700bd0bb34ef2f42268df32e4eda89 seamonkey-1.0.7.ebuild 8648 RMD160 131e4ae36e6957332a2af98b7fd3173e9d0833bf seamonkey-1.0.7.ebuild 8648 SHA256 74295a8dfad9e2b12cf6688e35754d855cba8a4fc2b4d7ec496a881614690d26 seamonkey-1.0.7.ebuild 8648 -MISC ChangeLog 5775 RMD160 13e5b6f0e1e564faa86e3bf3b35fdf8d6b76f1b5 SHA1 85380b476533fda0ded79f369e857cbcea9274f6 SHA256 0c1570398c8c682c6bfe0d16e9a61ab8158c7c1ae2afc03ba978cf05fea40665 -MD5 c19546802afa9bf4bf547dc62f45d697 ChangeLog 5775 -RMD160 13e5b6f0e1e564faa86e3bf3b35fdf8d6b76f1b5 ChangeLog 5775 -SHA256 0c1570398c8c682c6bfe0d16e9a61ab8158c7c1ae2afc03ba978cf05fea40665 ChangeLog 5775 +EBUILD seamonkey-1.1.ebuild 8653 RMD160 c06a779309f30ba379962beaededf0cb35bdd307 SHA1 aa9c91bd48031c91502edd83197413129f1e6227 SHA256 483a75223d352307b418ce4cba2d3c345d11cb1f1aa939f314312e3081485859 +MD5 9031693a51b829e52342b921f28e4817 seamonkey-1.1.ebuild 8653 +RMD160 c06a779309f30ba379962beaededf0cb35bdd307 seamonkey-1.1.ebuild 8653 +SHA256 483a75223d352307b418ce4cba2d3c345d11cb1f1aa939f314312e3081485859 seamonkey-1.1.ebuild 8653 +MISC ChangeLog 5981 RMD160 5b36435b954fc6fff22dc618b1907ddbfbefe4ba SHA1 83dfd0f6ca884f69462a44dd797f4dac48ed2154 SHA256 aede768f84273b8357a2666f7e26f1a498847c40e25dd97dca2f0da5c618f3c6 +MD5 5d84a6329176362bea592c4c07b292d2 ChangeLog 5981 +RMD160 5b36435b954fc6fff22dc618b1907ddbfbefe4ba ChangeLog 5981 +SHA256 aede768f84273b8357a2666f7e26f1a498847c40e25dd97dca2f0da5c618f3c6 ChangeLog 5981 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160 @@ -36,3 +42,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata MD5 e6589e4fdd389aef7d04fff3e78a35a5 files/digest-seamonkey-1.0.7 807 RMD160 ef2d91aecc8b0adda6efee8b9c476c8b5808d5ee files/digest-seamonkey-1.0.7 807 SHA256 9349a4da9991e7d551bbb2cfac820d04602cf63e3b029f8578e39252592c7d99 files/digest-seamonkey-1.0.7 807 +MD5 e1dc26bab58fcd8f4c1d6949aa8f7e82 files/digest-seamonkey-1.1 795 +RMD160 c1561314e81b63a6f15c33ac057ab06e1dd4f83c files/digest-seamonkey-1.1 795 +SHA256 227c6efcd1f4ca56243c2c54bf532c10528f8cf0a5f8efadda7df7bb71362225 files/digest-seamonkey-1.1 795 diff --git a/www-client/seamonkey/files/digest-seamonkey-1.1 b/www-client/seamonkey/files/digest-seamonkey-1.1 new file mode 100644 index 000000000000..e6a3e162457d --- /dev/null +++ b/www-client/seamonkey/files/digest-seamonkey-1.1 @@ -0,0 +1,9 @@ +MD5 b255e7a77ecea435934bfa1872e99f6a enigmail-0.94.1.tar.gz 513084 +RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 enigmail-0.94.1.tar.gz 513084 +SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1 enigmail-0.94.1.tar.gz 513084 +MD5 a6ee6b2aa31ab5bdaa3ba985f8c065af seamonkey-1.1-patches-0.1.tar.bz2 14304 +RMD160 759f02b9b4d892341b9ee5fd0bcfd904e52057b7 seamonkey-1.1-patches-0.1.tar.bz2 14304 +SHA256 7a38eed9f04491f67b2dcdf3f00173df22ad088a11f44a7782860a3745ad11ea seamonkey-1.1-patches-0.1.tar.bz2 14304 +MD5 2d78434affe9e4499e3cfceae2d8522f seamonkey-1.1.source.tar.bz2 34965668 +RMD160 ffb85d9871f52527c571d6d7ec9f1f9a262ae7d6 seamonkey-1.1.source.tar.bz2 34965668 +SHA256 8999843cf0f42e824d026a863cc58e4be5fcf7eed20f5eb14a3246197b22bfca seamonkey-1.1.source.tar.bz2 34965668 diff --git a/www-client/seamonkey/seamonkey-1.1.ebuild b/www-client/seamonkey/seamonkey-1.1.ebuild new file mode 100644 index 000000000000..adf3974a819a --- /dev/null +++ b/www-client/seamonkey/seamonkey-1.1.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.ebuild,v 1.1 2007/01/24 16:21:30 armin76 Exp $ + +unset ALLOWED_FLAGS # Stupid extra-functions.sh ... bug 49179 +inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools + +PATCH="${P}-patches-0.1" +EMVER="0.94.1" + +DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" +HOMEPAGE="http://www.mozilla.org" +SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2 + mirror://gentoo/${PATCH}.tar.bz2 + http://dev.gentoo.org/~kloeri/dist/${PATCH}.tar.bz2 + crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +SLOT="0" +LICENSE="MPL-1.1 GPL-2 LGPL-2.1" +IUSE="java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt" + +RDEPEND="java? ( virtual/jre ) + >=www-client/mozilla-launcher-1.47 + >=dev-libs/nss-3.10 + >=dev-libs/nspr-4.6.1 + crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )" + +DEPEND="${RDEPEND} + ~sys-devel/autoconf-2.13 + java? ( >=dev-java/java-config-0.2.0 ) + dev-lang/perl + postgres? ( >=dev-db/postgresql-7.2.0 ) + !www-client/mozilla" + +S=${WORKDIR}/mozilla + +pkg_setup() { + use moznopango && warn_mozilla_launcher_stub +} + +src_unpack() { + unpack ${P}.source.tar.bz2 ${PATCH}.tar.bz2 + + cd ${S} || die "cd failed" + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${WORKDIR}/patch + + # Unpack the enigmail plugin + if use crypt && ! use moznomail; then + cd ${S}/mailnews/extensions || die + unpack enigmail-${EMVER}.tar.gz + cd ${S}/mailnews/extensions/enigmail || die "cd failed" + makemake2 + fi + + # Fix scripts that call for /usr/local/bin/perl #51916 + ebegin "Patching smime to call perl from /usr/bin" + sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime + eend $? || die "sed failed" + + # Fix a compilation issue using the 32-bit userland with 64-bit kernel on + # PowerPC, because with that configuration, mozilla detects a ppc64 system. + # -- hansmi, 2005-10-02 + if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then + sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \ + ${S}/configure.in + sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \ + ${S}/security/coreconf/arch.mk + fi + + cd ${S} + # Needed by some of the patches + WANT_AUTOCONF=2.1 eautoreconf || die "Failed running eautoreconf" +} + +src_compile() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + mozconfig_init + mozconfig_config + + mozconfig_annotate 'gentoo' --enable-canvas + mozconfig_annotate 'gentoo' --with-system-nspr + mozconfig_annotate 'gentoo' --with-system-nss + + # Bug 60668: Galeon doesn't build without oji enabled, so enable it + # regardless of java setting. + mozconfig_annotate 'galeon' --enable-oji --enable-mathml + + # Other moz-specific settings + mozconfig_use_enable mozdevelop jsd + mozconfig_use_enable mozdevelop xpctools + mozconfig_use_extension mozdevelop venkman + + if use moznoirc; then + mozconfig_annotate '+moznocompose +moznoirc' --enable-extensions=-irc + fi + + if use moznoroaming ; then + mozconfig_annotate '+moznoroaming' --enable-extensions=-sroaming + fi + + if use postgres ; then + mozconfig_annotate '+postgres' --enable-extensions=sql + export MOZ_ENABLE_PGSQL=1 + export MOZ_PGSQL_INCLUDES=/usr/include + export MOZ_PGSQL_LIBS=/usr/$(get_libdir) + fi + + mozconfig_use_enable mozcalendar calendar + mozconfig_use_enable ldap + mozconfig_use_enable ldap ldap-experimental + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + mozconfig_annotate '' --with-user-appdir=.mozilla + + if use moznomail && ! use mozcalendar; then + mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews + fi + + if use moznocompose && ! use mozcalendar; then + if use moznoirc && use moznomail; then + mozconfig_annotate "+moznocompose" --disable-composer + fi + fi + + # Finalize and report settings + mozconfig_final + + # hardened GCC uses -fstack-protector-all by default, which breaks us + gcc-specs-ssp && append-flags -fno-stack-protector-all + replace-flags -fstack-protector-all -fstack-protector + + append-flags -freorder-blocks -fno-reorder-functions + + #################################### + # + # Configure and build + # + #################################### + + CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + econf || die + + # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior + # to econf, but the quotes cause configure to fail. + sed -i -e \ + 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \ + ${S}/config/autoconf.mk \ + ${S}/xpfe/global/buildconfig.html + + # This removes extraneous CFLAGS from the Makefiles to reduce RAM + # requirements while compiling + edit_makefiles + + emake -j1 || die + + #################################### + # + # Build Enigmail extension + # + #################################### + + if use crypt && ! use moznomail; then + emake -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Most of the installation happens here + dodir ${MOZILLA_FIVE_HOME} + cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} + + # Create directory structure to support portage-installed extensions. + # See update_chrome() in mozilla-launcher + keepdir ${MOZILLA_FIVE_HOME}/chrome.d + keepdir ${MOZILLA_FIVE_HOME}/extensions.d + cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \ + ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt + + # Create /usr/bin/mozilla + install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME} + + # Install icon and .desktop for menu entry + insinto /usr/share/pixmaps + doins ${FILESDIR}/icon/${PN}.png + + # Fix bug 54179: Install .desktop file into /usr/share/applications + # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis) + insinto /usr/share/applications + doins ${FILESDIR}/icon/${PN}.desktop + + # Fix icons to look the same everywhere + insinto ${MOZILLA_FIVE_HOME}/icons + doins ${S}/widget/src/gtk/mozicon16.xpm + doins ${S}/widget/src/gtk/mozicon50.xpm + + #################################### + # + # Install files necessary for applications to build against mozilla + # + #################################### + + einfo "Installing includes and idl files..." + dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include + cd ${S}/dist + cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include + cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl + + # Fix mozilla-config and install it + exeinto ${MOZILLA_FIVE_HOME} + doexe ${S}/build/unix/${PN}-config + + # Fix pkgconfig files and install them + insinto /usr/$(get_libdir)/pkgconfig + for x in ${S}/build/unix/*.pc; do + doins ${x} + done + + # Install env.d snippet, which isn't necessary for running mozilla, but + # might be necessary for programs linked against firefox + insinto /etc/env.d + doins ${FILESDIR}/10${PN} + dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN} + + # Install rebuild script since mozilla-bin doesn't support registration yet + exeinto ${MOZILLA_FIVE_HOME} + doexe ${FILESDIR}/${PN}-rebuild-databases.pl + dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \ + ${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl + + # Install docs + dodoc ${S}/{LEGAL,LICENSE} + + # Update Google search plugin to use UTF8 charset ... + insinto ${MOZILLA_FIVE_HOME}/searchplugins + doins ${FILESDIR}/google.src +} + +pkg_preinst() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Remove entire installed instance to solve various problems, + # for example see bug 27719 + rm -rf ${ROOT}${MOZILLA_FIVE_HOME} +} + +pkg_postinst() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Update the component registry + MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \ + /usr/libexec/mozilla-launcher -register + + # This should be called in the postinst and postrm of all the + # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and + # thunderbird-bin ebuilds. + update_mozilla_launcher_symlinks +} + +pkg_postrm() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Update the component registry + if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then + MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \ + /usr/libexec/mozilla-launcher -register + fi + + update_mozilla_launcher_symlinks +}