* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2016-12-29 21:39 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-12-29 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 574464e23a823bd88e122017cb2ee5f8121cffdf
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 20:01:00 2016 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574464e2
net-mail/notmuch: Keep only latest patch versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-mail/notmuch/Manifest | 2 -
.../files/0.23-0001-emacs-id-buttonization.patch | 43 -----
.../files/0.23-0002-emacs-search-face-bugfix.patch | 36 ----
net-mail/notmuch/notmuch-0.22.2.ebuild | 198 --------------------
net-mail/notmuch/notmuch-0.23.1.ebuild | 200 ---------------------
net-mail/notmuch/notmuch-0.23.2.ebuild | 200 ---------------------
6 files changed, 679 deletions(-)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 56ecce2..e69e076 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,6 +4,4 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
-DIST notmuch-0.23.1.tar.gz 690069 SHA256 e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 SHA512 e19bdc525090abcd4d476e4fd77d22e43001dee9b9202c45877b40d8c76bb9f522df61c19448ca42f6812e23e590e9241bda354c28205f479da50fb3ebd7bbb1 WHIRLPOOL b6f34bfa23aa2ed4d970696d5eedbc9d96f754bc88370bd777a9bafac835caf795df7e7f81e28892a014861bcb1512fd5bbb5ce225058f0cdec1858a167e6668
-DIST notmuch-0.23.2.tar.gz 690833 SHA256 edfd7528d43bf1e1ab2620607f9fdcf772603455a61c2eb49978619c352c97bc SHA512 487f70ef613962275dc81532cea62f287933bdb7a695466ce5ce0c5913ce06597abb152bac7126457997da710bbd716d30cee408a83b6bad4343407a5a9a202e WHIRLPOOL e5057e4490d949462e7f08530176a0b3c32a31e92402210cd02e11cb18c87f33d3e9705edd84284d0622e25a043d35a2d093bd0a0a9007123e87196ab699a885
DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
diff --git a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch b/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch
deleted file mode 100644
index 0c05373..00000000
--- a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b913a28f65e32380a84da735e0524f8d5c127f93 Mon Sep 17 00:00:00 2001
-From: David Bremner <david@tethera.net>
-Date: Sun, 9 Oct 2016 19:30:44 -0300
-Subject: [PATCH 1/3] emacs/show: force notmuch-show-buttonise-links to act on
- lines
-
-This seems to fix a problem with emacs 25 creating partial buttons by
-calling n-s-b-l with a region that does not include the whole button.
-I'm not 100% sure it's legit to act outside the region passed by
-jit-lock, but goto-address-fontify-region (where I borrowed the code
-from) already does this, so this patch to not make things worse.
----
- emacs/notmuch-show.el | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
-index 641398d..e7d16f8 100644
---- a/emacs/notmuch-show.el
-+++ b/emacs/notmuch-show.el
-@@ -1174,13 +1174,15 @@ This also turns id:\"<message id>\"-parts and mid: links into
- buttons for a corresponding notmuch search."
- (goto-address-fontify-region start end)
- (save-excursion
-- (let (links)
-- (goto-char start)
-- (while (re-search-forward notmuch-id-regexp end t)
-+ (let (links
-+ (beg-line (progn (goto-char start) (line-beginning-position)))
-+ (end-line (progn (goto-char end) (line-end-position))))
-+ (goto-char beg-line)
-+ (while (re-search-forward notmuch-id-regexp end-line t)
- (push (list (match-beginning 0) (match-end 0)
- (match-string-no-properties 0)) links))
-- (goto-char start)
-- (while (re-search-forward notmuch-mid-regexp end t)
-+ (goto-char beg-line)
-+ (while (re-search-forward notmuch-mid-regexp end-line t)
- (let* ((mid-cid (match-string-no-properties 1))
- (mid (save-match-data
- (string-match "^[^/]*" mid-cid)
---
-2.10.1
-
diff --git a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch b/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch
deleted file mode 100644
index 39651cb..00000000
--- a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e64f1ec1db49406d4834b09d8c4b2aec83ba66cb Mon Sep 17 00:00:00 2001
-From: Mark Walters <markwalters1009@gmail.com>
-Date: Wed, 12 Oct 2016 08:39:21 +0100
-Subject: [PATCH 2/3] emacs: search face bugfix
-
-In commit 2a7b11b064233afc4feead876fa396e3c18a6b91 the default faces
-for unread and flagged were accidentally swapped. This swaps them back.
----
- emacs/notmuch.el | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/emacs/notmuch.el b/emacs/notmuch.el
-index 8e14692..48c33fd 100644
---- a/emacs/notmuch.el
-+++ b/emacs/notmuch.el
-@@ -313,7 +313,7 @@ there will be called at other points of notmuch execution."
-
- (defface notmuch-search-flagged-face
- '((t
-- (:weight bold)))
-+ (:foreground "blue")))
- "Face used in search mode face for flagged threads.
-
- This face is the default value for the \"flagged\" tag in
-@@ -323,7 +323,7 @@ This face is the default value for the \"flagged\" tag in
-
- (defface notmuch-search-unread-face
- '((t
-- (:foreground "blue")))
-+ (:weight bold)))
- "Face used in search mode for unread threads.
-
- This face is the default value for the \"unread\" tag in
---
-2.10.1
-
diff --git a/net-mail/notmuch/notmuch-0.22.2.ebuild b/net-mail/notmuch/notmuch-0.22.2.ebuild
deleted file mode 100644
index f65afe4..00000000
--- a/net-mail/notmuch/notmuch-0.22.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-2.6.20-r2:2.6
- >=dev-libs/xapian-1.2.7-r2:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl ) )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-MY_PATCHES=( )
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.gz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- rm -f Makefile.config # assure that new Makefile.config will be generated
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- mv html ../python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dohtml -r python
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.23.1.ebuild b/net-mail/notmuch/notmuch-0.23.1.ebuild
deleted file mode 100644
index 6f18afc..00000000
--- a/net-mail/notmuch/notmuch-0.23.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-2.6.20-r2:2.6
- >=dev-libs/xapian-1.2.7-r2:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl ) )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.gz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- rm -f Makefile.config # assure that new Makefile.config will be generated
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.23.2.ebuild b/net-mail/notmuch/notmuch-0.23.2.ebuild
deleted file mode 100644
index 49aefbf..00000000
--- a/net-mail/notmuch/notmuch-0.23.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-2.6.20-r2:2.6
- >=dev-libs/xapian-1.2.7-r2:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl ) )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.gz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- rm -f Makefile.config # assure that new Makefile.config will be generated
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2017-01-25 22:46 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2017-01-25 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 8520993f20691cb7a548f0af6ce5f5619471c141
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 22:46:06 2017 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 22:46:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8520993f
net-mail/notmuch: Remove oldest versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-mail/notmuch/Manifest | 3 -
...01-doc-gzipped-notmuch.3-before-trying-to.patch | 28 ---
...02-Rename-rst2man-to-rst2man.py-for-Gento.patch | 38 ----
...03-build-eliminate-use-of-python-execfile.patch | 47 -----
net-mail/notmuch/notmuch-0.18.2.ebuild | 181 -------------------
net-mail/notmuch/notmuch-0.19-r1.ebuild | 196 ---------------------
net-mail/notmuch/notmuch-0.20.2.ebuild | 192 --------------------
7 files changed, 685 deletions(-)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3ad9bd6..b43ef2d 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,7 +1,4 @@
DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
-DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
-DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
-DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
diff --git a/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch b/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
deleted file mode 100644
index 3890328..00000000
--- a/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a95173249ae8811241da7640814934837abce53b Mon Sep 17 00:00:00 2001
-From: David Bremner <david@tethera.net>
-Date: Sun, 25 Jan 2015 15:04:51 +0100
-Subject: [PATCH] doc: gzipped notmuch.3 before trying to install notmuch.3.gz
-
-If HAVE_SPHINX=0 but HAVE_DOXYGEN=1, then the previous version was
-trying to install notmuch.3.gz but only got as far as creating
-notmuch.3
----
- doc/Makefile.local | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Makefile.local b/doc/Makefile.local
-index e7d0bac..a719d8b 100644
---- a/doc/Makefile.local
-+++ b/doc/Makefile.local
-@@ -63,7 +63,7 @@ install-man: install-apidocs
- ifeq ($(HAVE_DOXYGEN),1)
- MAN_GZIP_FILES += ${APIMAN}.gz
- apidocs: $(APIMAN)
--install-apidocs: apidocs
-+install-apidocs: ${APIMAN}.gz
- mkdir -p "$(DESTDIR)$(mandir)/man3"
- install -m0644 $(DOCBUILDDIR)/man/man3/*.3.gz $(DESTDIR)/$(mandir)/man3
-
---
-2.2.2
-
diff --git a/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch b/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
deleted file mode 100644
index beda83d..00000000
--- a/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dcae4803d006af1a7b961a492d65c28a3cffbc3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 29 Jan 2015 14:17:01 +0100
-Subject: [PATCH 2/2] Rename rst2man to rst2man.py for Gentoo
-
-Gentoo doesn't provide symlink rst2man.py -> rst2man.
----
- configure | 2 +-
- doc/prerst2man.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index d14e7d1..bf78066 100755
---- a/configure
-+++ b/configure
-@@ -436,7 +436,7 @@ else
- have_sphinx=0
-
- printf "Checking if rst2man is available... "
-- if rst2man -V > /dev/null 2>&1; then
-+ if rst2man.py -V > /dev/null 2>&1; then
- printf "Yes.\n"
- have_rst2man=1
- else
-diff --git a/doc/prerst2man.py b/doc/prerst2man.py
-index 437dea9..22b8258 100644
---- a/doc/prerst2man.py
-+++ b/doc/prerst2man.py
-@@ -59,5 +59,5 @@ for page in man_pages:
- outfile.write("".join(lines))
- outfile.close()
-
-- system('set -x; rst2man {0} {1}/{2}.{3}'
-+ system('set -x; rst2man.py {0} {1}/{2}.{3}'
- .format(filename, outdir, page[0], page[4]))
---
-2.2.2
-
diff --git a/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch b/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
deleted file mode 100644
index 2eff9d6..00000000
--- a/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 381385ccb7581bb16b72c23fd804c40b0330fe71 Mon Sep 17 00:00:00 2001
-From: David Bremner <david@tethera.net>
-Date: Sat, 3 Jan 2015 14:14:03 +0100
-Subject: [PATCH 3/3] build: eliminate use of python execfile command
-
-As discussed in
-id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us,
-execfile is unavailable in python3.
-
-The approach of this commit avoids modifying the python module path,
-which is arguably preferable since it avoids potentially accidentally
-importing a module from the wrong place.
----
- devel/release-checks.sh | 2 +-
- doc/prerst2man.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/devel/release-checks.sh b/devel/release-checks.sh
-index 797d62a..ae02f55 100755
---- a/devel/release-checks.sh
-+++ b/devel/release-checks.sh
-@@ -130,7 +130,7 @@ else
- fi
-
- echo -n "Checking that python bindings version is $VERSION... "
--py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
-+py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`
- if [ "$py_version" = "$VERSION" ]
- then
- echo Yes.
-diff --git a/doc/prerst2man.py b/doc/prerst2man.py
-index 22b8258..45dddca 100644
---- a/doc/prerst2man.py
-+++ b/doc/prerst2man.py
-@@ -10,7 +10,8 @@ outdir = argv[2]
- if not isdir(outdir):
- makedirs(outdir, 0o755)
-
--execfile(sourcedir + "/conf.py")
-+with open(sourcedir + "/conf.py") as cf:
-+ exec(cf.read())
-
-
- def header(file, startdocname, command, description, authors, section):
---
-2.2.2
-
diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
deleted file mode 100644
index 7a9e6ca..00000000
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 \
- toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/3"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python )
- "
-IUSE="crypt debug doc emacs mutt nmbug python test"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22
- >=dev-libs/gmime-2.6.7
- !=dev-libs/gmime-2.6.19
- <dev-libs/xapian-1.3
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- debug? ( dev-util/valgrind )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- x86? ( >=dev-libs/xapian-1.2.7-r2 )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-Pod-Parser )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-MY_PATCHES=( )
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "Notmuch 0.18 comes with few not backward compatible changes."
- ewarn "See NEWS file for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_prepare() {
- [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --with-gmime-version=2.6
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- mv html ../python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- emake download-test-databases
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/nmbug-status
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dohtml -r python
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
deleted file mode 100644
index c31a9fa..00000000
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt debug emacs python )
- "
-IUSE="crypt debug doc emacs mutt nmbug python test"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22
- >=dev-libs/gmime-2.6.7
- !=dev-libs/gmime-2.6.19
- <dev-libs/xapian-1.3
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- debug? ( dev-util/valgrind )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- x86? ( >=dev-libs/xapian-1.2.7-r2 )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen
- python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-MY_PATCHES=(
- "${FILESDIR}/${PV}-0001-doc-gzipped-notmuch.3-before-trying-to.patch"
- "${FILESDIR}/${PV}-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch"
- "${FILESDIR}/${PV}-0003-build-eliminate-use-of-python-execfile.patch"
- )
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_prepare() {
- [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- if use debug; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --with-gmime-version=2.6
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- mv html ../python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- emake download-test-databases
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/nmbug-status
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dohtml -r python
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
deleted file mode 100644
index 66ecf2e..00000000
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt debug emacs python )
- "
-IUSE="crypt debug doc emacs mutt nmbug python test"
-
-CDEPEND="
- >=app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22
- >=dev-libs/gmime-2.6.7
- !=dev-libs/gmime-2.6.19
- <dev-libs/xapian-1.3
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- debug? ( dev-util/valgrind )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- x86? ( >=dev-libs/xapian-1.2.7-r2 )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-MY_PATCHES=( )
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_prepare() {
- [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- if use debug; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --with-gmime-version=2.6
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- mv html ../python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- emake download-test-databases
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/nmbug-status
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dohtml -r python
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2017-02-05 11:19 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2017-02-05 11:19 UTC (permalink / raw
To: gentoo-commits
commit: c932649c01ff95cdc89b328548de7f44ee1384da
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 10:29:51 2017 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 11:17:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c932649c
net-mail/notmuch: Fix tests to work with >=app-crypt/gnupg-2.1.16
Tests have been failing because path for Unix socket was too long.
Socket had been created in temporary directory within workdir. Create
temporary directory in /tmp instead.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-mail/notmuch/files/fix-gpg-tests.patch | 16 ++++++++++++++++
net-mail/notmuch/notmuch-0.23.3.ebuild | 1 +
net-mail/notmuch/notmuch-0.23.5.ebuild | 1 +
3 files changed, 18 insertions(+)
diff --git a/net-mail/notmuch/files/fix-gpg-tests.patch b/net-mail/notmuch/files/fix-gpg-tests.patch
new file mode 100644
index 00000000..e674f18
--- /dev/null
+++ b/net-mail/notmuch/files/fix-gpg-tests.patch
@@ -0,0 +1,16 @@
+diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
+index 03ef1d2d..178820bd 100644
+--- a/test/test-lib-common.sh
++++ b/test/test-lib-common.sh
+@@ -139,10 +139,7 @@ export PATH MANPATH
+ # Test repository
+ test="tmp.$(basename "$0" .sh)"
+ test -n "$root" && test="$root/$test"
+-case "$test" in
+-/*) TMP_DIRECTORY="$test" ;;
+- *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;;
+-esac
++TMP_DIRECTORY="$(mktemp -d)"
+ test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
+ rm -fr "$test" || {
+ GIT_EXIT_OK=t
diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 8a372a9..9799558 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${CDEPEND}
"
DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
SITEFILE="50${PN}-gentoo.el"
MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
diff --git a/net-mail/notmuch/notmuch-0.23.5.ebuild b/net-mail/notmuch/notmuch-0.23.5.ebuild
index b448318..86e50bb 100644
--- a/net-mail/notmuch/notmuch-0.23.5.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.5.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${CDEPEND}
"
DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
SITEFILE="50${PN}-gentoo.el"
MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2017-04-01 19:46 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2017-04-01 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 149fc8a4bc36a0e0a0dec4b487b36edfb8700ca4
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 1 19:27:21 2017 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 19:46:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149fc8a4
net-mail/notmuch: Remove older minor version
0.23.7 has just been stabilized. This can be removed now.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-mail/notmuch/Manifest | 1 -
net-mail/notmuch/files/fix-gpg-tests.patch | 16 ---
net-mail/notmuch/notmuch-0.23.3.ebuild | 201 -----------------------------
3 files changed, 218 deletions(-)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index becee24f955..89bd5e96083 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,4 @@
DIST database-v1.tar.xz 204876 SHA256 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2 SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 WHIRLPOOL c3a4d99405ce5143ee2ac0cbdebdabbee0213ecfcb25615612b1577165547dd7c5b6b1d1930302dc3a8afc92b3691a6a4cc48255e91b08a297f9d2510e789233
DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
-DIST notmuch-0.23.3.tar.gz 691361 SHA256 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 SHA512 232a4133d70d074e6d38b00471145ecec342a5e138822cce01b6915e2b3de29fc1181e116d1df30e2fea04d519f53297fd8ea0e9d0df91bc8d6fce549feed1e3 WHIRLPOOL 82c30f3137132504ed41c42619c3645b74680d01a835e6074122b6ff3ab8d1a5dfe138a583872d09ea9f70a7312021fafa1bd2c08c3b6b9a319f55e5c81f28ff
DIST notmuch-0.23.7.tar.gz 692230 SHA256 f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913 SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522 WHIRLPOOL 0b14cd6fb2b584b27b7893bb9c45724725069a6bc980cfe52f80ec3f6ec95c3a8f631975875f44b46b2799d5a0c31a62ff845b2400b7389cd8aa6f55361a0851
DIST notmuch-0.24.tar.gz 708243 SHA256 f7e44cf67630669d3537c4febd7685ca27d62a134e42f9a5db90d5a6ed4c75fc SHA512 f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5 WHIRLPOOL a64643461bb3f4e97459b76c43700cce5f69d4e9df99c9eadd424f9d8e1fe2f3b8d33cfd19cb2945050bc5018d2a2dabe484723d68fb247084e729f0b778908b
diff --git a/net-mail/notmuch/files/fix-gpg-tests.patch b/net-mail/notmuch/files/fix-gpg-tests.patch
deleted file mode 100644
index e674f185fde..00000000000
--- a/net-mail/notmuch/files/fix-gpg-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
-index 03ef1d2d..178820bd 100644
---- a/test/test-lib-common.sh
-+++ b/test/test-lib-common.sh
-@@ -139,10 +139,7 @@ export PATH MANPATH
- # Test repository
- test="tmp.$(basename "$0" .sh)"
- test -n "$root" && test="$root/$test"
--case "$test" in
--/*) TMP_DIRECTORY="$test" ;;
-- *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;;
--esac
-+TMP_DIRECTORY="$(mktemp -d)"
- test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
- rm -fr "$test" || {
- GIT_EXIT_OK=t
diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
deleted file mode 100644
index f084e405278..00000000000
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 x86"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- !!<app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-2.6.20-r2:2.6
- >=dev-libs/xapian-1.2.7-r2:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
- >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl ) )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
- dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser )
- "
-
-DOCS=( AUTHORS NEWS README )
-PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.gz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2019-11-19 22:15 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2019-11-19 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 1829e6ca181daa325d442f8d5cf500c88937ed7a
Author: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 22:15:11 2019 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 22:15:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1829e6ca
net-mail/notmuch: Remove older micro version
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>
net-mail/notmuch/Manifest | 1 -
...-Use-loopback-IP-address-rather-than-name.patch | 61 ------
net-mail/notmuch/notmuch-0.29.1-r1.ebuild | 232 ---------------------
net-mail/notmuch/notmuch-0.29.1.ebuild | 232 ---------------------
4 files changed, 526 deletions(-)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 5fccb1523e7..fdfe821babe 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,3 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
-DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
diff --git a/net-mail/notmuch/files/0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index e4722469595..00000000000
--- a/net-mail/notmuch/files/0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sun, 7 Jul 2019 11:33:09 +0100
-Subject: [PATCH] Use loopback IP address rather than name
-
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index a7c1fe4f..822a986a 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- fprintf (peer, "502 not implemented\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
-- fprintf (peer, "250 localhost\r\n");
-+ fprintf (peer, "250 127.0.0.1\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
- size_t line_size;
- ssize_t line_len;
-
-- fprintf (peer, "220 localhost smtp-dummy\r\n");
-+ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
- fflush (peer);
-
- while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -183,9 +183,9 @@ main (int argc, char *argv[])
- goto DONE;
- }
-
-- hostinfo = gethostbyname ("localhost");
-+ hostinfo = gethostbyname ("127.0.0.1");
- if (hostinfo == NULL) {
-- fprintf (stderr, "Unknown host: localhost\n");
-+ fprintf (stderr, "Unknown host: 127.0.0.1\n");
- ret = 1;
- goto DONE;
- }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index 616cb674..dd887773 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -336,7 +336,7 @@ emacs_deliver_message ()
- test_emacs \
- "(let ((message-send-mail-function 'message-smtpmail-send-it)
- (mail-host-address \"example.com\")
-- (smtpmail-smtp-server \"localhost\")
-+ (smtpmail-smtp-server \"127.0.0.1\")
- (smtpmail-smtp-service \"${smtp_dummy_port}\"))
- (notmuch-mua-mail)
- (message-goto-to)
---
-2.19.2
-
diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
deleted file mode 100644
index f96e581b17a..00000000000
--- a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- !!<app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-3.0.3:3.0
- >=dev-libs/xapian-1.4.8:=
- dev-python/sphinx
- sys-apps/texinfo
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( dev-libs/gmime:3.0[crypt] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-python/mock[${PYTHON_USEDEP}]
- )
- test? (
- app-misc/dtach
- || ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
- sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl )
- )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? (
- dev-perl/File-Which
- dev-perl/Mail-Box
- dev-perl/MailTools
- dev-perl/String-ShellQuote
- dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA
- virtual/perl-File-Path
- virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
- "${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.xz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- append-ldflags -lnsl -lsocket # non-autoconf configure
- fi
-}
-
-src_configure() {
- python_setup # for sphinx
-
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-desktop
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- python_setup # for sphinx
-
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use doc; then
- doman doc/_build/man/man?/*.?
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
deleted file mode 100644
index 951f0faad9e..00000000000
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
- test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
- !!<app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-3.0.3:3.0
- >=dev-libs/xapian-1.4.8:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- sys-apps/texinfo
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( dev-libs/gmime:3.0[crypt] )
- emacs? ( >=virtual/emacs-23 )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-python/mock[${PYTHON_USEDEP}]
- )
- test? (
- app-misc/dtach
- || ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
- sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl )
- )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? (
- dev-perl/File-Which
- dev-perl/Mail-Box
- dev-perl/MailTools
- dev-perl/String-ShellQuote
- dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA
- virtual/perl-File-Path
- virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
- "${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
-}
-
-src_unpack() {
- unpack "${P}".tar.xz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- append-ldflags -lnsl -lsocket # non-autoconf configure
- fi
-}
-
-src_configure() {
- python_setup # for sphinx
-
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-desktop
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- python_setup # for sphinx
-
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use doc; then
- doman doc/_build/man/man?/*.?
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2020-02-01 23:37 Amadeusz Piotr Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2020-02-01 23:37 UTC (permalink / raw
To: gentoo-commits
commit: e705c4ca0409cb296a8e79c5adccc633456d0406
Author: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 23:32:54 2020 +0000
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 23:37:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e705c4ca
net-mail/notmuch: Remove vulnerable versions
Bug: https://bugs.gentoo.org/701350
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org>
net-mail/notmuch/Manifest | 2 -
...-Use-loopback-IP-address-rather-than-name.patch | 61 ------
...-Use-loopback-IP-address-rather-than-name.patch | 62 ------
.../0002-Fix-jobserver-unavailable-warning.patch | 26 ---
net-mail/notmuch/notmuch-0.28.4.ebuild | 232 --------------------
net-mail/notmuch/notmuch-0.29.2.ebuild | 233 ---------------------
6 files changed, 616 deletions(-)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 8dc7ed23286..f0b08dea803 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,2 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
-DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
diff --git a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index e4722469595..00000000000
--- a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sun, 7 Jul 2019 11:33:09 +0100
-Subject: [PATCH] Use loopback IP address rather than name
-
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index a7c1fe4f..822a986a 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- fprintf (peer, "502 not implemented\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
-- fprintf (peer, "250 localhost\r\n");
-+ fprintf (peer, "250 127.0.0.1\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
- size_t line_size;
- ssize_t line_len;
-
-- fprintf (peer, "220 localhost smtp-dummy\r\n");
-+ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
- fflush (peer);
-
- while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -183,9 +183,9 @@ main (int argc, char *argv[])
- goto DONE;
- }
-
-- hostinfo = gethostbyname ("localhost");
-+ hostinfo = gethostbyname ("127.0.0.1");
- if (hostinfo == NULL) {
-- fprintf (stderr, "Unknown host: localhost\n");
-+ fprintf (stderr, "Unknown host: 127.0.0.1\n");
- ret = 1;
- goto DONE;
- }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index 616cb674..dd887773 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -336,7 +336,7 @@ emacs_deliver_message ()
- test_emacs \
- "(let ((message-send-mail-function 'message-smtpmail-send-it)
- (mail-host-address \"example.com\")
-- (smtpmail-smtp-server \"localhost\")
-+ (smtpmail-smtp-server \"127.0.0.1\")
- (smtpmail-smtp-service \"${smtp_dummy_port}\"))
- (notmuch-mua-mail)
- (message-goto-to)
---
-2.19.2
-
diff --git a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index f7e1d7e05e3..00000000000
--- a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9c15b508819d15d0852d71c2e897550cfaac09ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Thu, 7 Mar 2019 22:47:55 +0000
-Subject: [PATCH] Use loopback IP address rather than name
-
-With FEATURES="network-sandbox" 'localhost' name lookup fails.
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index 71992edd..e72ba2d0 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- fprintf (peer, "502 not implemented\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
-- fprintf (peer, "250 localhost\r\n");
-+ fprintf (peer, "250 127.0.0.1\r\n");
- fflush (peer);
- } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
- size_t line_size;
- ssize_t line_len;
-
-- fprintf (peer, "220 localhost smtp-dummy\r\n");
-+ fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
- fflush (peer);
-
- while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -182,9 +182,9 @@ main (int argc, char *argv[])
- goto DONE;
- }
-
-- hostinfo = gethostbyname ("localhost");
-+ hostinfo = gethostbyname ("127.0.0.1");
- if (hostinfo == NULL) {
-- fprintf (stderr, "Unknown host: localhost\n");
-+ fprintf (stderr, "Unknown host: 127.0.0.1\n");
- ret = 1;
- goto DONE;
- }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index fca5277d..fa8fd5bd 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -320,7 +320,7 @@ emacs_deliver_message ()
- test_emacs \
- "(let ((message-send-mail-function 'message-smtpmail-send-it)
- (mail-host-address \"example.com\")
-- (smtpmail-smtp-server \"localhost\")
-+ (smtpmail-smtp-server \"127.0.0.1\")
- (smtpmail-smtp-service \"25025\"))
- (notmuch-mua-mail)
- (message-goto-to)
---
-2.19.2
-
diff --git a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
deleted file mode 100644
index 85ca4b6d4a5..00000000000
--- a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sat, 9 Mar 2019 22:42:21 +0000
-Subject: [PATCH 2/2] Fix "jobserver unavailable" warning
-
----
- doc/Makefile.local | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Makefile.local b/doc/Makefile.local
-index bab3d0d2..dfe62295 100644
---- a/doc/Makefile.local
-+++ b/doc/Makefile.local
-@@ -56,7 +56,7 @@ sphinx-texinfo:
- $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
-
- sphinx-info: sphinx-texinfo
-- make -C $(DOCBUILDDIR)/texinfo info
-+ $(MAKE) -C $(DOCBUILDDIR)/texinfo info
-
- # Use the man page converter that is available. We should never depend
- # on MAN_ROFF_FILES if a converter is not available.
---
-2.19.2
-
diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
deleted file mode 100644
index 902126ad239..00000000000
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.gz
- test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha amd64 x86 ~x64-solaris"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- !!<app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-3.0.3:3.0
- >=dev-libs/xapian-1.4.8:=
- dev-python/sphinx[${PYTHON_USEDEP}]
- sys-apps/texinfo
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( dev-libs/gmime:3.0[crypt] )
- emacs? ( >=app-editors/emacs-24.1:* )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-python/mock[${PYTHON_USEDEP}]
- )
- test? (
- app-misc/dtach
- >=app-editors/emacs-24.1:*[libxml2]
- sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl )
- )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? (
- dev-perl/File-Which
- dev-perl/Mail-Box
- dev-perl/MailTools
- dev-perl/String-ShellQuote
- dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA
- virtual/perl-File-Path
- virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
- "${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
- "${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
-)
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
- unpack "${P}".tar.gz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
- python_setup # for sphinx
-
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-desktop
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- python_setup # for sphinx
-
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use doc; then
- doman doc/_build/man/man?/*.?
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
deleted file mode 100644
index b10795cfe09..00000000000
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
- distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
- test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
- nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
- "
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- !!<app-shells/bash-completion-1.9
- >=dev-libs/glib-2.22:2
- >=dev-libs/gmime-3.0.3:3.0
- >=dev-libs/xapian-1.4.8:=
- dev-python/sphinx
- sys-apps/texinfo
- >=sys-libs/zlib-1.2.5.2
- sys-libs/talloc
- crypt? ( dev-libs/gmime:3.0[crypt] )
- emacs? ( >=app-editors/emacs-24.1:* )
- python? ( ${PYTHON_DEPS} )
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-python/mock[${PYTHON_USEDEP}]
- )
- test? (
- app-misc/dtach
- >=app-editors/emacs-24.1:*[libxml2]
- sys-devel/gdb
- crypt? ( app-crypt/gnupg dev-libs/openssl )
- )
- valgrind? ( dev-util/valgrind )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- nmbug? ( dev-vcs/git )
- mutt? (
- dev-perl/File-Which
- dev-perl/Mail-Box
- dev-perl/MailTools
- dev-perl/String-ShellQuote
- dev-perl/Term-ReadLine-Gnu
- virtual/perl-Digest-SHA
- virtual/perl-File-Path
- virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
- )
- "
-
-DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
- "${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
- local ret=0
-
- if use $1; then
- pushd bindings/$1 || die
- shift
- "$@"
- ret=$?
- popd || die
- fi
-
- return $ret
-}
-
-pkg_pretend() {
- if has_version '<net-mail/notmuch-0.18'; then
- ewarn
- ewarn "There are few not backward compatible changes between"
- ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
- ewarn "(0.18 section) for details before first use!"
- ewarn
- fi
-}
-
-pkg_setup() {
- use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
- unpack "${P}".tar.xz
- if use test; then
- mkdir -p "${S}"/test/test-databases || die
- cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
- fi
-}
-
-src_prepare() {
- default
-
- bindings python distutils-r1_src_prepare
- bindings python mv README README-python || die
- mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
- # assure that new Makefile.config will be generated
- rm -f Makefile.config || die
-
- sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
- if use test; then
- append-cflags -g
- append-cxxflags -g
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- append-ldflags -lnsl -lsocket # non-autoconf configure
- fi
-}
-
-src_configure() {
- python_setup # for sphinx
-
- local myeconfargs=(
- --bashcompletiondir="$(get_bashcompdir)"
- --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
- --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
- --without-desktop
- --without-ruby
- --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- $(use_with emacs)
- $(use_with doc api-docs)
- )
- tc-export CC CXX
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- python_setup # for sphinx
-
- V=1 default
- bindings python distutils-r1_src_compile
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- emake notmuch-mutt.1
- popd || die
- fi
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- rm -r html/_sources || die
- rm html/{objects.inv,.buildinfo} || die
- mkdir -p ../html && mv html ../html/python || die
- popd || die
- }
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
- fi
-}
-
-src_test() {
- pax-mark -m notmuch
- LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
- pax-mark -ze notmuch
-}
-
-src_install() {
- default
-
- if use doc; then
- doman doc/_build/man/man?/*.?
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use nmbug; then
- dobin devel/nmbug/nmbug
- dobin devel/nmbug/notmuch-report
- fi
-
- if use mutt; then
- pushd contrib/notmuch-mutt || die
- dobin notmuch-mutt
- doman notmuch-mutt.1
- insinto /etc/mutt
- doins notmuch-mutt.rc
- dodoc README-mutt
- popd || die
- fi
-
- DOCS="" bindings python distutils-r1_src_install
- use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
- if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
- elog "To enable notmuch support in mutt, add the following line into"
- elog "your mutt config file, please:"
- elog ""
- elog " source /etc/mutt/notmuch-mutt.rc"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2021-04-14 0:27 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-04-14 0:27 UTC (permalink / raw
To: gentoo-commits
commit: a1438a27f486f6c314f1ebf1a01d76703bc0cf19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 00:15:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 00:27:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1438a27
net-mail/notmuch: add upstream glib 2.68 patch
Closes: https://bugs.gentoo.org/777663
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../notmuch/files/notmuch-0.31.3-glib-2.68.patch | 60 ++++++++++++++++++++++
net-mail/notmuch/notmuch-0.31.3.ebuild | 4 ++
2 files changed, 64 insertions(+)
diff --git a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
new file mode 100644
index 00000000000..19f00391093
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777663
+
+From: David Bremner <david@tethera.net>
+Date: Mon, 15 Feb 2021 20:43:50 +0000 (-0400)
+Subject: fix build failure with glib 2.67
+X-Git-Tag: archive/debian/0.31.4-1~6
+X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6db8b422d91a75b7c16f013f10f41d1109ce5866;hp=1692fe7aa8b137d02817bb11f248d204d6ab4048
+
+fix build failure with glib 2.67
+
+Based on a patch from Michael J Gruber [1]. As of glib 2.67 (more
+specifically [2]), including "gmime-extra.h" inside an extern "C"
+block causes build failures, because glib is using C++ features.
+
+Observing that "gmime-extra.h" is no longer needed in
+notmuch-private.h, which can simply delete that include, but
+we have to correspondingly move the includes which might include
+it (in particular crypto.h) out of the extern "C" block also.
+
+This seems less fragile than only moving gmime-extra, and relying on
+preprocessor sentinels to keep the deeper includes from happening.
+
+Move to the include to the outside of the extern block.
+
+[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu
+[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
+---
+
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
+index 57ec7f72..41aff342 100644
+--- a/lib/notmuch-private.h
++++ b/lib/notmuch-private.h
+@@ -31,6 +31,12 @@
+
+ #include "notmuch.h"
+
++#include "xutil.h"
++#include "error_util.h"
++#include "string-util.h"
++#include "crypto.h"
++#include "repair.h"
++
+ NOTMUCH_BEGIN_DECLS
+
+ #include <stdlib.h>
+@@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS
+
+ #include <talloc.h>
+
+-#include "gmime-extra.h"
+-
+-#include "xutil.h"
+-#include "error_util.h"
+-#include "string-util.h"
+-#include "crypto.h"
+-#include "repair.h"
+-
+ #ifdef DEBUG
+ # define DEBUG_DATABASE_SANITY 1
+ # define DEBUG_THREADING 1
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index d538001bf03..2d374bfe7e8 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -85,6 +85,10 @@ RDEPEND="${COMMON_DEPEND}
SITEFILE="50${PN}-gentoo.el"
+PATCHES=(
+ "${FILESDIR}"/${P}-glib-2.68.patch
+)
+
pkg_setup() {
use emacs && elisp-check-emacs-version
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2021-06-13 7:10 Georgy Yakovlev
0 siblings, 0 replies; 10+ messages in thread
From: Georgy Yakovlev @ 2021-06-13 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 719fd8b321b84fe261561a78f6d73212a31f0bec
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 07:08:45 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 07:09:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719fd8b3
net-mail/notmuch: add 0.32.1
Closes: https://bugs.gentoo.org/791079
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
net-mail/notmuch/Manifest | 1 +
net-mail/notmuch/files/notmuch-0.32.1-tests.patch | 174 +++++++++++++
net-mail/notmuch/notmuch-0.32.1.ebuild | 291 ++++++++++++++++++++++
3 files changed, 466 insertions(+)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 447108fd721..a3ebf895d3a 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,2 +1,3 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
+DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
diff --git a/net-mail/notmuch/files/notmuch-0.32.1-tests.patch b/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
new file mode 100644
index 00000000000..8a564325485
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
@@ -0,0 +1,174 @@
+From: Tomi Ollila <tomi.ollila@iki.fi>
+Date: Sat, 22 May 2021 13:39:57 +0000 (+0300)
+Subject: test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
+X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8675be1d307bc2df882107744641f6a7858e65ad;hp=3baa61e0e58402bc50c5df529fcf669bf4b2facb
+
+test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
+
+notmuch_passwd_sanitize() in test-lib.sh is too generic, it cannot
+work in many cases...
+
+The more specific version _libconfig_sanitize() replaces it in
+T590-libconfig.sh and the code that uses it is modified to output
+the keys (ascending numbers printed in hex) so the sanitizer knows
+what to sanitize in which lines...
+
+"@" + fqdn -> "@FQDN" replacement is used as fqdn could
+-- in theory -- be substring of 'USERNAME'.
+
+'user -> 'USER_FULL_NAME replacement to work in cases where user
+is empty -- as only first ' is replaced that works as expected.
+
+In addition to ".(none)" now also ".localdomain" is filtered from
+USERNAME@FQDN.
+
+/dev/fd/{n} is not defined in posix, but it is portable enough
+(if it weren't it is easy to fix -- now code looks clearer).
+---
+
+diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
+index 745e1bb4..bc7298f8 100755
+--- a/test/T590-libconfig.sh
++++ b/test/T590-libconfig.sh
+@@ -5,6 +5,25 @@ test_description="library config API"
+
+ add_email_corpus
+
++_libconfig_sanitize() {
++ ${NOTMUCH_PYTHON} /dev/fd/3 3<<'EOF'
++import os, sys, pwd, socket
++
++pw = pwd.getpwuid(os.getuid())
++user = pw.pw_name
++name = pw.pw_gecos.partition(",")[0]
++fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0,
++ socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
++for l in sys.stdin:
++ if l[:4] == "08: ":
++ l = l.replace(user, "USERNAME", 1).replace("@" + fqdn, "@FQDN", 1)
++ l = l.replace(".(none)", "", 1).replace(".localdomain", "", 1)
++ elif l[:4] == "10: ":
++ l = l.replace("'" + name, "'USER_FULL_NAME", 1)
++ sys.stdout.write(l)
++EOF
++}
++
+ cat <<EOF > c_head
+ #include <string.h>
+ #include <stdlib.h>
+@@ -380,26 +399,26 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} '' %NULL%
+ key < NOTMUCH_CONFIG_LAST;
+ key = (notmuch_config_key_t)(key + 1)) {
+ const char *val = notmuch_config_get (db, key);
+- printf("%s\n", val ? val : "NULL" );
++ printf("%02d: '%s'\n", key, val ? val : "NULL" );
+ }
+ }
+ EOF
+
+-notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
++_libconfig_sanitize < OUTPUT > OUTPUT.clean
+
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-
+-unread;inbox
+-
+-true
+-USERNAME@FQDN
+-NULL
+-USER_FULL_NAME
++00: 'MAIL_DIR'
++01: 'MAIL_DIR'
++02: 'MAIL_DIR/.notmuch/hooks'
++03: 'MAIL_DIR/.notmuch/backups'
++04: ''
++05: 'unread;inbox'
++06: ''
++07: 'true'
++08: 'USERNAME@FQDN'
++09: 'NULL'
++10: 'USER_FULL_NAME'
+ == stderr ==
+ EOF
+ unset MAILDIR
+@@ -694,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
+ key < NOTMUCH_CONFIG_LAST;
+ key = (notmuch_config_key_t)(key + 1)) {
+ const char *val = notmuch_config_get (db, key);
+- printf("%s\n", val ? val : "NULL" );
++ printf("%x: '%s'\n", key, val ? val : "NULL" );
+ }
+ }
+ EOF
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-foo;bar;fub
+-unread;inbox
+-sekrit_junk
+-true
+-test_suite@notmuchmail.org
+-test_suite_other@notmuchmail.org;test_suite@otherdomain.org
+-Notmuch Test Suite
++0: 'MAIL_DIR'
++1: 'MAIL_DIR'
++2: 'MAIL_DIR/.notmuch/hooks'
++3: 'MAIL_DIR/.notmuch/backups'
++4: 'foo;bar;fub'
++5: 'unread;inbox'
++6: 'sekrit_junk'
++7: 'true'
++8: 'test_suite@notmuchmail.org'
++9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
++a: 'Notmuch Test Suite'
+ == stderr ==
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT
+@@ -723,25 +742,26 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} /nonexistent %NULL%
+ key < NOTMUCH_CONFIG_LAST;
+ key = (notmuch_config_key_t)(key + 1)) {
+ const char *val = notmuch_config_get (db, key);
+- printf("%s\n", val ? val : "NULL" );
++ printf("%02d: '%s'\n", key, val ? val : "NULL" );
+ }
+ }
+ EOF
+
+-notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
++_libconfig_sanitize < OUTPUT > OUTPUT.clean
++
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-
+-unread;inbox
+-
+-true
+-USERNAME@FQDN
+-NULL
+-USER_FULL_NAME
++00: 'MAIL_DIR'
++01: 'MAIL_DIR'
++02: 'MAIL_DIR/.notmuch/hooks'
++03: 'MAIL_DIR/.notmuch/backups'
++04: ''
++05: 'unread;inbox'
++06: ''
++07: 'true'
++08: 'USERNAME@FQDN'
++09: 'NULL'
++10: 'USER_FULL_NAME'
+ == stderr ==
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT.clean
diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1.ebuild
new file mode 100644
index 00000000000..26acc520cdb
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+ test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+ apidoc? ( doc )
+ nmbug? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ apidoc? (
+ app-doc/doxygen
+ dev-lang/perl
+ )
+ doc? (
+ dev-python/sphinx
+ sys-apps/texinfo
+ )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ )
+ test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+ dev-libs/glib
+ dev-libs/gmime:3.0[crypt]
+ >=dev-libs/xapian-1.4.0:=
+ sys-libs/talloc
+ sys-libs/zlib:=
+ emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+ python? (
+ ${PYTHON_DEPS}
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ )
+"
+
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+ app-misc/dtach
+ sys-devel/gdb
+ crypt? (
+ app-crypt/gnupg
+ dev-libs/openssl
+ )
+ )
+ valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ crypt? ( app-crypt/gnupg )
+ mutt? (
+ dev-perl/File-Which
+ dev-perl/Mail-Box
+ dev-perl/MailTools
+ dev-perl/String-ShellQuote
+ dev-perl/Term-ReadLine-Gnu
+ virtual/perl-Digest-SHA
+ virtual/perl-File-Path
+ virtual/perl-Getopt-Long
+ virtual/perl-Pod-Parser
+ )
+ nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests.patch"
+)
+
+pkg_setup() {
+ use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+ unpack "${P}".tar.xz
+ if use test; then
+ mkdir -p "${S}"/test/test-databases || die
+ cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ use python && distutils-r1_src_prepare
+
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+ sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+ use test && append-flags '-g'
+
+ # Non-autoconf configure
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket'
+
+ # sphinx-4 broke everything. https://bugs.gentoo.org/789492
+ echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+ python_setup # For sphinx
+
+ tc-export CC CXX
+
+ local myconf=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with apidoc api-docs)
+ $(use_with doc docs)
+ $(use_with emacs)
+ )
+
+ econf "${myconf[@]}"
+}
+
+python_compile() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_compile
+ # copy stuff just in case
+ if use test; then
+ mkdir -p build/stage/tests || die
+ cp -v tests/*.py build/stage/tests || die
+ fi
+ popd > /dev/null || die
+
+ # TODO: we want to drop those, research revdeps
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_compile
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C bindings/python/docs html
+}
+
+src_compile() {
+ python_setup # For sphinx
+
+ # prevent race in emacs doc generation
+ # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+ if use emacs; then
+ use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+ fi
+
+ emake V=1
+
+ use python && distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ emake notmuch-mutt.1
+ popd > /dev/null || die
+ fi
+}
+
+python_test() {
+ # we only have tests for cffi bindings
+ pushd bindings/python-cffi > /dev/null || die
+ rm -f tox.ini || die
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+src_test() {
+ local test_failures=()
+ pax-mark -m notmuch
+ LD_LIBRARY_PATH="${S}/lib" \
+ nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+ pax-mark -ze notmuch
+
+ # both lib and bin needed for testsuite.
+ if use python; then
+ LD_LIBRARY_PATH="${S}/lib" \
+ PATH="${S}:${PATH}" \
+ nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+ fi
+
+ [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ pushd doc/_build/man/man1 > /dev/null || die
+ ln notmuch.1 notmuch-setup.1 || die
+ popd > /dev/null || die
+ if use apidoc; then
+ # rename overly generic manpage to avoid clashes
+ mv doc/_build/man/man3/deprecated.3 \
+ doc/_build/man/man3/notmuch-deprecated.3 || die
+ fi
+ doman doc/_build/man/man?/*.?
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ domenu emacs/notmuch-emacs-mua.desktop
+ fi
+
+ if use nmbug; then
+ # TODO: those guys need proper deps
+ python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+ dobin devel/nmbug/{nmbug,notmuch-report}
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ dobin notmuch-mutt
+ # this manpage is built by pod2man
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd > /dev/null || die
+ fi
+
+ local DOCS=( README{,.rst} INSTALL NEWS )
+ einstalldocs
+
+ if use python; then
+ use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+ distutils-r1_src_install
+ fi
+}
+
+pkg_preinst() {
+ local _rcfile="/etc/mutt/notmuch-mutt.rc"
+ if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+ elog "To enable notmuch support in mutt, add the following line"
+ elog "to your mutt config file:"
+ elog ""
+ elog " source ${_rcfile}"
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2023-01-13 8:22 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-01-13 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 80e849132c5477f51fcb9323316cc8546ea9564f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 08:21:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 08:22:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e84913
net-mail/notmuch: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/879739
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/notmuch-0.37-configure-clang16.patch | 24 ++
net-mail/notmuch/notmuch-0.37-r1.ebuild | 303 +++++++++++++++++++++
2 files changed, 327 insertions(+)
diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
new file mode 100644
index 000000000000..42c108337771
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/879739
+https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu
+
+Probe for strcasestr using the C++ compiler
+
+The C++ compiler may define _GNU_SOURCE, causing <string.h> to
+declare strcasestr, while the C compiler does not. As a result,
+the probe may fail, resulting in an incompatible declaration
+of strcasestr in compat/compat.h.
+
+Upstream discussion:
+
+ [PATCH] compat/strcasestr: Include correct header file
+ <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu>
+
+--- a/compat/have_strcasestr.c
++++ b/compat/have_strcasestr.c
+@@ -1,4 +1,5 @@
+ #define _GNU_SOURCE
++#include <string.h>
+ #include <strings.h>
+
+ int
+
diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r1.ebuild
new file mode 100644
index 000000000000..e28a9d0aa38e
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+ test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+REQUIRED_USE="
+ apidoc? ( doc )
+ nmbug? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
+ virtual/pkgconfig
+ apidoc? (
+ app-doc/doxygen
+ dev-lang/perl
+ )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ sys-apps/texinfo
+ )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ )
+ test? (
+ app-shells/bash
+ sys-process/parallel
+ )
+"
+
+COMMON_DEPEND="
+ dev-libs/glib
+ dev-libs/gmime:3.0[crypt]
+ >=dev-libs/xapian-1.4.0:=
+ sys-libs/talloc
+ sys-libs/zlib:=
+ emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+ python? (
+ ${PYTHON_DEPS}
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ )
+"
+
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+ app-misc/dtach
+ sys-devel/gdb[python]
+ crypt? (
+ app-crypt/gnupg
+ dev-libs/openssl
+ )
+ )
+ valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ crypt? ( app-crypt/gnupg )
+ mutt? (
+ dev-perl/File-Which
+ dev-perl/Mail-Box
+ dev-perl/MailTools
+ dev-perl/String-ShellQuote
+ dev-perl/Term-ReadLine-Gnu
+ virtual/perl-Digest-SHA
+ virtual/perl-File-Path
+ virtual/perl-Getopt-Long
+ dev-perl/Pod-Parser
+ )
+ nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.37-configure-clang16.patch
+)
+
+pkg_setup() {
+ use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+ unpack "${P}".tar.xz
+ if use test; then
+ mkdir -p "${S}"/test/test-databases || die
+ cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ use python && distutils-r1_src_prepare
+
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+ sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+ use test && append-flags '-g'
+
+ # Non-autoconf configure
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket'
+
+ # sphinx-4 broke everything. https://bugs.gentoo.org/789492
+ echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+ python_setup # For sphinx
+
+ tc-export CC CXX
+
+ local myconf=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with apidoc api-docs)
+ $(use_with doc docs)
+ $(use_with emacs)
+ )
+
+ # FIXME:
+ # Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+ # notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+ # gmime/gpg/scdaemon tries to open usb devices in GMime test
+ # we pretend to allow it, without actually allowing it to read or write.
+ # https://bugs.gentoo.org/821328
+ addpredict /dev/bus/usb
+
+ econf "${myconf[@]}"
+}
+
+python_compile() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_compile
+ # copy stuff just in case
+ if use test; then
+ mkdir -p build/stage/tests || die
+ cp -v tests/*.py build/stage/tests || die
+ fi
+ popd > /dev/null || die
+
+ # TODO: we want to drop those, research revdeps
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_compile
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C bindings/python/docs html
+}
+
+src_compile() {
+ python_setup # For sphinx
+
+ # prevent race in emacs doc generation
+ # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+ if use emacs; then
+ use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+ fi
+
+ emake V=1
+
+ use python && distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ emake notmuch-mutt.1
+ popd > /dev/null || die
+ fi
+}
+
+python_test() {
+ # we only have tests for cffi bindings
+ pushd bindings/python-cffi > /dev/null || die
+ rm -f tox.ini || die
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+src_test() {
+ local test_failures=()
+ pax-mark -m notmuch
+
+ # we run pytest via eclass phasefunc, so delete upstream launcher
+ use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+ pax-mark -ze notmuch
+
+ # both lib and bin needed for testsuite.
+ if use python; then
+ LD_LIBRARY_PATH="${S}/lib" \
+ PATH="${S}:${PATH}" \
+ nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+ fi
+
+ [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ if use apidoc; then
+ # rename overly generic manpage to avoid clashes
+ mv doc/_build/man/man3/deprecated.3 \
+ doc/_build/man/man3/notmuch-deprecated.3 || die
+ fi
+ doman doc/_build/man/man?/*.?
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ domenu emacs/notmuch-emacs-mua.desktop
+ fi
+
+ if use nmbug; then
+ # TODO: those guys need proper deps
+ python_fix_shebang devel/nmbug/notmuch-report
+ dobin devel/nmbug/notmuch-report
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ dobin notmuch-mutt
+ # this manpage is built by pod2man
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd > /dev/null || die
+ fi
+
+ local DOCS=( README{,.rst} INSTALL NEWS )
+ einstalldocs
+
+ if use python; then
+ use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+ distutils-r1_src_install
+ fi
+}
+
+pkg_preinst() {
+ local _rcfile="/etc/mutt/notmuch-mutt.rc"
+ if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+ elog "To enable notmuch support in mutt, add the following line"
+ elog "to your mutt config file:"
+ elog ""
+ elog " source ${_rcfile}"
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/
@ 2024-05-08 21:26 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2024-05-08 21:26 UTC (permalink / raw
To: gentoo-commits
commit: d2d7d6f4c636436cd20138ea0a77e658e0ddcbfc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 21:23:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 8 21:25:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d7d6f4
net-mail/notmuch: add py3.12, set DISTUTILS_EXT=1
Closes: https://bugs.gentoo.org/929716
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../notmuch/files/notmuch-0.37-python3.12.patch | 29 ++
net-mail/notmuch/notmuch-0.37-r2.ebuild | 305 +++++++++++++++++++++
2 files changed, 334 insertions(+)
diff --git a/net-mail/notmuch/files/notmuch-0.37-python3.12.patch b/net-mail/notmuch/files/notmuch-0.37-python3.12.patch
new file mode 100644
index 000000000000..b8b668ebcae6
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.37-python3.12.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/929716
+https://github.com/notmuch/notmuch/commit/3771832b013012e408696897215fd0edde7dce37
+
+From 3771832b013012e408696897215fd0edde7dce37 Mon Sep 17 00:00:00 2001
+From: Michael J Gruber <git@grubix.eu>
+Date: Fri, 16 Jun 2023 13:19:26 +0200
+Subject: [PATCH] python: adjust legacy bindings to py 3.12
+
+Py 3.12 finally pulled the plug on the `SafeConfigParser` class which
+has been deprecated since py 3.2.
+
+We use it in the legacy bindings only, so take the easy route of
+importing `ConfigParser` as `SafeConfigParser` and monkey-patching so
+that the class has the expected interface.
+--- a/bindings/python/notmuch/compat.py
++++ b/bindings/python/notmuch/compat.py
+@@ -47,7 +47,10 @@ def encode_utf8(value):
+
+ return value
+ else:
+- from configparser import SafeConfigParser
++ from configparser import ConfigParser as SafeConfigParser
++
++ if not hasattr(SafeConfigParser, 'readfp'): # py >= 3.12
++ SafeConfigParser.readfp = SafeConfigParser.read_file
+
+ class Python3StringMixIn(object):
+ def __str__(self):
+
diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild
new file mode 100644
index 000000000000..de653956ff4f
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+ test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ apidoc? ( doc )
+ nmbug? ( python )
+ test? ( crypt emacs python )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
+ virtual/pkgconfig
+ apidoc? (
+ app-text/doxygen
+ dev-lang/perl
+ )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ sys-apps/texinfo
+ )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ )
+ test? (
+ app-shells/bash
+ sys-process/parallel
+ )
+"
+
+COMMON_DEPEND="
+ dev-libs/glib
+ dev-libs/gmime:3.0[crypt]
+ >=dev-libs/xapian-1.4.0:=
+ sys-libs/talloc
+ sys-libs/zlib:=
+ emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/cffi[${PYTHON_USEDEP}]
+ ' 'python*')
+ )
+"
+
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+ app-misc/dtach
+ dev-debug/gdb[python]
+ crypt? (
+ app-crypt/gnupg
+ dev-libs/openssl
+ )
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ crypt? ( app-crypt/gnupg )
+ mutt? (
+ dev-perl/File-Which
+ dev-perl/Mail-Box
+ dev-perl/MailTools
+ dev-perl/String-ShellQuote
+ dev-perl/Term-ReadLine-Gnu
+ virtual/perl-Digest-SHA
+ virtual/perl-File-Path
+ virtual/perl-Getopt-Long
+ dev-perl/Pod-Parser
+ )
+ nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.37-configure-clang16.patch
+ "${FILESDIR}"/${PN}-0.37-python3.12.patch
+)
+
+pkg_setup() {
+ use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+ unpack "${P}".tar.xz
+ if use test; then
+ mkdir -p "${S}"/test/test-databases || die
+ cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ use python && distutils-r1_src_prepare
+
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+ sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+ use test && append-flags '-g'
+
+ # Non-autoconf configure
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket'
+
+ # sphinx-4 broke everything. https://bugs.gentoo.org/789492
+ echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+ python_setup # For sphinx
+
+ tc-export CC CXX
+
+ local myconf=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with apidoc api-docs)
+ $(use_with doc docs)
+ $(use_with emacs)
+ )
+
+ # FIXME:
+ # Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011
+ # notmuch configure compiles a program _check_session_keys.c, inline in ./configure script
+ # gmime/gpg/scdaemon tries to open usb devices in GMime test
+ # we pretend to allow it, without actually allowing it to read or write.
+ # https://bugs.gentoo.org/821328
+ addpredict /dev/bus/usb
+
+ econf "${myconf[@]}"
+}
+
+python_compile() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_compile
+ # copy stuff just in case
+ if use test; then
+ mkdir -p build/stage/tests || die
+ cp -v tests/*.py build/stage/tests || die
+ fi
+ popd > /dev/null || die
+
+ # TODO: we want to drop those, research revdeps
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_compile
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C bindings/python/docs html
+}
+
+src_compile() {
+ python_setup # For sphinx
+
+ # prevent race in emacs doc generation
+ # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+ if use emacs; then
+ use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+ fi
+
+ emake V=1
+
+ use python && distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ emake notmuch-mutt.1
+ popd > /dev/null || die
+ fi
+}
+
+python_test() {
+ # we only have tests for cffi bindings
+ pushd bindings/python-cffi > /dev/null || die
+ rm -f tox.ini || die
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+src_test() {
+ local test_failures=()
+ pax-mark -m notmuch
+
+ # we run pytest via eclass phasefunc, so delete upstream launcher
+ use python && { rm -v test/T391-python-cffi.sh || die ; }
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+ pax-mark -ze notmuch
+
+ # both lib and bin needed for testsuite.
+ if use python; then
+ LD_LIBRARY_PATH="${S}/lib" \
+ PATH="${S}:${PATH}" \
+ nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+ fi
+
+ [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ if use apidoc; then
+ # rename overly generic manpage to avoid clashes
+ mv doc/_build/man/man3/deprecated.3 \
+ doc/_build/man/man3/notmuch-deprecated.3 || die
+ fi
+ doman doc/_build/man/man?/*.?
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ domenu emacs/notmuch-emacs-mua.desktop
+ fi
+
+ if use nmbug; then
+ # TODO: those guys need proper deps
+ python_fix_shebang devel/nmbug/notmuch-report
+ dobin devel/nmbug/notmuch-report
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ dobin notmuch-mutt
+ # this manpage is built by pod2man
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd > /dev/null || die
+ fi
+
+ local DOCS=( README{,.rst} INSTALL NEWS )
+ einstalldocs
+
+ if use python; then
+ use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+ distutils-r1_src_install
+ fi
+}
+
+pkg_preinst() {
+ local _rcfile="/etc/mutt/notmuch-mutt.rc"
+ if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+ elog "To enable notmuch support in mutt, add the following line"
+ elog "to your mutt config file:"
+ elog ""
+ elog " source ${_rcfile}"
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-05-08 21:26 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-29 21:39 [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/ Amadeusz Piotr Żołnowski
-- strict thread matches above, loose matches on Subject: below --
2017-01-25 22:46 Amadeusz Piotr Żołnowski
2017-02-05 11:19 Amadeusz Piotr Żołnowski
2017-04-01 19:46 Amadeusz Piotr Żołnowski
2019-11-19 22:15 Amadeusz Piotr Żołnowski
2020-02-01 23:37 Amadeusz Piotr Żołnowski
2021-04-14 0:27 Sam James
2021-06-13 7:10 Georgy Yakovlev
2023-01-13 8:22 Sam James
2024-05-08 21:26 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox