From a499b009b662983f1c5b9bb6cd9524b8b5b39f94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Fri, 25 Nov 2011 10:40:24 +0000 Subject: [PATCH] net-mail/notmuch: Removed old versions: 0.9. Package-Manager: portage-2.1.10.37/cvs/Linux x86_64 --- net-mail/notmuch/ChangeLog | 7 +- net-mail/notmuch/Manifest | 20 +-- net-mail/notmuch/files/0.9-emacsetcdir.patch | 75 --------- .../files/0.9-fix-lib-makefile-local.patch | 52 ------ net-mail/notmuch/notmuch-0.9-r2.ebuild | 159 ------------------ 5 files changed, 14 insertions(+), 299 deletions(-) delete mode 100644 net-mail/notmuch/files/0.9-emacsetcdir.patch delete mode 100644 net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch delete mode 100644 net-mail/notmuch/notmuch-0.9-r2.ebuild diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog index 5b5c4c911a3c..90affc7dfce9 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.15 2011/11/25 10:38:06 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.16 2011/11/25 10:40:23 aidecoe Exp $ + + 25 Nov 2011; Amadeusz Żołnowski + -files/0.9-emacsetcdir.patch, -files/0.9-fix-lib-makefile-local.patch, + -notmuch-0.9-r2.ebuild: + Removed old versions: 0.9. 25 Nov 2011; Amadeusz Żołnowski +files/0.10-fix-test-build.patch, notmuch-0.10.ebuild: diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index 0cc7136e87f2..e29ef758eca8 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -2,23 +2,19 @@ Hash: SHA1 AUX 0.10-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc8c2a SHA1 30925abc3d463d5d5cf176945def321684fc7645 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227 -AUX 0.9-emacsetcdir.patch 2758 RMD160 68932d9daddc174c073e641fdfca0ea42ecd91e9 SHA1 5070e32a2d3de1869e97b1ec584c1dce7df0f2ea SHA256 93e8822169eaa4f5c95ce462324c9065c64ab20672f3880ad9e9e8d6c2b80762 -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.10.tar.gz 408308 RMD160 c0f6cf77808a2b16716aed159083667c2a55b7c0 SHA1 6dc3d84da53cb16818d06e1825022f3b23e473d5 SHA256 eab0210d92bddc5d9b96c4b2bcc661d300e5c6f55ab5b1882b926d6266530aa6 -DIST notmuch-0.9.tar.gz 398868 RMD160 b956ceb629943bfa65c1c6fab6b10dc78639588b SHA1 988e93545880e9465380383f00d591d8a23c61dd SHA256 e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4 EBUILD notmuch-0.10.ebuild 3352 RMD160 1c359fafb13168e52d76b3ddff61de6ee93d6dde SHA1 03a5ece43a135251ec5d0a3e7a81129cc3443ff5 SHA256 1c4912a725b58a069be32f92bc27a447098d7bc8c1e46e38529a638a4bea1b57 -EBUILD notmuch-0.9-r2.ebuild 3433 RMD160 987756ceca027cab2d2d10b3a3be3d64bfb0c5d4 SHA1 2f53172cee8288895387aafcc05af62d9b77b359 SHA256 00748abffb4ff5718427671a4f2dceace62418a248e4fd4929c3db4df4ce9f9b -MISC ChangeLog 3613 RMD160 7c49df35a783db9ef8458d88a92ffd84595532ca SHA1 3bbccd3b2b203bba4827d587543efe073da55222 SHA256 75943afc40d77d30100aa69bb7507bcc515e96a04d14cd747ddb498b317fb9d5 +MISC ChangeLog 3799 RMD160 39883a6705e6f5b8822841469f2097b8f6821289 SHA1 f88acf454202f427016bf6909929f1c03d2d2ec7 SHA256 4e86db5805d050be90d0ce6833ec79e112014a313f6fe5d9dea68ae33dfb444d MISC metadata.xml 870 RMD160 1ea6d669111c3e30f719c2337bb1fbebe7ab14aa SHA1 49ddae312621716998b7fe205f93536b2c2d20b4 SHA256 37955cc892c0585089e4dfb7ea2a8d1cb819164c4d098ba1be7253929be9890f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOz3AUAAoJEPATRTHh2/q1gLsH/1W1Gt2cXXslz9SGKyl1pWaC -6ZiaYxFivmnJxD1dO8/e1oKAgplikqtHCx8N8qNtzi7maoKHI4/7zsbvsafK502k -nOHQpRmGGx9349IztQAMV0ETLeDWBZcclOGsMh3suMziViz4qQEi7eotEqp5wB8h -R7m4Hzl+yVusyc1ieLe2t/ryqFIsP1IkrK++TQAG3UhFnHGGfBJiEtYcZVF1zZq5 -ov6JB/wjpNM1tgA1vXtnRcvF71GRiQHLIr/JA6tGEcGqOY1fV5yO9zkRIfbLQnQr -XS4JEmIWJZJV3tBP8ud0KFveJ+HYCimigrehBTWlG2VuMWeJOJHpHg1WOVLuVKA= -=u5F3 +iQEcBAEBAgAGBQJOz3CdAAoJEPATRTHh2/q1wXoH/igX06S3pahkhGpDx/5KufpP +eiRamDUtgCMtpst0Ooi3HdO1QWKMLwY+Nd6n2dYIbq8mPRY8pGOHqaj38ME/SGyC +z8N9lnPDlYt3vYy9n0qpZ5YDLsyMoQgBFXfrqoFTBQj5ZB2f4YQOMiZzb/qqDNDI +UY00NdMzGRS3j1EdAoIVuziQa0LUlLELM+5/izeaTmQQLCXUW32jmAmSLgqUPgw/ +CT7XG6h6t/QgbGN0c0/k0RUejG2qwmgKZNxT9hFDM2c5Cdls1V5sA/Rnfo2mzNkl +7F15soHLJP3mmENg16esuJU41FOFFCK6nw6BXmiKTuhfEr61Nide+GOCrJHkuUs= +=y73N -----END PGP SIGNATURE----- diff --git a/net-mail/notmuch/files/0.9-emacsetcdir.patch b/net-mail/notmuch/files/0.9-emacsetcdir.patch deleted file mode 100644 index 97e28feedb18..000000000000 --- a/net-mail/notmuch/files/0.9-emacsetcdir.patch +++ /dev/null @@ -1,75 +0,0 @@ -From e6d85fb97d86e103c2c62cd215f54a3fe37856d0 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Tue, 25 Oct 2011 10:07:02 +0200 -Subject: [PATCH 1/1] Separate Emacs misc. files dir. from Emacs code dir. - -New option --emacsetcdir was added, but it's set default to the same -value as --emacslispdir for backward compatibility. ---- - configure | 15 +++++++++++++++ - emacs/Makefile.local | 3 ++- - 2 files changed, 17 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 3999ce8..e90b76f 100755 ---- a/configure -+++ b/configure -@@ -97,6 +97,7 @@ Fine tuning of some installation directories is available: - --mandir=DIR Install man pages to DIR [PREFIX/share/man] - --sysconfdir=DIR Read-only single-machine data [PREFIX/etc] - --emacslispdir=DIR Emacs code [PREFIX/share/emacs/site-lisp] -+ --emacsetcdir=DIR Emacs miscellaneous files [PREFIX/share/emacs/site-lisp] - --bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d] - --zshcompletiondir=DIR Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix] - -@@ -139,6 +140,8 @@ for option; do - SYSCONFDIR="${option#*=}" - elif [ "${option%%=*}" = '--emacslispdir' ] ; then - EMACSLISPDIR="${option#*=}" -+ elif [ "${option%%=*}" = '--emacsetcdir' ] ; then -+ EMACSETCDIR="${option#*=}" - elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then - BASHCOMPLETIONDIR="${option#*=}" - elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then -@@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then - fi - fi - -+if [ -z "${EMACSETCDIR}" ]; then -+ if pkg-config --exists emacs; then -+ EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir) -+ else -+ EMACSETCDIR='$(prefix)/share/emacs/site-lisp' -+ fi -+fi -+ - printf "Checking if emacs is available... " - if emacs --quick --batch > /dev/null 2>&1; then - printf "Yes.\n" -@@ -614,6 +625,10 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} - # The directory to which emacs lisp files should be installed - emacslispdir=${EMACSLISPDIR} - -+# The directory to which emacs miscellaneous (machine-independent) files should -+# be installed -+emacsetcdir=${EMACSETCDIR} -+ - # Whether there's an emacs binary available for byte-compiling - HAVE_EMACS = ${have_emacs} - -diff --git a/emacs/Makefile.local b/emacs/Makefile.local -index ce0c3f0..0c58b82 100644 ---- a/emacs/Makefile.local -+++ b/emacs/Makefile.local -@@ -38,6 +38,7 @@ install-emacs: - ifeq ($(HAVE_EMACS),1) - install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)" - endif -- install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)" -+ mkdir -p "$(DESTDIR)$(emacsetcdir)" -+ install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" - - CLEAN := $(CLEAN) $(emacs_bytecode) --- -1.7.0.4 - diff --git a/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch b/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch deleted file mode 100644 index 0e61665ab6f5..000000000000 --- a/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8d282adf53148469c3d6a9d41346919aa70028af Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sun, 23 Oct 2011 16:44:01 +0200 -Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with $(srcdir) - -lib/notmuch.h and lib/gen-version-script.sh couldn't have been found -when building out of sources directory. ---- - lib/Makefile.local | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/lib/Makefile.local b/lib/Makefile.local -index ea20b2b..be51eaa 100644 ---- a/lib/Makefile.local -+++ b/lib/Makefile.local -@@ -41,6 +41,11 @@ endif - dir := lib - extra_cflags += -I$(srcdir)/$(dir) -fPIC - -+# The (often-reused) $dir works fine within targets/prerequisites, -+# but cannot be used reliably within commands, so copy its value to a -+# variable that is not reused. -+lib := $(dir) -+ - libnotmuch_c_srcs = \ - $(notmuch_compat_srcs) \ - $(dir)/filenames.c \ -@@ -68,8 +73,8 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) - $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ - --notmuch.sym: lib/notmuch.h $(libnotmuch_modules) -- sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@ -+notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) -+ sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ - - $(dir)/$(SONAME): $(dir)/$(LIBNAME) - ln -sf $(LIBNAME) $@ -@@ -79,10 +84,6 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) - - install: install-$(dir) - --# The (often-reused) $dir works fine within targets/prerequisites, --# but cannot be used reliably within commands, so copy its value to a --# variable that is not reused. --lib := $(dir) - install-$(dir): $(dir)/$(LIBNAME) - mkdir -p "$(DESTDIR)$(libdir)/" - install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/" --- -1.7.0.4 - diff --git a/net-mail/notmuch/notmuch-0.9-r2.ebuild b/net-mail/notmuch/notmuch-0.9-r2.ebuild deleted file mode 100644 index 7f20cdfa90f5..000000000000 --- a/net-mail/notmuch/notmuch-0.9-r2.ebuild +++ /dev/null @@ -1,159 +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.9-r2.ebuild,v 1.4 2011/11/24 14:40:58 aidecoe Exp $ - -EAPI=4 - -PYTHON_DEPEND="python? 2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 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 ) - " - -DOCS=( AUTHORS NEWS README TODO ) -PATCHES=( - "${FILESDIR}/${PV}-fix-lib-makefile-local.patch" - "${FILESDIR}/${PV}-emacsetcdir.patch" - ) -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', '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() { - 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 online available at:" - elog " http://packages.python.org/notmuch/" - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && distutils_pkg_postrm -} -- 2.26.2