Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

net-mail/notmuch-9999: Synced with net-mail/notmuch-0.11.1-r2:gentoo

and allowed dev-libs/gmime:2.6 dependency.

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key E1DBFAB5)
  • Loading branch information...
commit 4fb1fb06452ab37a4e5e8cb8a941243bbbab3dee 1 parent db4620a
@aidecoe authored
View
4 net-mail/notmuch/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Mar 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-9999.ebuild:
+ Synced with net-mail/notmuch-0.11.1-r2:gentoo and allowed dev-libs/gmime:2.6
+ dependency.
+
21 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-9999.ebuild,
metadata.xml:
Added 'nmbug' USE flag.
View
18 net-mail/notmuch/Manifest
@@ -2,17 +2,17 @@
Hash: SHA1
AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b
-EBUILD notmuch-9999.ebuild 3238 RMD160 02898b3b01791a04c7cca155c34107c2a8186bc8 SHA1 fbbfd7a19e4f450ec30e4041a1380540f2241873 SHA256 6e70835080004ea7f181f404fe8dfb570f968deed1daee954bb911dc91fff361
-MISC ChangeLog 853 RMD160 46867c7719fa573960dfea1ec002fe53c914d4b8 SHA1 e82857e4307e05fa12f0a1315f3d8bd82749c04a SHA256 e3d364c222f02510b5c7a434f882503d38b3726d02833da50a2962bacd44ce72
+EBUILD notmuch-9999.ebuild 2681 RMD160 1ac3cb8df43c8e00a86119f701d3d79f64b933b2 SHA1 8030b1a123fdd5212de2b2741f7ee65cf2c4476d SHA256 de72e1ae46f93ce24f2ae723aef0c5a55e282e0988131eb6377bee38cce186f3
+MISC ChangeLog 1025 RMD160 d30a10d0e6a254d831158aadfbe4feb39e0e0b4e SHA1 21ab39e3cfc6ca772f5f7b6f526857a2d53d6b11 SHA256 ac1700391274e2097550525cbbee9d763d61a668d463575e64366cdae25f2673
MISC metadata.xml 1003 RMD160 12fa19220fd58eade62c7aafc6a3c2bf5adb6ca5 SHA1 8be789b19b3140dc24694d5c535a7d8a4e8c4b0a SHA256 48f0e1b14cf9bd31f53f6bb481570ec1f067308e067913edbcea50a986b875bc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJPQ/k9AAoJEPATRTHh2/q1FUoH/iwehtyvI0sUUrMCRuScECPJ
-17nzMGZXP1IZYzH1c0cbGFhdbCSmqLKLF7cD/ghADxPZWvUYrwCGNuCZY56MaYp0
-YMOnOqYE4FyrQ5b5X2OJL4Ml1oi8XVxa75RNTu91ZUITFdA9tjDkb7E2RtA+MyiC
-dfQJ8DNxJ18EkvA3PYvPm9crPZ6UZBpidaKfV0Bdet0khwCFaR6O6WvC77ZQI1a6
-lyMTGp24A7QlyOHCUwwp7ol2WYKRbM+fFCoDdVnD8zJ+2M2nUSpfdS2vL07+ZThi
-Gu8wsIsQAPQvZp/k6iBn10ZzMZ+b4kkV28tu01397S2oCMVk6BWGNjm6effdJTY=
-=iJHh
+iQEcBAEBAgAGBQJPUIzQAAoJEPATRTHh2/q1UnAH/3+EEUcmudgd928NhWnX+iIb
+JTk0y27V4Q0vp4J3Ro/KDFgQV5/9lNXhCWbrTwq8IfeKe9l3rc5MLl8kDPEqgmZa
+xO7YoQooWcGZ1L8RRDWCmZGvsVsym2G3vobFYAnl9felLPUXQeM/1ecKH9VvCrv9
+/WrjRZl23/RChs/hD6UmcqnFpcAKHQ57XHMY6hNr23YWXSO+9BZX4weOAm67I7bi
+A8RqAFCH/I+AtrwjB7y+L0bwbG4S5ApvEO4w4SjFXOwyOkIOHPlSdmpqSx4ViazF
+hGhUcPNtGn2keJ0S4Lo3n86+5rJ/ua06nDhqRUwoMVznp9iScbpMqv0WB1K3b9M=
+=UDBe
-----END PGP SIGNATURE-----
View
46 net-mail/notmuch/notmuch-9999.ebuild
@@ -7,8 +7,6 @@ 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 git-2
@@ -19,19 +17,18 @@ EGIT_REPO_URI="git://git.notmuchmail.org/git/notmuch"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-REQUIRED_USE="test? ( crypt emacs )"
-IUSE="bash-completion crypt debug doc emacs nmbug python ruby test vim
+REQUIRED_USE="test? ( crypt emacs python )"
+IUSE="bash-completion crypt debug doc emacs nmbug python test vim
zsh-completion"
CDEPEND="
- >=dev-libs/glib-2.14
- dev-libs/gmime:2.4
+ >=dev-libs/glib-2.22
+ || ( dev-libs/gmime:2.4 dev-libs/gmime:2.6 )
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 ) )
"
@@ -47,6 +44,7 @@ RDEPEND="${CDEPEND}
DOCS=( AUTHORS NEWS README )
SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
bindings() {
if use $1; then
@@ -67,14 +65,6 @@ pkg_setup() {
src_prepare() {
default
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() {
@@ -94,12 +84,6 @@ src_compile() {
default
bindings python distutils_src_compile
- r_make() {
- ${RUBY} extconf.rb || die
- emake
- }
- bindings ruby r_make
-
if use doc; then
pydocs() {
pushd docs || die
@@ -107,16 +91,14 @@ src_compile() {
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
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
fi
}
+src_test() {
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+}
+
src_install() {
default
@@ -134,23 +116,15 @@ src_install() {
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() {

0 comments on commit 4fb1fb0

Please sign in to comment.
Something went wrong with that request. Please try again.