summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-09-09 11:44:30 +0000
committerUlrich Müller <ulm@gentoo.org>2010-09-09 11:44:30 +0000
commit1dd3eabfd43481ac84e4dc586e3316e1f4f400e0 (patch)
tree2ebe494850031756e12dfaf34406c7a452f0bc6b /app-emacs/edb
parentFixed 402-oggzfbsd.patch (bug #336504). (diff)
downloadhistorical-1dd3eabfd43481ac84e4dc586e3316e1f4f400e0.tar.gz
historical-1dd3eabfd43481ac84e4dc586e3316e1f4f400e0.tar.bz2
historical-1dd3eabfd43481ac84e4dc586e3316e1f4f400e0.zip
Fix test failure caused by wrong load-path, bug 319385.
Package-Manager: portage-2.2_rc71/cvs/Linux x86_64
Diffstat (limited to 'app-emacs/edb')
-rw-r--r--app-emacs/edb/ChangeLog8
-rw-r--r--app-emacs/edb/Manifest13
-rw-r--r--app-emacs/edb/edb-1.31.ebuild9
-rw-r--r--app-emacs/edb/files/edb-1.31-skram-path.patch11
4 files changed, 29 insertions, 12 deletions
diff --git a/app-emacs/edb/ChangeLog b/app-emacs/edb/ChangeLog
index a0aa2ae3c9d2..6aeac86a1b51 100644
--- a/app-emacs/edb/ChangeLog
+++ b/app-emacs/edb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/edb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/edb/ChangeLog,v 1.11 2009/01/29 01:25:15 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/edb/ChangeLog,v 1.12 2010/09/09 11:44:30 ulm Exp $
+
+ 09 Sep 2010; Ulrich Mueller <ulm@gentoo.org> edb-1.31.ebuild,
+ +files/edb-1.31-skram-path.patch:
+ Fix test failure caused by wrong load-path, bug 319385.
29 Jan 2009; Christian Faulhammer <fauli@gentoo.org>
-files/edb-info-direntry.patch, -edb-1.29.ebuild:
diff --git a/app-emacs/edb/Manifest b/app-emacs/edb/Manifest
index 923f11ffeec1..59622181b0d4 100644
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX 52edb-gentoo.el 246 RMD160 4113c0956ff8e2d249ed43300108a756318f6ccc SHA1 39f7a0297c0f249b77428e748e5a028d3623c6e9 SHA256 6c1c78fb8ee79d619adce457684ebfd84fbbef57bd936a21c665a0b5eb002f1d
+AUX edb-1.31-skram-path.patch 396 RMD160 1368c24259584e589c71c56a66626cf844ccb777 SHA1 6c4a5ecaa03034d56b30f932f8a7c745e5573b77 SHA256 7385d083e4b7a8d6118e1934f95387186981c7f152080ca2655bb58f9b59a9c3
DIST edb-1.31.tar.gz 585728 RMD160 16843893163821d37901bdd73c897cf0303e0491 SHA1 e75263d786612803c39a7bf03e47b24bdef7148e SHA256 f97bc288af71c5011aa6c251ac0bbf458b30b926b1c1a1f12e2cb0470e0e4c38
-EBUILD edb-1.31.ebuild 883 RMD160 a5d27d0dcb47fe01d55f71d2ab7e2f1486372a25 SHA1 80d5cda998bcfb63fa7e432b96cb9661fab9f087 SHA256 84cc169912e980c8155ed33be137724632c591a21b7344838d8813b5e58a0e20
-MISC ChangeLog 1902 RMD160 d35fd53798500a1edcca5a91b1f4ed670dd34d00 SHA1 377582eb907df844dd717cf6dd4df86b00bec4cb SHA256 214712c77a32a006b50920eb9ee89b4f8016030b8597a3eb79b64ec2ea3a3401
+EBUILD edb-1.31.ebuild 884 RMD160 6f22ca81dacb7d75a043ef1c4c93dbc9d7849a1c SHA1 203b51846d15ecfac549ba70190e8d3edb944441 SHA256 7458cd69ffc6535b2117dd7cea598057ca0f1cf79a1c14f1591c845d371f81b6
+MISC ChangeLog 2059 RMD160 95cb3cd1cdac08733e8c60106b71550e648cfdf0 SHA1 9abdb53c4eb833bfc0abe0a3f6bd6b89ced76e93 SHA256 c1220ea46803a9b631252adc0afb41f6fd374b31f10689c07300b5b6c2d480f3
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkmBBZAACgkQNQqtfCuFneN21QCgjM85PNbXtvTEPOlZrneS4ovv
-8xIAnAp9nZNbuC8+L1n+3fKaF3/pmh/j
-=tvrL
+iEUEARECAAYFAkyIyOAACgkQOeoy/oIi7uw1DACeJGP33Aq7MLBUUa1/8TIH4oPE
+QUsAl1c2BskMLwS85xXl1GE7S+oNJXQ=
+=X2ms
-----END PGP SIGNATURE-----
diff --git a/app-emacs/edb/edb-1.31.ebuild b/app-emacs/edb/edb-1.31.ebuild
index dd24eff8c238..4852848e4674 100644
--- a/app-emacs/edb/edb-1.31.ebuild
+++ b/app-emacs/edb/edb-1.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/edb/edb-1.31.ebuild,v 1.1 2008/05/29 16:24:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/edb/edb-1.31.ebuild,v 1.2 2010/09/09 11:44:30 ulm Exp $
inherit elisp eutils
@@ -13,11 +13,12 @@ SLOT="0"
KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
IUSE=""
+ELISP_PATCHES="${P}-skram-path.patch"
SITEFILE="52${PN}-gentoo.el"
src_compile() {
- econf || die "econf failed"
- emake -j1 || die "emake failed"
+ econf
+ emake -j1 || die
}
src_install() {
diff --git a/app-emacs/edb/files/edb-1.31-skram-path.patch b/app-emacs/edb/files/edb-1.31-skram-path.patch
new file mode 100644
index 000000000000..75921ca00160
--- /dev/null
+++ b/app-emacs/edb/files/edb-1.31-skram-path.patch
@@ -0,0 +1,11 @@
+--- edb-1.31-orig/skram/GNUmakefile.in
++++ edb-1.31/skram/GNUmakefile.in
+@@ -48,7 +48,7 @@
+ #
+ # Until that change is distributed, here is a workaround:
+ wily-emacs = $(ebatch) \
+- --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)"))' \
++ --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)/lisp"))' \
+ --eval '(require (quote database))'
+
+ sk2: skram.data