summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2011-12-02 08:40:57 +0000
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2011-12-02 08:40:57 +0000
commit7c16a7b65c23f3544b1af2e001c0022a1597b5e4 (patch)
treec7fc6f41307c9ff5a69902cf98dcbeab71c09d73 /net-mail/notmuch
parentnet-mail/notmuch: Version bump to 0.10.1. (diff)
downloadhistorical-7c16a7b65c23f3544b1af2e001c0022a1597b5e4.tar.gz
historical-7c16a7b65c23f3544b1af2e001c0022a1597b5e4.tar.bz2
historical-7c16a7b65c23f3544b1af2e001c0022a1597b5e4.zip
net-mail/notmuch: Removed old versions: 0.10.
Package-Manager: portage-2.1.10.39/cvs/Linux x86_64
Diffstat (limited to 'net-mail/notmuch')
-rw-r--r--net-mail/notmuch/ChangeLog6
-rw-r--r--net-mail/notmuch/Manifest19
-rw-r--r--net-mail/notmuch/files/0.10-fix-test-build.patch104
-rw-r--r--net-mail/notmuch/notmuch-0.10.ebuild155
4 files changed, 13 insertions, 271 deletions
diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index deb78d2a64e8..dc27dcd2872a 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/notmuch
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.17 2011/12/02 08:38:53 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.18 2011/12/02 08:40:56 aidecoe Exp $
+
+ 02 Dec 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+ -files/0.10-fix-test-build.patch, -notmuch-0.10.ebuild:
+ Removed old versions: 0.10.
*notmuch-0.10.1 (02 Dec 2011)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index ff4d00b35978..3591a9478486 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,23 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX 0.10-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc8c2a SHA1 30925abc3d463d5d5cf176945def321684fc7645 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227
AUX 0.10.1-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc8c2a SHA1 30925abc3d463d5d5cf176945def321684fc7645 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227
AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b
DIST notmuch-0.10.1.tar.gz 408501 RMD160 51ae631d6d0cd9b2d9494b5d58192358848e9701 SHA1 0939709a2e60c59656b8e0761ae8bcb38bba2a06 SHA256 687d690fc9e6896bcad16fdc7e6d0173108bc6218c11bfcde846d3d7d4bbcc5a
-DIST notmuch-0.10.tar.gz 408308 RMD160 c0f6cf77808a2b16716aed159083667c2a55b7c0 SHA1 6dc3d84da53cb16818d06e1825022f3b23e473d5 SHA256 eab0210d92bddc5d9b96c4b2bcc661d300e5c6f55ab5b1882b926d6266530aa6
EBUILD notmuch-0.10.1.ebuild 3355 RMD160 c5d7df17a3735fe983130183b4f5f5777cfeae3b SHA1 cb1886b55936a01a3e25e8c7beed24b1b7ced83d SHA256 2366d25675ff54503eb9d115eb0fab81f0d3459fda0bffde6bba63606f1f1841
-EBUILD notmuch-0.10.ebuild 3352 RMD160 1c359fafb13168e52d76b3ddff61de6ee93d6dde SHA1 03a5ece43a135251ec5d0a3e7a81129cc3443ff5 SHA256 1c4912a725b58a069be32f92bc27a447098d7bc8c1e46e38529a638a4bea1b57
-MISC ChangeLog 4126 RMD160 0faad86ec069e5e77a372772f06ca03ac8e70bd0 SHA1 1363e40776bb34a49f4b776bfe59fa7ae160d96f SHA256 b29af9e25df1f451c542945f47220a1c33756dee17af193e62d0e307590a81d1
+MISC ChangeLog 4272 RMD160 0300bba2539942c5fe325e45ccefd2762777781f SHA1 be9e76a1f2d5df9e4193769d2e1f3f5987ff4b21 SHA256 baed58e7b11f5d235b19ee1cba8067286219f72a950fb5e110d662feb8799d46
MISC metadata.xml 870 RMD160 1ea6d669111c3e30f719c2337bb1fbebe7ab14aa SHA1 49ddae312621716998b7fe205f93536b2c2d20b4 SHA256 37955cc892c0585089e4dfb7ea2a8d1cb819164c4d098ba1be7253929be9890f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJO2I6jAAoJEPATRTHh2/q1/3wIAKU7bR/GI1SBCGmokejMKN5e
-SoDfJMSWUgruh09oZr5a6s0vYokwESIVTDF12PcUWDln4FuK0zmWLvioYxPH6T4+
-4jIj4zuyN4jdGtZLwugCbLYyY2tLcDdX3XNaRbQVG6YLJWwUsFhhqCvSW8Q7g1co
-fwohixBR9c269UT+eBDGJYNWXzTOgStbLVTcR19GlJYI+S4f6R0XLgi1UZ0zTwGT
-uvFg2zsQhPyHDbUEjRlZVMA6o5bhpMuHaUtr5Zrt27YRAe+PgbKOVVfyBUYGWO7P
-16gG48viaWGy7wcBLnHi3VDmPx73kzaxJhv23BySrF6NnB38fTl3k/kU2B920Fg=
-=GJUl
+iQEcBAEBAgAGBQJO2I8eAAoJEPATRTHh2/q1aXoH/30wLDH85m0R9lg6rZCWR5YE
+UpYLyOGGd80uoR+zub22bwNOKxxGu/a2KPMtYwDSAE8BJgPODZ0gTAdvXaaJsQtR
+VQfsbT2XusT5UMs8IbCu1OcFKcCw/ZMGGLljTMaizEnYCBDX5UopSUh601cD2Wce
+XtGAkpv0iIM/Vpn8eYPjxWfALM6e0xF90iUR0HJjX082UFti7oaBL6uMQHpGfKmb
+Fb7lku5Mrkk5iVJSN/FlpitCcejgCjXd5R46TQVBLybqIml1w+UWQhYiVwOj9LeY
+vBFFD5Ki+dt8BEbuEAYgoiP7NKhrmRR0SBZ7ddwx6k5QBxhvZTJ08ivIWnAdbJs=
+=XUFd
-----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/files/0.10-fix-test-build.patch b/net-mail/notmuch/files/0.10-fix-test-build.patch
deleted file mode 100644
index 7b326fb85c61..000000000000
--- a/net-mail/notmuch/files/0.10-fix-test-build.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From dc1fae07d2896d9eace61989b7c25d9434ee7f3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Nov 2011 10:08:47 +0100
-Subject: [PATCH] Build symbol-test with make instead of hardcoding in
- symbol-hiding.
-
-If symbol-test is built in symbol-hiding with hardcoded g++ invokation, it's
-not so easy to pass $(srcdir) which is required to find notmuch.h when srcdir
-and builddir are separate directories.
-
-Fixed warnings in symbol-test.cc, btw.
----
- test/.gitignore | 1 +
- test/Makefile.local | 5 ++++-
- test/basic | 2 +-
- test/symbol-hiding | 3 +--
- test/symbol-test.cc | 9 ++++-----
- 5 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/test/.gitignore b/test/.gitignore
-index 9e97052..7e30e8d 100644
---- a/test/.gitignore
-+++ b/test/.gitignore
-@@ -1,4 +1,5 @@
- test-results
- corpus.mail
- smtp-dummy
-+symbol-test
- tmp.*
-diff --git a/test/Makefile.local b/test/Makefile.local
-index 8eb0433..a672fd3 100644
---- a/test/Makefile.local
-+++ b/test/Makefile.local
-@@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
- $(dir)/smtp-dummy: $(smtp_dummy_modules)
- $(call quiet,CC) $^ -o $@
-
-+$(dir)/symbol-test: $(dir)/symbol-test.o
-+ $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
-+
- .PHONY: test check
--test: all $(dir)/smtp-dummy
-+test: all $(dir)/smtp-dummy $(dir)/symbol-test
- @${dir}/notmuch-test $(OPTIONS)
-
- check: test
-diff --git a/test/basic b/test/basic
-index 38db2ba..5463bf8 100755
---- a/test/basic
-+++ b/test/basic
-@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
- available=$(ls -1 $TEST_DIRECTORY/ | \
- sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
- -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
-- -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
-+ -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \
- -e "/^(test.expected-output|.*~)/d" \
- -e "/^(gnupg-secret-key.asc)/d" \
- -e "/^(gnupg-secret-key.NOTE)/d" \
-diff --git a/test/symbol-hiding b/test/symbol-hiding
-index d0b31ae..f67b653 100755
---- a/test/symbol-hiding
-+++ b/test/symbol-hiding
-@@ -12,13 +12,12 @@ test_description='exception symbol hiding'
- . ./test-lib.sh
-
- run_test(){
-- result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1)
-+ result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)
- }
-
- output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
- caught No chert database found at path \`./nonexistant'"
-
--g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian
- mkdir -p fakedb/.notmuch
- test_expect_success 'running test' run_test
- test_begin_subtest 'checking output'
-diff --git a/test/symbol-test.cc b/test/symbol-test.cc
-index 1de06ea..bfbe38f 100644
---- a/test/symbol-test.cc
-+++ b/test/symbol-test.cc
-@@ -1,14 +1,13 @@
- #include <stdio.h>
- #include <xapian.h>
- #include <notmuch.h>
--main (int argc, char **argv){
-+int main (){
-
-- notmuch_database_t *notmuch
-- = notmuch_database_open ("fakedb",
-- NOTMUCH_DATABASE_MODE_READ_ONLY);
-+ //notmuch_database_t *notmuch =
-+ notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY);
-
- try{
-- (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
-+ (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
- } catch (const Xapian::Error &error) {
- printf("caught %s\n",error.get_msg().c_str());
- return 0;
---
-1.7.8.rc3
-
diff --git a/net-mail/notmuch/notmuch-0.10.ebuild b/net-mail/notmuch/notmuch-0.10.ebuild
deleted file mode 100644
index f1be8c8f5b62..000000000000
--- a/net-mail/notmuch/notmuch-0.10.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.ebuild,v 1.2 2011/11/25 10:38:06 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-RUBY="/usr/bin/ruby18"
-RDOC="/usr/bin/rdoc18"
-
-inherit elisp-common distutils
-inherit autotools-utils
-
-DESCRIPTION="The mail indexer"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="test? ( crypt emacs )"
-IUSE="bash-completion crypt debug doc emacs python ruby test vim zsh-completion"
-
-CDEPEND="
- >=dev-libs/glib-2.14
- dev-libs/gmime:2.4
- dev-libs/xapian
- doc? ( python? ( dev-python/sphinx ) )
- sys-libs/talloc
- debug? ( dev-util/valgrind )
- emacs? ( >=virtual/emacs-23 )
- ruby? ( dev-lang/ruby:1.8 )
- x86? ( >=dev-libs/xapian-1.2.7-r2 )
- vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) )
- "
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- test? ( app-misc/dtach sys-devel/gdb )
- "
-RDEPEND="${CDEPEND}
- crypt? ( app-crypt/gnupg )
- zsh-completion? ( app-shells/zsh )
- "
-
-PATCHES=( "${FILESDIR}"/0.10-fix-test-build.patch )
-DOCS=( AUTHORS NEWS README TODO )
-SITEFILE="50${PN}-gentoo.el"
-
-bindings() {
- if use $1; then
- pushd bindings/$1 || die
- shift
- $@
- popd || die
- fi
-}
-
-pkg_setup() {
- if use emacs; then
- elisp-need-emacs 23 || die "Emacs version too low"
- fi
- use python && python_pkg_setup
-}
-
-src_prepare() {
- autotools-utils_src_prepare
- bindings python distutils_src_prepare
-
- r_fix() {
- local pattern="\(find_library('notmuch', '[^']*', '\)\([^']*\)\(')\)"
- local replace="\1${WORKDIR}/${PF}_build/lib\3"
-
- sed -i "s|$pattern|$replace|" extconf.rb || die
- }
- bindings ruby r_fix
-}
-
-src_configure() {
- local myeconfargs=(
- --bashcompletiondir="${ROOT}/usr/share/bash-completion"
- --emacslispdir="${ROOT}/${SITELISP}/${PN}"
- --emacsetcdir="${ROOT}/${SITEETC}/${PN}"
- --zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
- $(use_with bash-completion)
- $(use_with emacs)
- $(use_with zsh-completion)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- bindings python distutils_src_compile
-
- r_make() {
- ${RUBY} extconf.rb || die
- emake
- }
- bindings ruby r_make
-
- if use doc; then
- pydocs() {
- pushd docs || die
- emake html
- mv html ../python || die
- popd || die
- }
-
- rdocs() {
- ${RDOC} --main 'Notmuch' --title 'Notmuch Ruby API' --op ruby *.c
- }
-
- LD_LIBRARY_PATH="${WORKDIR}/${PF}_build/lib" bindings python pydocs
- bindings ruby rdocs
- fi
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- fi
-
- if use vim; then
- insinto /usr/share/vim/vimfiles
- doins -r vim/plugin vim/syntax
- fi
-
- DOCS="" bindings python distutils_src_install
- bindings ruby emake DESTDIR="'${D}'" install
-
- if use doc; then
- bindings python dohtml -r python
- bindings ruby dohtml -r ruby
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use python && distutils_pkg_postinst
-
- if use python; then
- echo
- elog "Python API documentation is also available online at:"
- elog " http://packages.python.org/notmuch/"
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use python && distutils_pkg_postrm
-}