| 1 |
armin76 07/12/15 12:53:01 |
| 2 |
|
| 3 |
Modified: enigmail-0.94.4.ebuild ChangeLog |
| 4 |
enigmail-0.95.5-r1.ebuild |
| 5 |
Log: |
| 6 |
Minor touchups, use 1.5.0.13 for 0.94.4 |
| 7 |
(Portage version: 2.1.3.19) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 x11-plugins/enigmail/enigmail-0.94.4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: enigmail-0.94.4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- enigmail-0.94.4.ebuild 4 Aug 2007 13:14:30 -0000 1.5 |
| 23 |
+++ enigmail-0.94.4.ebuild 15 Dec 2007 12:53:00 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild,v 1.5 2007/08/04 13:14:30 dertobi123 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.4.ebuild,v 1.6 2007/12/15 12:53:00 armin76 Exp $ |
| 29 |
|
| 30 |
unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 |
| 31 |
WANT_AUTOCONF=2.1 |
| 32 |
@@ -10,13 +10,13 @@ |
| 33 |
SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO nl-NL pl-PL pt-PT ru-RU sk-SK sl-SI sv-SE" |
| 34 |
|
| 35 |
EMVER=${PV} |
| 36 |
-TBVER="1.5.0.10" |
| 37 |
-TBPVER="0.1" |
| 38 |
+TBVER="1.5.0.13" |
| 39 |
+TBPVER="1.5.0.10-patches-0.1" |
| 40 |
|
| 41 |
DESCRIPTION="Gnupg encryption plugin for thunderbird." |
| 42 |
HOMEPAGE="http://enigmail.mozdev.org" |
| 43 |
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2 |
| 44 |
- mirror://gentoo/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2 |
| 45 |
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2 |
| 46 |
+ mirror://gentoo/mozilla-thunderbird-${TBPVER}.tar.bz2 |
| 47 |
http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz" |
| 48 |
|
| 49 |
KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86" |
| 50 |
@@ -77,7 +77,7 @@ |
| 51 |
} |
| 52 |
|
| 53 |
src_unpack() { |
| 54 |
- unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2 || die "unpack failed" |
| 55 |
+ unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBPVER}.tar.bz2 || die "unpack failed" |
| 56 |
|
| 57 |
linguas |
| 58 |
for X in ${linguas}; do |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.110 x11-plugins/enigmail/ChangeLog |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/ChangeLog?rev=1.110&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/ChangeLog?rev=1.110&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/ChangeLog?r1=1.109&r2=1.110 |
| 67 |
|
| 68 |
Index: ChangeLog |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v |
| 71 |
retrieving revision 1.109 |
| 72 |
retrieving revision 1.110 |
| 73 |
diff -u -r1.109 -r1.110 |
| 74 |
--- ChangeLog 19 Nov 2007 10:37:43 -0000 1.109 |
| 75 |
+++ ChangeLog 15 Dec 2007 12:53:00 -0000 1.110 |
| 76 |
@@ -1,6 +1,10 @@ |
| 77 |
# ChangeLog for x11-plugins/enigmail |
| 78 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 79 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.109 2007/11/19 10:37:43 armin76 Exp $ |
| 80 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.110 2007/12/15 12:53:00 armin76 Exp $ |
| 81 |
+ |
| 82 |
+ 15 Dec 2007; Raúl Porcel <armin76@g.o> enigmail-0.94.4.ebuild, |
| 83 |
+ enigmail-0.95.5-r1.ebuild: |
| 84 |
+ Minor touchups, use 1.5.0.13 for 0.94.4 |
| 85 |
|
| 86 |
19 Nov 2007; Raúl Porcel <armin76@g.o> -enigmail-0.95.2-r1.ebuild, |
| 87 |
-enigmail-0.95.3.ebuild, -enigmail-0.95.3-r1.ebuild: |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.7 x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild?rev=1.7&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild?rev=1.7&content-type=text/plain |
| 95 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild?r1=1.6&r2=1.7 |
| 96 |
|
| 97 |
Index: enigmail-0.95.5-r1.ebuild |
| 98 |
=================================================================== |
| 99 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild,v |
| 100 |
retrieving revision 1.6 |
| 101 |
retrieving revision 1.7 |
| 102 |
diff -u -r1.6 -r1.7 |
| 103 |
--- enigmail-0.95.5-r1.ebuild 18 Nov 2007 15:38:19 -0000 1.6 |
| 104 |
+++ enigmail-0.95.5-r1.ebuild 15 Dec 2007 12:53:00 -0000 1.7 |
| 105 |
@@ -1,13 +1,13 @@ |
| 106 |
# Copyright 1999-2007 Gentoo Foundation |
| 107 |
# Distributed under the terms of the GNU General Public License v2 |
| 108 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild,v 1.6 2007/11/18 15:38:19 dertobi123 Exp $ |
| 109 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.5-r1.ebuild,v 1.7 2007/12/15 12:53:00 armin76 Exp $ |
| 110 |
+ |
| 111 |
+WANT_AUTOCONF="2.1" |
| 112 |
|
| 113 |
-unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 |
| 114 |
-WANT_AUTOCONF=2.1 |
| 115 |
inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools |
| 116 |
|
| 117 |
LANGS="de el es-ES nb-NO pt-BR zh-CN" |
| 118 |
-SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP nb-NO pl-PL pt-PT ru-RU sl-SI sv-SE tr-TR zh-TW" |
| 119 |
+NOSHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP nb-NO pl-PL pt-PT ru-RU sl-SI sv-SE tr-TR zh-TW" |
| 120 |
|
| 121 |
EMVER=${PV} |
| 122 |
TBVER="2.0.0.9" |
| 123 |
@@ -25,13 +25,13 @@ |
| 124 |
IUSE="" |
| 125 |
|
| 126 |
for X in ${LANGS} ; do |
| 127 |
- SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${PN}-${X}-${PV}.xpi )" |
| 128 |
+ SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )" |
| 129 |
IUSE="${IUSE} linguas_${X/-/_}" |
| 130 |
done |
| 131 |
# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )" |
| 132 |
|
| 133 |
-for X in ${SHORTLANGS} ; do |
| 134 |
- SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${PN}-${X}-${PV}.xpi )" |
| 135 |
+for X in ${NOSHORTLANGS} ; do |
| 136 |
+ SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )" |
| 137 |
IUSE="${IUSE} linguas_${X%%-*}" |
| 138 |
done |
| 139 |
#( mirror://gentoo/${PN}-${X}-0.9x.xpi )" |
| 140 |
@@ -81,11 +81,9 @@ |
| 141 |
|
| 142 |
linguas |
| 143 |
for X in ${linguas}; do |
| 144 |
- [[ ${X} != en ]] && xpi_unpack ${PN}-${X}-${PV}.xpi |
| 145 |
+ [[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi |
| 146 |
done |
| 147 |
|
| 148 |
- cd ${S} || die "cd failed" |
| 149 |
- |
| 150 |
# Apply our patches |
| 151 |
cd "${S}" || die "cd failed" |
| 152 |
EPATCH_SUFFIX="patch" \ |
| 153 |
@@ -93,26 +91,26 @@ |
| 154 |
epatch "${WORKDIR}"/patch |
| 155 |
|
| 156 |
# Unpack the enigmail plugin |
| 157 |
- cd ${S}/mailnews/extensions || die |
| 158 |
+ cd "${S}"/mailnews/extensions || die |
| 159 |
unpack enigmail-${EMVER}.tar.gz |
| 160 |
- cd ${S}/mailnews/extensions/enigmail || die "cd failed" |
| 161 |
+ cd "${S}"/mailnews/extensions/enigmail || die "cd failed" |
| 162 |
makemake2 |
| 163 |
|
| 164 |
- cd ${S} |
| 165 |
+ cd "${S}" |
| 166 |
|
| 167 |
# Use the right theme for thunderbird #45609 |
| 168 |
sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn |
| 169 |
|
| 170 |
# Fix installation of enigmail.js |
| 171 |
- epatch ${FILESDIR}/70_enigmail-fix.patch |
| 172 |
+ epatch "${FILESDIR}"/70_enigmail-fix.patch |
| 173 |
# Make replytolist work with >0.95.0 |
| 174 |
- epatch ${FILESDIR}/0.95.0-replytolist.patch |
| 175 |
+ epatch "${FILESDIR}"/0.95.0-replytolist.patch |
| 176 |
|
| 177 |
- eautoreconf || die "failed running autoreconf" |
| 178 |
+ eautoreconf |
| 179 |
} |
| 180 |
|
| 181 |
src_compile() { |
| 182 |
- declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird |
| 183 |
+ declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" |
| 184 |
|
| 185 |
#################################### |
| 186 |
# |
| 187 |
@@ -132,65 +130,62 @@ |
| 188 |
# Finalize and report settings |
| 189 |
mozconfig_final |
| 190 |
|
| 191 |
- # hardened GCC uses -fstack-protector-all by default, and this breaks |
| 192 |
- # thunderbird |
| 193 |
- gcc-specs-ssp && append-flags -fno-stack-protector-all |
| 194 |
- replace-flags -fstack-protector-all -fstack-protector |
| 195 |
+ # -fstack-protector breaks us |
| 196 |
+ if gcc-version ge 4 1; then |
| 197 |
+ gcc-specs-ssp && append-flags -fno-stack-protector |
| 198 |
+ else |
| 199 |
+ gcc-specs-ssp && append-flags -fno-stack-protector-all |
| 200 |
+ fi |
| 201 |
+ filter-flags -fstack-protector -fstack-protector-all |
| 202 |
|
| 203 |
#################################### |
| 204 |
# |
| 205 |
# Configure and build Thunderbird |
| 206 |
# |
| 207 |
#################################### |
| 208 |
- |
| 209 |
- econf || die "econf failed" |
| 210 |
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 211 |
+ econf || die |
| 212 |
|
| 213 |
# This removes extraneous CFLAGS from the Makefiles to reduce RAM |
| 214 |
# requirements while compiling |
| 215 |
edit_makefiles |
| 216 |
|
| 217 |
- # Doesn't like to build with CHOST-specific commands. |
| 218 |
- MY_CC=$(tc-getCC) |
| 219 |
- MY_CXX=$(tc-getCXX) |
| 220 |
- |
| 221 |
# Only build the parts necessary to support building enigmail |
| 222 |
- emake CC=$MY_CC CXX=$MY_CXX -j1 export || die "make export failed" |
| 223 |
- emake CC=$MY_CC CXX=$MY_CXX -C modules/libreg || die "make modules/libreg failed" |
| 224 |
- emake CC=$MY_CC CXX=$MY_CXX -C xpcom/string || die "make xpcom/string failed" |
| 225 |
- emake CC=$MY_CC CXX=$MY_CXX -C xpcom || die "make xpcom failed" |
| 226 |
- emake CC=$MY_CC CXX=$MY_CXX -C xpcom/obsolete || die "make xpcom/obsolete failed" |
| 227 |
+ emake -j1 export || die "make export failed" |
| 228 |
+ emake -C modules/libreg || die "make modules/libreg failed" |
| 229 |
+ emake -C xpcom/string || die "make xpcom/string failed" |
| 230 |
+ emake -C xpcom || die "make xpcom failed" |
| 231 |
+ emake -C xpcom/obsolete || die "make xpcom/obsolete failed" |
| 232 |
|
| 233 |
# Build the enigmail plugin |
| 234 |
einfo "Building Enigmail plugin..." |
| 235 |
- emake CC=$MY_CC CXX=$MY_CXX -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed" |
| 236 |
+ emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" |
| 237 |
|
| 238 |
# Package the enigmail plugin; this may be the easiest way to collect the |
| 239 |
# necessary files |
| 240 |
- emake CC=$MY_CC CXX=$MY_CXX -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed" |
| 241 |
+ emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed" |
| 242 |
} |
| 243 |
|
| 244 |
src_install() { |
| 245 |
- declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird |
| 246 |
+ declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" |
| 247 |
declare emid |
| 248 |
|
| 249 |
- cd ${T} |
| 250 |
- unzip ${S}/dist/bin/*.xpi install.rdf |
| 251 |
+ cd "${T}" |
| 252 |
+ unzip "${S}"/dist/bin/*.xpi install.rdf |
| 253 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
| 254 |
|
| 255 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 256 |
- cd ${D}${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 257 |
- unzip ${S}/dist/bin/*.xpi |
| 258 |
- |
| 259 |
- # Fix module to work with 2.0.0.* |
| 260 |
+ cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
| 261 |
+ unzip "${S}"/dist/bin/*.xpi |
| 262 |
|
| 263 |
# these files will be picked up by mozilla-launcher -register |
| 264 |
dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d |
| 265 |
insinto ${MOZILLA_FIVE_HOME}/chrome.d |
| 266 |
- newins ${S}/dist/bin/chrome/installed-chrome.txt ${PN} |
| 267 |
- echo "extension,${emid}" > ${D}${MOZILLA_FIVE_HOME}/extensions.d/${PN} |
| 268 |
+ newins "${S}"/dist/bin/chrome/installed-chrome.txt ${PN} |
| 269 |
+ echo "extension,${emid}" > "${D}"${MOZILLA_FIVE_HOME}/extensions.d/${PN} |
| 270 |
|
| 271 |
linguas |
| 272 |
for X in ${linguas}; do |
| 273 |
- [[ ${X} != en ]] && xpi_install ${WORKDIR}/${PN}-${X}-${PV} |
| 274 |
+ [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/${P}-${X} |
| 275 |
done |
| 276 |
} |
| 277 |
|
| 278 |
|
| 279 |
|
| 280 |
-- |
| 281 |
gentoo-commits@g.o mailing list |
Archives