rpath reinclusion
authorJory Pratt <anarchy@gentoo.org>
Tue, 25 Oct 2005 21:55:41 +0000 (21:55 +0000)
committerJory Pratt <anarchy@gentoo.org>
Tue, 25 Oct 2005 21:55:41 +0000 (21:55 +0000)
Package-Manager: portage-2.0.53_rc6

mail-client/mozilla-thunderbird/ChangeLog
mail-client/mozilla-thunderbird/Manifest
mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.7-r2 [new file with mode: 0644]
mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r2.ebuild [new file with mode: 0644]

index b642909b1bb23943894c677752326c5317b4db8e..924403c065d70e255232ab3b5ef90732c2f0b51a 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.90 2005/10/22 14:52:14 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.91 2005/10/25 21:55:41 anarchy Exp $
+
+*mozilla-thunderbird-1.0.7-r2 (26 Oct 2005)
+
+  26 Oct 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-thunderbird-1.0.7-r2.ebuild:
+  rpath reincluded, gcc-4 not updated as no issues arise with segfault on amd64
 
 *mozilla-thunderbird-1.0.7-r1 (23 Oct 2005)
 
index 1f1a74f2ac21fd4b6c97abe0e48eb4874bbc39f4..71cfc412627ee1b148b9b1c4562d07372451b624 100644 (file)
@@ -1,6 +1,7 @@
-MD5 4f0986be300de1b60d7c7a258c20ae3d ChangeLog 13247
+MD5 4822d36edf72d8770da1b3208ec800bb ChangeLog 13463
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r1 303
+MD5 106701e2f4e5e9e73301f95dd92c3306 files/digest-mozilla-thunderbird-1.0.7-r2 227
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
@@ -9,4 +10,5 @@ MD5 1783f8e4678fb4731ccc67b4bfba1981 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.p
 MD5 07f9a980afa2dde67554657c00b8be18 files/thunderbird-rpath-1.patch 1716
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 2896cc99ffbb38fe463d98feb1e954f0 mozilla-thunderbird-1.0.7-r1.ebuild 5640
+MD5 6b541a64f149c93f7448bff5da647068 mozilla-thunderbird-1.0.7-r2.ebuild 5694
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.7-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.7-r2
new file mode 100644 (file)
index 0000000..af1b171
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 e6388feb0ffcd189af779f165c124b4d thunderbird-1.0.7-source.tar.bz2 33385665
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r2.ebuild
new file mode 100644 (file)
index 0000000..4b43ee0
--- /dev/null
@@ -0,0 +1,182 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r2.ebuild,v 1.1 2005/10/25 21:55:41 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
+       mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+       mirror://gentoo/mozilla-jslibmath-alpha.patch"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="mozcalendar ldap"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39"
+
+S=${WORKDIR}/mozilla
+
+# 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
+export MOZ_THUNDERBIRD=1
+
+src_unpack() {
+       declare x
+
+       for x in ${A}; do
+               [[ $x == *.tar.* ]] || continue
+               unpack $x || die "unpack failed"
+       done
+       cd ${S} || die "cd failed"
+
+       ####################################
+       #
+       # architecture patches
+       #
+       ####################################
+
+       if [[ $(gcc-major-version) -eq 3 ]]; then
+               # ABI Patch for alpha/xpcom for gcc-3.x
+               if [[ ${ARCH} == alpha ]]; then
+                       epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+               fi
+       fi
+
+       # patch to fix math operations on alpha, makes maps.google.com work!
+       epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+       ####################################
+       #
+       # general compilation and run-time fixes
+       #
+       ####################################
+
+       # GCC4 compile fix, bug #87800
+       epatch ${FILESDIR}/${P}-gcc-4.0.2.patch
+
+       # patch out ft caching code since the API changed between releases of
+       # freetype; this enables freetype-2.1.8+ compat.
+       # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+       epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+}
+
+src_compile() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       mozconfig_init
+
+       # tb-specific settings
+       mozconfig_use_enable ldap
+       mozconfig_use_enable ldap ldap-experimental
+       mozconfig_use_enable mozcalendar calendar
+       mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+       mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+       # Finalize and report settings
+       mozconfig_final
+
+       # hardened GCC uses -fstack-protector-all by default, which breaks us
+       has_hardened && append-flags -fno-stack-protector-all
+       replace-flags -fstack-protector-all -fstack-protector
+
+       ####################################
+       #
+       #  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}/nsprpub/config/autoconf.mk \
+               ${S}/xpfe/global/buildconfig.html
+
+       # Fixup the RPATH
+       sed -i -e \
+               's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+               ${S}/config/rules.mk \
+               ${S}/nsprpub/config/rules.mk \
+               ${S}/security/coreconf/rules.mk \
+               ${S}/security/coreconf/rules.mk
+
+
+       # This removes extraneous CFLAGS from the Makefiles to reduce RAM
+       # requirements while compiling
+       edit_makefiles
+
+       emake || die
+}
+
+src_install() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Most of the installation happens here
+       dodir ${MOZILLA_FIVE_HOME}
+       cp -RL --no-preserve=links ${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/thunderbird
+       install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
+
+       # Install icon and .desktop for menu entry
+       insinto /usr/share/pixmaps
+       doins ${FILESDIR}/icon/thunderbird-icon.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/mozillathunderbird.desktop
+}
+
+pkg_postinst() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+               /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
+
+       ewarn "Enigmail Support has been dropped since it doesn't work on fresh install."
+       ewarn "The Gentoo Mozilla team is working on making enigmail its own build,"
+       ewarn "sorry for the inconvenience.  For now, you can download enigmail from"
+       ewarn "http://enigmail.mozdev.org"
+}
+
+pkg_postrm() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+               /usr/libexec/mozilla-launcher -register
+
+       update_mozilla_launcher_symlinks
+}