Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/
Date: Fri, 31 Oct 2014 19:13:07
Message-Id: 1414782574.66c6ed3f8a666a1c99db1f9460d5ca169e5dfd21.axs@gentoo
1 commit: 66c6ed3f8a666a1c99db1f9460d5ca169e5dfd21
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 31 19:09:34 2014 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 31 19:09:34 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=66c6ed3f
7
8 www-client/seamonkey: switched ebuild back to in-source building
9
10 Seamonkey-2.30 upstream fully broke out-of-source builds while fixing the
11 in-source-build objdir issues that have plagued it since 2.26; the
12 run-configure-twice hack worked but allowed bug 527428 to occur. Switching
13 the build system back to an in-source build happens to work as expected now.
14
15 ---
16 www-client/seamonkey/seamonkey-2.30.ebuild | 67 ++++++++++--------------------
17 1 file changed, 22 insertions(+), 45 deletions(-)
18
19 diff --git a/www-client/seamonkey/seamonkey-2.30.ebuild b/www-client/seamonkey/seamonkey-2.30.ebuild
20 index 05771e8..b699a7f 100644
21 --- a/www-client/seamonkey/seamonkey-2.30.ebuild
22 +++ b/www-client/seamonkey/seamonkey-2.30.ebuild
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2014 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.29.1.ebuild,v 1.2 2014/10/05 18:08:51 polynomial-c Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30.ebuild,v 1.1 2014/10/21 18:29:15 polynomial-c Exp $
28
29 EAPI=5
30 WANT_AUTOCONF="2.1"
31 @@ -49,32 +49,32 @@ fi
32
33 SLOT="0"
34 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
35 -IUSE="+chatzilla +crypt +ipc +mailclient minimal pulseaudio +roaming selinux test"
36 +IUSE="+chatzilla +crypt +ipc minimal pulseaudio +roaming selinux test"
37
38 SRC_URI="${SRC_URI}
39 ${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
40 http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
41 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
42 - mailclient? ( crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) )"
43 + crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
44
45 ASM_DEPEND=">=dev-lang/yasm-1.1"
46
47 RDEPEND=">=dev-libs/nss-3.17.1
48 >=dev-libs/nspr-4.10.6
49 - mailclient? ( crypt? ( || (
50 - ( >=app-crypt/gnupg-2.0
51 - || (
52 - app-crypt/pinentry[gtk]
53 - app-crypt/pinentry[qt4]
54 - )
55 + crypt? ( || (
56 + ( >=app-crypt/gnupg-2.0
57 + || (
58 + app-crypt/pinentry[gtk]
59 + app-crypt/pinentry[qt4]
60 )
61 - =app-crypt/gnupg-1.4* ) ) )
62 + )
63 + =app-crypt/gnupg-1.4* ) )
64 selinux? ( sec-policy/selinux-mozilla )
65 system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )"
66
67 DEPEND="${RDEPEND}
68 !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
69 - mailclient? ( crypt? ( dev-lang/perl ) )
70 + crypt? ( dev-lang/perl )
71 amd64? ( ${ASM_DEPEND}
72 virtual/opengl )
73 x86? ( ${ASM_DEPEND}
74 @@ -86,7 +86,7 @@ else
75 S="${WORKDIR}/comm-release"
76 fi
77
78 -BUILD_OBJ_DIR="${WORKDIR}/seamonk"
79 +BUILD_OBJ_DIR="${S}/seamonk"
80
81 pkg_setup() {
82 if [[ ${PV} == *_pre* ]] ; then
83 @@ -121,8 +121,8 @@ src_prepare() {
84 EPATCH_FORCE="yes" \
85 epatch "${WORKDIR}/seamonkey"
86
87 - epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch
88 - epatch "${FILESDIR}"/${P}-jemalloc-configure.patch
89 + epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch \
90 + "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch
91
92 # browser patches go here
93 pushd "${S}"/mozilla &>/dev/null || die
94 @@ -204,10 +204,6 @@ src_configure() {
95 MEXTENSIONS+=",-sroaming"
96 fi
97
98 - if ! use mailclient ; then
99 - mozconfig_annotate '-mailclient' --disable-composer
100 - fi
101 -
102 # Setup api key for location services
103 echo -n "${_google_api_key}" > "${S}"/google-api-key
104 mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
105 @@ -221,25 +217,19 @@ src_configure() {
106
107 mozconfig_annotate '' --enable-safe-browsing
108
109 - mozconfig_use_enable mailclient mailnews
110 -
111 # Use an objdir to keep things organized.
112 echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
113 >> "${S}"/.mozconfig
114 - # Add a TOPSRCDIR too just in case
115 - echo "mk_add_options TOPSRCDIR=${S}" \
116 - >> "${S}"/.mozconfig
117
118 # Finalize and report settings
119 mozconfig_final
120
121 - if use crypt && use mailclient ; then
122 + if use crypt ; then
123 pushd "${WORKDIR}"/enigmail &>/dev/null || die
124 econf
125 popd &>/dev/null || die
126 fi
127
128 -
129 # Work around breakage in makeopts with --no-print-directory
130 MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
131
132 @@ -250,26 +240,15 @@ src_configure() {
133 append-flags -mno-avx
134 fi
135 fi
136 -
137 - mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
138 - # run configure twice to get it to prepare the objdir and then actually set up properly
139 - # apparently necessary due to build system b0rkage on mozilla-33
140 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
141 - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
142 - emake V=1 -f "${S}"/client.mk configure
143 -
144 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
145 - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
146 - emake V=1 -f "${S}"/client.mk configure
147 }
148
149 src_compile() {
150 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
151 MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
152 - emake V=1 -f "${S}"/client.mk
153 + emake V=1 -f client.mk
154
155 # Only build enigmail extension if conditions are met.
156 - if use crypt && use mailclient ; then
157 + if use crypt ; then
158 einfo "Building enigmail"
159 pushd "${WORKDIR}"/enigmail &>/dev/null || die
160 emake -j1
161 @@ -306,7 +285,7 @@ src_install() {
162 emake DESTDIR="${D}" install
163 cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
164
165 - if use crypt && use mailclient ; then
166 + if use crypt ; then
167 local em_dir="${WORKDIR}/enigmail/build"
168 pushd "${T}" &>/dev/null || die
169 unzip "${em_dir}"/enigmail*.xpi install.rdf || die
170 @@ -319,12 +298,10 @@ src_install() {
171 popd &>/dev/null || die
172 fi
173
174 - if use mailclient ; then
175 - sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
176 - -i "${T}"/${PN}.desktop || die
177 - sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
178 - || die
179 - fi
180 + sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
181 + -i "${T}"/${PN}.desktop || die
182 + sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
183 + || die
184
185 # Install language packs
186 mozlinguas_src_install