diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-11-24 14:40:58 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-11-24 14:40:58 +0000 |
commit | 6148c16c82ec4cc4265f1ae839691d58babd86f3 (patch) | |
tree | b9524e45642e9993081e687ec9acb89afb81eed8 /net-mail/notmuch | |
parent | Patch against underlinking when using gold, #369959 (diff) | |
download | historical-6148c16c82ec4cc4265f1ae839691d58babd86f3.tar.gz historical-6148c16c82ec4cc4265f1ae839691d58babd86f3.tar.bz2 historical-6148c16c82ec4cc4265f1ae839691d58babd86f3.zip |
net-mail/notmuch-0.9-r2: Build time fixes: ruby bindings, python docs and tests
Added app-misc/dtach which is required in testing phase. Sphinx (doc builder)
couldn't find libnotmuch - fixed by defining LD_LIBRARY_PATH. libnotmuch.so
couldn't be found when building ruby bindings - fixed by altering extconf.rb.
Package-Manager: portage-2.1.10.37/cvs/Linux x86_64
Diffstat (limited to 'net-mail/notmuch')
-rw-r--r-- | net-mail/notmuch/ChangeLog | 7 | ||||
-rw-r--r-- | net-mail/notmuch/Manifest | 18 | ||||
-rw-r--r-- | net-mail/notmuch/notmuch-0.9-r2.ebuild | 27 |
3 files changed, 33 insertions, 19 deletions
diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog index e3b8615f237f..8f11d11e4132 100644 --- a/net-mail/notmuch/ChangeLog +++ b/net-mail/notmuch/ChangeLog @@ -1,6 +1,11 @@ # 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.12 2011/11/07 15:25:25 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.13 2011/11/24 14:40:58 aidecoe Exp $ + + 24 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.9-r2.ebuild: + Added app-misc/dtach which is required in test phase. Sphinx (doc builder) + couldn't find libnotmuch - fixed by defining LD_LIBRARY_PATH. libnotmuch.so + couldn't be found when building ruby bindings - fixed by altering extconf.rb. 07 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.9-r2.ebuild: Removed some debug echo. diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index a29eb3582946..b83a300b50c4 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -5,17 +5,17 @@ AUX 0.9-emacsetcdir.patch 2758 RMD160 68932d9daddc174c073e641fdfca0ea42ecd91e9 S AUX 0.9-fix-lib-makefile-local.patch 1897 RMD160 b7e1092958b3d0cee7f150eae7bd3541fb103bf5 SHA1 d0bc5aa910d468074bf83bfd5f6d1031603713ad SHA256 15bde8ab8ae75f4fd7b40e56d723373719dfe5511b7ea6113e87d9a8804f80d0 AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b DIST notmuch-0.9.tar.gz 398868 RMD160 b956ceb629943bfa65c1c6fab6b10dc78639588b SHA1 988e93545880e9465380383f00d591d8a23c61dd SHA256 e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4 -EBUILD notmuch-0.9-r2.ebuild 3146 RMD160 3229a30f2c2a34c62d360ac5b397f183b3a968ed SHA1 3327c235d552f6c647b51c95acfa58f268a71c84 SHA256 02b47f1db2cc1808d32c1c38e1dd30d5bd826bb63686be25a025d18b738c0be4 -MISC ChangeLog 2924 RMD160 7b257410581bd8e4afee0f83e71cd185ba0a4357 SHA1 fbf422721ea536f0d2fec965fc93402feb698cca SHA256 c09a74feafe170f49e9e4e45d456b9ee6013e168320182f9d4e8608a66bce9c1 +EBUILD notmuch-0.9-r2.ebuild 3433 RMD160 987756ceca027cab2d2d10b3a3be3d64bfb0c5d4 SHA1 2f53172cee8288895387aafcc05af62d9b77b359 SHA256 00748abffb4ff5718427671a4f2dceace62418a248e4fd4929c3db4df4ce9f9b +MISC ChangeLog 3240 RMD160 651b4b8d85c106f289873a4682143e71617b7e2f SHA1 5a4808a6da67605e8422c3333027aa24e382641c SHA256 a4c661d0168305789a2e36f3e807faacc60545a9ea997ed3faa910ee7a52bcdf MISC metadata.xml 870 RMD160 1ea6d669111c3e30f719c2337bb1fbebe7ab14aa SHA1 49ddae312621716998b7fe205f93536b2c2d20b4 SHA256 37955cc892c0585089e4dfb7ea2a8d1cb819164c4d098ba1be7253929be9890f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOt/hqAAoJEPATRTHh2/q14awH/1q26NWavRM/xnBJUOLkVPDu -3J9XfIc68mlZjOwC39QNg+Wt0gzaJVuyseTZme/twbYtDFGO0al48edvqXlKSBQv -St5Mg7tDGu4XN0x9Ky8MNKtN7Wgy+QcysVx1FTsYExroIN9bcBWWxIpaeHqnsc38 -evhnUaxtxYepcoOZKQJ3JOG7p0KMeoyMCpJTLTpZwqTx0iieehZRKoWNU6haCmhK -lU6NYnKutOEnTP+6OIgq0LSWesKtWA5PzJyCKbhloNGKCwF2D4KTlcnc05cwUXSu -Fpb1Tr6iQzo5gI8vMcZoY8tiC3WeG8St78ulnw7LMemWP1IXdFo/WiTzCNLAEBU= -=0EmO +iQEcBAEBAgAGBQJOzleBAAoJEPATRTHh2/q16IgH/ijOJPUK25SoN6Zps+D7MlxW +DPIvSoE5O4f/IFvZRo9+Fl4tj/d2580rkKCKJfLNfJ7uArNMjUjxTWvA8uGVarbG +LCinPtJtWeygRL/YkshdDtWEma9h4CVzn+3q6SeRSQQFqWihaHSLZw3MQkyfKiSn +Ik3m9rgXRxYRZluvw/bm4+ae/usVAkHPgYD1a7y9Qp+xRmAl51qDU24Kr8cVrsM/ +izv9gDZtsA0FW/+ex0af0W0Rh2KSKfnggXpRu6j7HP+VqtsfdXXonhlhZspBSFRx +ciqY4wGazQ3alVgS/7kNL1vlgKXmzdnj9oEhrYLBu3eDr+bPKEsJICa+mXitkuo= +=Ia4r -----END PGP SIGNATURE----- diff --git a/net-mail/notmuch/notmuch-0.9-r2.ebuild b/net-mail/notmuch/notmuch-0.9-r2.ebuild index aa7982967971..7f20cdfa90f5 100644 --- a/net-mail/notmuch/notmuch-0.9-r2.ebuild +++ b/net-mail/notmuch/notmuch-0.9-r2.ebuild @@ -1,6 +1,6 @@ # 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.9-r2.ebuild,v 1.3 2011/11/07 15:25:25 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.9-r2.ebuild,v 1.4 2011/11/24 14:40:58 aidecoe Exp $ EAPI=4 @@ -37,7 +37,7 @@ CDEPEND=" " DEPEND="${CDEPEND} dev-util/pkgconfig - test? ( sys-devel/gdb ) + test? ( app-misc/dtach sys-devel/gdb ) " RDEPEND="${CDEPEND} crypt? ( app-crypt/gnupg ) @@ -70,6 +70,15 @@ pkg_setup() { src_prepare() { autotools-utils_src_prepare bindings python distutils_src_prepare + + r_fix() { + local pattern="\(find_library('notmuch', 'notmuch_database_create', '\)" + pattern+="\([^']*\)\(')\)" + local replace="\1${WORKDIR}/${PF}_build/lib\3" + + sed -i "s|$pattern|$replace|" extconf.rb || die + } + bindings ruby r_fix } src_configure() { @@ -83,17 +92,17 @@ src_configure() { $(use_with zsh-completion) ) autotools-utils_src_configure - - r_conf() { - ${RUBY} extconf.rb || die - } - bindings ruby r_conf } src_compile() { autotools-utils_src_compile bindings python distutils_src_compile - bindings ruby emake + + r_make() { + ${RUBY} extconf.rb || die + emake + } + bindings ruby r_make if use doc; then pydocs() { @@ -107,7 +116,7 @@ src_compile() { ${RDOC} --main 'Notmuch' --title 'Notmuch Ruby API' --op ruby *.c } - bindings python pydocs + LD_LIBRARY_PATH="${WORKDIR}/${PF}_build/lib" bindings python pydocs bindings ruby rdocs fi } |