summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2003-06-12 14:35:05 +0000
committerAron Griffis <agriffis@gentoo.org>2003-06-12 14:35:05 +0000
commite8a274d049d91fedd4b1159684e05f05e90b3d29 (patch)
tree8f2251981f2d4a237bfe9312d8b5bac471514546
parentUSE flag snafu (diff)
downloadhistorical-e8a274d049d91fedd4b1159684e05f05e90b3d29.tar.gz
historical-e8a274d049d91fedd4b1159684e05f05e90b3d29.tar.bz2
historical-e8a274d049d91fedd4b1159684e05f05e90b3d29.zip
fix bug 20864
-rw-r--r--app-editors/elvis/ChangeLog6
-rw-r--r--app-editors/elvis/Manifest5
-rw-r--r--app-editors/elvis/elvis-2.1.4-r1.ebuild13
-rw-r--r--app-editors/elvis/files/elvis-2.1.4-keysym.patch11
4 files changed, 30 insertions, 5 deletions
diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 56aa0eff97e7..5e9e330fae6a 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/elvis
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.6 2003/02/12 03:46:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.7 2003/06/12 14:34:57 agriffis Exp $
+
+ 12 Jun 2003; Aron Griffis <agriffis@gentoo.org> elvis-2.1.4-r1.ebuild,
+ files/elvis-2.1.4-keysym.patch:
+ Add patch from FreeBSD port to fix bug 20864. Mark stable on alpha
*elvis-2.1.4-r1 (1 Feb 2002)
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 8c5830cca516..0697b5335968 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,5 +1,6 @@
-MD5 c8e8428d20d8c1f674c5ab7277749407 ChangeLog 922
-MD5 9773b9f0c9a6c64d18dc1be60edee1ea elvis-2.1.4-r1.ebuild 1276
+MD5 c60d556518aeb358137826275c3403ff ChangeLog 1102
+MD5 43c91582ec201c6f2d75caea3be80799 elvis-2.1.4-r1.ebuild 1484
MD5 649f4ea8aa265436f35ed0b569836e20 elvis-2.1.4.ebuild 1175
MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4 64
MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4-r1 64
+MD5 718daade31001ee4158c1fbf2c531845 files/elvis-2.1.4-keysym.patch 307
diff --git a/app-editors/elvis/elvis-2.1.4-r1.ebuild b/app-editors/elvis/elvis-2.1.4-r1.ebuild
index 0610963f3aea..866596d8c95b 100644
--- a/app-editors/elvis/elvis-2.1.4-r1.ebuild
+++ b/app-editors/elvis/elvis-2.1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.13 2003/02/13 06:39:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.14 2003/06/12 14:34:57 agriffis Exp $
IUSE="X"
@@ -12,13 +12,22 @@ HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
SLOT="0"
LICENSE="Artistic"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc alpha"
DEPEND=">=sys-libs/ncurses-5.2
X? ( virtual/x11 )"
PROVIDE="virtual/editor"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # Fix bug 20864 using patch from FreeBSD port.
+ # http://www.freshports.org/editors/elvis/
+ epatch ${FILESDIR}/elvis-2.1.4-keysym.patch || die "epatch failed"
+}
+
src_compile() {
local myconf
use X \
diff --git a/app-editors/elvis/files/elvis-2.1.4-keysym.patch b/app-editors/elvis/files/elvis-2.1.4-keysym.patch
new file mode 100644
index 000000000000..17382661485a
--- /dev/null
+++ b/app-editors/elvis/files/elvis-2.1.4-keysym.patch
@@ -0,0 +1,11 @@
+--- guix11/guix11.h.orig Wed Mar 12 22:40:16 2003
++++ guix11/guix11.h Wed Mar 12 22:40:25 2003
+@@ -12,7 +12,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #define XK_MISCELLANY
+-#include <X11/keysymdef.h>
++#include <X11/keysym.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>
+ #ifdef NEED_XOS_H