public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/
Date: Sun,  4 Oct 2020 17:30:29 +0000 (UTC)	[thread overview]
Message-ID: <1601832621.d8d984f9b7ae1acb54b709483281f06bbf78f9c8.whissi@gentoo> (raw)

commit:     d8d984f9b7ae1acb54b709483281f06bbf78f9c8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 17:28:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 17:30:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d984f9

x11-plugins/enigmail: bump to v2.2.4

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 x11-plugins/enigmail/Manifest                      |  1 +
 ...{enigmail-9999.ebuild => enigmail-2.2.4.ebuild} | 30 +++++++++-------------
 x11-plugins/enigmail/enigmail-9999.ebuild          | 30 +++++++++-------------
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index d82ff32e9fd..e5be4a82cea 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,3 +1,4 @@
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
 DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
 DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb
+DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d

diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
similarity index 68%
copy from x11-plugins/enigmail/enigmail-9999.ebuild
copy to x11-plugins/enigmail/enigmail-2.2.4.ebuild
index 7369918278b..b990489fba0 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+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_prepare() {
+	default
 
+	export MAKEOPTS=-j1
 }
 
 src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	local build_dir=build-tb
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/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'
+	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
 
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }

diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 7369918278b..b990489fba0 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+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_prepare() {
+	default
 
+	export MAKEOPTS=-j1
 }
 
 src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	local build_dir=build-tb
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/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'
+	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
 
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }


             reply	other threads:[~2020-10-04 17:30 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-04 17:30 Thomas Deutschmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-13 15:13 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/ Joonas Niilola
2022-07-13 15:13 Joonas Niilola
2021-03-28 14:48 Thomas Deutschmann
2020-10-04 17:30 Thomas Deutschmann
2020-10-04 17:30 Thomas Deutschmann
2020-09-30 18:05 Thomas Deutschmann
2020-08-13 18:41 Thomas Deutschmann
2020-06-28 20:56 Thomas Deutschmann
2020-06-28 20:37 Agostino Sarubbo
2020-06-28 20:33 Agostino Sarubbo
2020-06-28 20:27 Agostino Sarubbo
2020-06-27 21:51 Thomas Deutschmann
2020-03-30  1:36 Thomas Deutschmann
2020-01-30 11:05 Agostino Sarubbo
2020-01-30 11:00 Agostino Sarubbo
2020-01-27 20:59 Thomas Deutschmann
2020-01-23  2:11 Thomas Deutschmann
2019-11-13  7:39 Agostino Sarubbo
2019-11-01 23:52 Sergei Trofimovich
2019-10-29 12:53 Agostino Sarubbo
2019-10-29  9:29 Agostino Sarubbo
2019-09-05  6:37 Lars Wendler
2019-08-30  8:44 Lars Wendler
2019-08-23 22:00 Lars Wendler
2019-07-18 13:39 Agostino Sarubbo
2019-07-18 13:07 Agostino Sarubbo
2019-07-18 13:06 Agostino Sarubbo
2019-07-18  7:26 Agostino Sarubbo
2019-07-16 10:13 Lars Wendler
2019-07-16 10:13 Lars Wendler
2019-07-16 10:13 Lars Wendler
2019-07-09 10:08 Lars Wendler
2019-07-09 10:08 Lars Wendler
2019-06-03 14:02 Lars Wendler
2019-06-03 14:02 Lars Wendler
2019-04-19 14:03 Jory Pratt
2019-03-26 14:32 Lars Wendler
2018-12-11 14:09 Lars Wendler
2018-11-25 18:51 Thomas Deutschmann
2018-09-11 11:55 Thomas Deutschmann
2018-09-11 11:55 Thomas Deutschmann
2018-08-07 11:44 Lars Wendler
2018-08-07 11:44 Lars Wendler
2018-08-07 11:44 Lars Wendler
2018-06-13 20:05 Ian Stakenvicius
2018-06-13 20:05 Ian Stakenvicius
2018-06-04 10:48 Lars Wendler
2018-06-01 14:20 Lars Wendler
2018-06-01 14:20 Lars Wendler
2018-05-26 15:02 Thomas Deutschmann
2018-05-23 13:11 Agostino Sarubbo
2018-05-22  8:22 Lars Wendler
2018-05-22  8:22 Lars Wendler
2018-05-18 13:32 Agostino Sarubbo
2018-05-17 13:52 Thomas Deutschmann
2018-05-17 12:41 Lars Wendler
2018-05-15 10:52 Mikle Kolyada
2018-05-15  5:26 Lars Wendler
2018-05-15  1:46 Thomas Deutschmann
2018-05-14 10:51 Lars Wendler
2018-05-14 10:51 Lars Wendler
2018-04-16 23:45 Lars Wendler
2018-04-16 23:45 Lars Wendler
2018-04-05 20:17 Lars Wendler
2018-03-26 14:10 Lars Wendler
2018-02-12 15:50 Lars Wendler
2018-02-12 15:50 Lars Wendler
2018-01-02 10:10 Lars Wendler
2017-12-21  8:33 Sergei Trofimovich
2017-12-20 13:09 Agostino Sarubbo
2017-12-20 12:43 Thomas Deutschmann
2017-12-19  3:42 Lars Wendler
2017-12-14 20:27 Agostino Sarubbo
2017-12-14 15:09 Thomas Deutschmann
2017-11-29 18:33 Ian Stakenvicius
2017-11-29 17:44 Ian Stakenvicius
2017-10-13 10:01 Sergei Trofimovich
2017-10-03 21:07 Lars Wendler
2017-10-03 21:07 Lars Wendler
2017-09-03 21:12 Aaron Bauman
2017-09-03 21:12 Aaron Bauman
2017-08-22 14:49 Lars Wendler
2017-07-28  9:05 Lars Wendler
2017-06-20 18:23 Jory Pratt
2017-05-24 13:51 Ian Stakenvicius
2017-05-03 20:06 Ian Stakenvicius
2017-05-03 16:46 Ian Stakenvicius
2017-03-25 19:27 Agostino Sarubbo
2017-03-25 19:25 Agostino Sarubbo
2017-03-09  1:16 Ian Stakenvicius
2017-03-09  1:16 Ian Stakenvicius

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1601832621.d8d984f9b7ae1acb54b709483281f06bbf78f9c8.whissi@gentoo \
    --to=whissi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox