diff options
author | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2011-11-25 10:40:24 +0000 |
---|---|---|
committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2011-11-25 10:40:24 +0000 |
commit | 28358f60333585e801ca8a6cbb821aefa926221c (patch) | |
tree | 4edebe4b6099c9f1f48c26aec91bf375968ee890 /net-mail/notmuch/files | |
parent | net-mail/notmuch-0.10: Fixed out of tree build of test-suites. (diff) | |
download | gentoo-2-28358f60333585e801ca8a6cbb821aefa926221c.tar.gz gentoo-2-28358f60333585e801ca8a6cbb821aefa926221c.tar.bz2 gentoo-2-28358f60333585e801ca8a6cbb821aefa926221c.zip |
net-mail/notmuch: Removed old versions: 0.9.
(Portage version: 2.1.10.37/cvs/Linux x86_64)
Diffstat (limited to 'net-mail/notmuch/files')
-rw-r--r-- | net-mail/notmuch/files/0.9-emacsetcdir.patch | 75 | ||||
-rw-r--r-- | net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch | 52 |
2 files changed, 0 insertions, 127 deletions
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?= <aidecoe@aidecoe.name> -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?= <aidecoe@aidecoe.name> -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 - |