diff options
| -rw-r--r-- | x11-plugins/enigmail/Manifest | 2 | ||||
| -rw-r--r-- | x11-plugins/enigmail/enigmail-2.1.ebuild (renamed from x11-plugins/enigmail/enigmail-2.0.11.ebuild) | 5 | ||||
| -rw-r--r-- | x11-plugins/enigmail/enigmail-9999.ebuild | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest index 121395c5f77a..c60218bda5a1 100644 --- a/x11-plugins/enigmail/Manifest +++ b/x11-plugins/enigmail/Manifest @@ -1,3 +1,3 @@ -DIST enigmail-2.0.11.tar.gz 2613428 BLAKE2B a32c3dd49364973133f0bc9729ea80857a886cbd1ced065f32e6141e1e18602fa904a53a836496dd53cf7986c6f367b4aba57b8a4177c1aa1ae24668f18f74b4 SHA512 9e4836a8ce3310fef6398be538ef8def70413112d4141c13b8abdbdc2e1a7b75ed080c261cdb018f873a50a4c591b06d722dc7986474678c4a9072f7e3b729cf DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305 +DIST enigmail-2.1.tar.gz 2783802 BLAKE2B 39450fc16709356fac4a7dc827bd39f9030e7f27df1568d9bcf6da281f2b75dc7e0a708dde1350f2e6c250fac0aaa0d712c9ca6668e1f86bc7f2814c90da5db2 SHA512 c6c5023cd6f1d19b7cd9bc5f3100e7697bb594df05624512a7118e0b49c151094b97675b9d6e6c1d9e51d4e7d560bd43f9bf3376251c5f41f3a27c5faddf120d diff --git a/x11-plugins/enigmail/enigmail-2.0.11.ebuild b/x11-plugins/enigmail/enigmail-2.1.ebuild index 3441befecb08..d2c798ea5030 100644 --- a/x11-plugins/enigmail/enigmail-2.0.11.ebuild +++ b/x11-plugins/enigmail/enigmail-2.1.ebuild @@ -47,13 +47,16 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch ) src_compile() { + # Required or parallel make fails + emake -C stdlib createlib + emake ipc public ui package lang stdlib emake xpi } src_install() { - local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) + local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json) [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild index 752b1acb8637..d2c798ea5030 100644 --- a/x11-plugins/enigmail/enigmail-9999.ebuild +++ b/x11-plugins/enigmail/enigmail-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,14 +44,19 @@ DEPEND="${RDEPEND} dev-lang/perl " +PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch ) + src_compile() { + # Required or parallel make fails + emake -C stdlib createlib + emake ipc public ui package lang stdlib emake xpi } src_install() { - local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) + local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json) [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |