version bump. adds x86_64 arm and powerpc_64 disassembly. Also compiles on gcc-4. bug #155313

Package-Manager: portage-2.1.2-r2

6 files changed, 290 insertions, 9 deletions

diff --git a/app-editors/hteditor/ChangeLog b/app-editors/hteditor/ChangeLog
index cee9d0287cb9..aad96a4995c5 100644
--- a/app-editors/hteditor/ChangeLog
+++ b/app-editors/hteditor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/hteditor
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.24 2006/10/29 08:50:30 dragonheart Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.25 2007/01/27 10:32:57 dragonheart Exp $
+
+*hteditor-2.0_beta2 (27 Jan 2007)
+
+  27 Jan 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/hteditor-2.0_beta2-optionallzo.patch,
+  +files/hteditor-2.0_beta2-regexneedstdlib.patch,
+  +hteditor-2.0_beta2.ebuild:
+  version bump. adds x86_64 arm and powerpc_64 disassembly. Also compiles on
+  gcc-4. bug #155313 thanks to katerina
 
 *hteditor-0.9.4 (29 Oct 2006)
 
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 73eaf168fd7a..4ce2e252c9e5 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -5,6 +5,14 @@ AUX hteditor-0.9.4-asneeded.patch 1367 RMD160 a2ac52a510a262847f8f7da93bf6291b4a
 MD5 5efe40552a2abbd635d74ba8f16bc9f0 files/hteditor-0.9.4-asneeded.patch 1367
 RMD160 a2ac52a510a262847f8f7da93bf6291b4a3e4f40 files/hteditor-0.9.4-asneeded.patch 1367
 SHA256 a957feef530297a05e9b7b724be4333b8e6037ae8713c2eab62b1e0cade34bb7 files/hteditor-0.9.4-asneeded.patch 1367
+AUX hteditor-2.0_beta2-optionallzo.patch 6041 RMD160 73b8df07cabf8549c995848ce15882561c23cc5f SHA1 2cf1c6c85782c4ff1ac2cd8cfb753fb660297beb SHA256 6e54cfd21f09f83693141a72b48e5d458e9836fdee1d57f2d8c16987c7134b90
+MD5 1c3879512b2ca5e9a9c6b873b2b38a89 files/hteditor-2.0_beta2-optionallzo.patch 6041
+RMD160 73b8df07cabf8549c995848ce15882561c23cc5f files/hteditor-2.0_beta2-optionallzo.patch 6041
+SHA256 6e54cfd21f09f83693141a72b48e5d458e9836fdee1d57f2d8c16987c7134b90 files/hteditor-2.0_beta2-optionallzo.patch 6041
+AUX hteditor-2.0_beta2-regexneedstdlib.patch 754 RMD160 7424d2f9379e121501ad63e226afd5220e6ad19b SHA1 29504c76b75cd28557ab3802957002f650af2f01 SHA256 d196f35aae6b7a2700a7d49f42f9570fedf361d8f9571de7c85da96a20a4e9a1
+MD5 eef74700249e5ca5e3eec7a764e4eca8 files/hteditor-2.0_beta2-regexneedstdlib.patch 754
+RMD160 7424d2f9379e121501ad63e226afd5220e6ad19b files/hteditor-2.0_beta2-regexneedstdlib.patch 754
+SHA256 d196f35aae6b7a2700a7d49f42f9570fedf361d8f9571de7c85da96a20a4e9a1 files/hteditor-2.0_beta2-regexneedstdlib.patch 754
 AUX hteditor-gcc41.patch 300 RMD160 c2b2737169141915b43b21b720b71a8ec4950e35 SHA1 0e20c3306bc92710eeaa47ccd611f66af8566a53 SHA256 4b7d8d1861d4695626f4919fdaca5f9e1bd37a3025c3becd2902ff4e41f4caa0
 MD5 c9f2bfe29da030ed0855dd5745855e41 files/hteditor-gcc41.patch 300
 RMD160 c2b2737169141915b43b21b720b71a8ec4950e35 files/hteditor-gcc41.patch 300
@@ -12,6 +20,7 @@ SHA256 4b7d8d1861d4695626f4919fdaca5f9e1bd37a3025c3becd2902ff4e41f4caa0 files/ht
 DIST ht-0.9.0.tar.bz2 765072 RMD160 63d7d2dfef96d231a6da1fdb86d35183bc7d8e3d SHA1 0a70c15936c2f4070cb3d173e3ff58041d7c6712 SHA256 52a174020c5b604b0e5ebee3d056ad1f6ed85480a51d4cd7c8b9b8de20af66bb
 DIST ht-0.9.1.tar.bz2 737690 RMD160 dd14227fe5c7d93f5db2965fcd61e832f2f1bbd9 SHA1 f77723739a929ad48ba5381fd6882d1d54a7cd55 SHA256 8b2aca19b1a81af9191df812d4b2c7f38492f24ea2725262d2e2f335d6e14b78
 DIST ht-0.9.4.tar.bz2 773249 RMD160 01670635667856bf28b3c72296d34a99ed10b141 SHA1 edf5058c9791716c812a55d6d277613ec6a5ce6f SHA256 dc594b08ec4f5997269d217875fc8a9bef43dc316151e45b949a3942ea6af9ec
+DIST ht-2.0beta2.tar.bz2 851033 RMD160 d6b9111c1a0db98e8f3600e8a07280aef6d10549 SHA1 20d96a94f6d74a5fbd13db5e06cdb0995fae2b6d SHA256 46945bec0a4d4e346e7237ff23393f2415d10eda2de49a9cdf52b43d8e39d379
 EBUILD hteditor-0.9.0.ebuild 939 RMD160 363821953256d3b0361f88fbd29c5e818470b93d SHA1 8e9e80e461fdff120fed0579faf31890a6a4be20 SHA256 610fd9b4b661fe9cdcc5898a88b4c05918c82bbe600cd9f3e95a9d178b49a2da
 MD5 2fb26c48d6e3f7c68d1ff1f9c74d9d74 hteditor-0.9.0.ebuild 939
 RMD160 363821953256d3b0361f88fbd29c5e818470b93d hteditor-0.9.0.ebuild 939
@@ -24,10 +33,14 @@ EBUILD hteditor-0.9.4.ebuild 966 RMD160 13dc5c7449d7e6071e6897e48185e0d875a85741
 MD5 bb45115e97552210683d595a9495d953 hteditor-0.9.4.ebuild 966
 RMD160 13dc5c7449d7e6071e6897e48185e0d875a85741 hteditor-0.9.4.ebuild 966
 SHA256 964238df55c8fcb612b5fe9e88abd9ee9c7b820f87d62912951fb4d474c3ccfc hteditor-0.9.4.ebuild 966
-MISC ChangeLog 3897 RMD160 b035805aff0a73f589ee55f6fba99b4c23db736c SHA1 d9864f2a727ca7f5cf202f2de869d9147511c69d SHA256 ef5d97e5c3204740c284c9dfe6ea733a56d1b554206a3f1c2b47cc2ee5967cfb
-MD5 d7636985a57ddffa9a3e325daaf2f0b6 ChangeLog 3897
-RMD160 b035805aff0a73f589ee55f6fba99b4c23db736c ChangeLog 3897
-SHA256 ef5d97e5c3204740c284c9dfe6ea733a56d1b554206a3f1c2b47cc2ee5967cfb ChangeLog 3897
+EBUILD hteditor-2.0_beta2.ebuild 1053 RMD160 616928b28c7021185323eca0ed3e1f4ae0d514f9 SHA1 885bc4394b7a9c57f09c5b4ed8e46b9b6698aef0 SHA256 20c98c86164a27efe522312d5b65ba942baed8dba1fea61d96854713cd49c1d7
+MD5 0f1283d05d4c8d7ec5f7af5f53cecd4c hteditor-2.0_beta2.ebuild 1053
+RMD160 616928b28c7021185323eca0ed3e1f4ae0d514f9 hteditor-2.0_beta2.ebuild 1053
+SHA256 20c98c86164a27efe522312d5b65ba942baed8dba1fea61d96854713cd49c1d7 hteditor-2.0_beta2.ebuild 1053
+MISC ChangeLog 4231 RMD160 a0dceb2206e382546a9ec70d25b64ccdce7537ed SHA1 ec2b27adb001f76cb06d2d38d19a7e175f3a9ffe SHA256 c6cffcca056ada736054da0c01910147861568d7a4c9f22087df7f65c47c9a23
+MD5 2c6709fae4167d6cc29eb6d5b1bd65fe ChangeLog 4231
+RMD160 a0dceb2206e382546a9ec70d25b64ccdce7537ed ChangeLog 4231
+SHA256 c6cffcca056ada736054da0c01910147861568d7a4c9f22087df7f65c47c9a23 ChangeLog 4231
 MISC metadata.xml 230 RMD160 df46c6fe6aecbf764587ac6f76f0bbb5ba9a62d7 SHA1 410310eb018b0f84121dab6c9520675be6985a5d SHA256 ce5541de8411e3693cbcbe7a9a68cf451206ab15240cedcbd49f6f67c24ef88b
 MD5 5e83aa40741c7ae458653fb9ed8b7805 metadata.xml 230
 RMD160 df46c6fe6aecbf764587ac6f76f0bbb5ba9a62d7 metadata.xml 230
@@ -41,10 +54,13 @@ SHA256 2b38df3097f67c9faf8cd96cff005a3ff8d8f5ec7336f1afff06e6263c6261a4 files/di
 MD5 0470cf04455a9baf0e0163f4b72be627 files/digest-hteditor-0.9.4 229
 RMD160 f08c433c7d60a770e66f75bbeeb15e6ff2bc0e15 files/digest-hteditor-0.9.4 229
 SHA256 0e1e4a9cb893b1c5dc9811c75d23513e99e2301c2fa3d2e9b1bd18768f6ccf94 files/digest-hteditor-0.9.4 229
+MD5 5a470a63ce26c084d65b7cdf55644e6d files/digest-hteditor-2.0_beta2 238
+RMD160 e7386e7172ce360cc31539ec944a81ae780e7129 files/digest-hteditor-2.0_beta2 238
+SHA256 c1aaf7f2b977f1ecdb58daba54e569fc56f92093d89872fe291fba045384c37d files/digest-hteditor-2.0_beta2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFRGyjmdTrptrqvGERApdGAJ9gL4b0eVVReAk3lGSP/NiaZWXo0wCbB4xx
-ycPSYTtNY09Fk0Bx9AmmQhk=
-=zGUC
+iD8DBQFFuyp5mdTrptrqvGERAqT1AJ9A2uaRiy2Jh4XLlbQfidPyX4BeeACgn639
+saJ7aPxib4uSUAkxErG4wzY=
+=R26r
 -----END PGP SIGNATURE-----
diff --git a/app-editors/hteditor/files/digest-hteditor-2.0_beta2 b/app-editors/hteditor/files/digest-hteditor-2.0_beta2
new file mode 100644
index 000000000000..82692d1122f7
--- /dev/null
+++ b/app-editors/hteditor/files/digest-hteditor-2.0_beta2
@@ -0,0 +1,3 @@
+MD5 54c5b419caf3b30d23c05f6e17160991 ht-2.0beta2.tar.bz2 851033
+RMD160 d6b9111c1a0db98e8f3600e8a07280aef6d10549 ht-2.0beta2.tar.bz2 851033
+SHA256 46945bec0a4d4e346e7237ff23393f2415d10eda2de49a9cdf52b43d8e39d379 ht-2.0beta2.tar.bz2 851033
diff --git a/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch b/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch
new file mode 100644
index 000000000000..0384d717181e
--- /dev/null
+++ b/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch
@@ -0,0 +1,185 @@
+diff -ru ht-2.0beta2.orig/config.h.in ht-2.0beta2/config.h.in
+--- ht-2.0beta2.orig/config.h.in	2006-11-24 02:08:37.000000000 +1100
++++ ht-2.0beta2/config.h.in	2007-01-27 17:42:22.000000000 +1100
+@@ -18,6 +18,12 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Define to 1 if you have the <lzo1x.h> header file. */
++#undef HAVE_LZO1X_H
++
++/* Define to 1 if you have the <lzo/lzo1x.h> header file. */
++#undef HAVE_LZO_LZO1X_H
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
+@@ -48,6 +54,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* Name of package */
++#undef PACKAGE
++
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+@@ -81,6 +90,12 @@
+ /* Location of io/$IO_DIR/types.h */
+ #undef SYSTEM_OSAPI_SPECIFIC_TYPES_HDR
+ 
++/* whether to use the included minilzo */
++#undef USE_MINILZO
++
++/* Version number of package */
++#undef VERSION
++
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+    `char[]'. */
+ #undef YYTEXT_POINTER
+diff -ru ht-2.0beta2.orig/cstream.cc ht-2.0beta2/cstream.cc
+--- ht-2.0beta2.orig/cstream.cc	2006-06-12 06:19:23.000000000 +1000
++++ ht-2.0beta2/cstream.cc	2007-01-27 17:42:22.000000000 +1100
+@@ -22,7 +22,13 @@
+ #include "htdebug.h"
+ #include "except.h"
+ #include "endianess.h"
+-#include "minilzo.h"
++# ifdef USE_MINILZO
++#  include "minilzo/minilzo.h"
++# elif HAVE_LZO_LZO1X_H
++#  include <lzo/lzo1x.h>
++# elif HAVE_LZO1X_H
++#  include <lzo1x.h>
++# endif
+ #include "tools.h"
+ 
+ #include <string.h>
+--- /tmp/ht-2.0beta2/Makefile.am	2006-11-03 00:00:56.000000000 +1100
++++ ht-2.0beta2/Makefile.am	2007-01-27 19:02:55.000000000 +1100
+@@ -9,17 +9,20 @@
+ IO_DIR		= io/@IO_DIR@
+ OUTPUT_DIR	= output
+ EVAL_DIR	= eval
+-MINILZO_DIR	= minilzo
+ #SRT_DIR		= srt
+-
+ EXTRA_DIST	= TODO ChangeLog README KNOWNBUGS INSTALL COPYING AUTHORS
+-SUBDIRS		= tools analyser asm doc info io output eval minilzo
++SUBDIRS		= tools analyser asm doc info io output eval
+ 
+-INCLUDES	= -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir)/$(MINILZO_DIR) -I$(srcdir)
++INCLUDES	= -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir)
+ 
+-ht_LDADD	= $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a @HT_LIBS@
++ht_LDADD	= $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a @HT_LIBS@ @LZO_LIBS@
+ ht_LDFLAGS	= @HT_LDFLAGS@
+ 
++if ENABLE_INCLUDED_LZO
++SUBDIRS += minilzo
++ht_LDADD += minilzo/liblzo.a
++endif
++
+ ht_SOURCES	= atom.cc atom.h except.cc except.h data.cc data.h \
+ str.cc str.h strtools.cc strtools.h endianess.h endianess.cc \
+ htdoc.c htdoc.h blockop.cc blockop.h coff_s.h \
+--- /tmp/ht-2.0beta2/configure.in	2006-11-24 02:07:40.000000000 +1100
++++ ht-2.0beta2/configure.in	2007-01-27 20:43:36.000000000 +1100
+@@ -1,22 +1,21 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(data.h)
+ 
+-PACKAGE=ht
+-VERSION=2.0beta2
++AC_INIT(ht,[2.0beta2],[https://sourceforge.net/tracker/?group_id=1066])
++AC_PREREQ(2.59)
+ 
+ dnl Check the system.
+ AC_CANONICAL_SYSTEM
+ 
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
+-
+ AC_ARG_ENABLE(x11-textmode, 
+ 	[  --enable-x11-textmode   build with x11 textmode support [default=yes]],,enable_x11_textmode="yes")
++AC_ARG_ENABLE(maintainermode,
++	[  --enable-maintainermode minimise autodetection for package mantainers [default=no]],,enable_maintainermode="no")
+ AC_ARG_ENABLE(release,
+ 	[  --enable-release        make a release build [default=yes]],,enable_release="yes")
+ AC_ARG_ENABLE(profiling,
+ 	[  --enable-profiling      make a profile build [default=no]],,enable_profiling="no")
+ 
++if test "x$enable_maintainermode" = "xno"; then
+ if test "x$enable_release" = "xyes"; then
+     FLAGS_ALL="-O2 -fomit-frame-pointer -Wall -fsigned-char"
+ else
+@@ -26,8 +25,9 @@
+ if test "x$enable_profiling" = "xyes"; then
+     FLAGS_ALL="$FLAGS_ALL -pg -g"
+ fi
++fi
+ 
+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION,no-define)
++AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ 
+ dnl Check OS specifica
+@@ -107,6 +107,7 @@
+ AC_PATH_PROGS(MAKE, gmake make, :)
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
++AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_YACC
+ AM_PROG_LEX
+@@ -119,6 +120,45 @@
+ 
+ dnl Checks for libraries.
+ 
++minilzo_enabled=no
++
++AC_ARG_WITH(included-lzo,
++	AS_HELP_STRING([--with-included-lzo],
++		[use included minilzo]),
++	minilzo_enabled=$withval,
++	minilzo_enabled=no)
++
++AC_MSG_CHECKING([whether to use the included lzo compression library])
++AC_MSG_RESULT($minilzo_enabled)
++
++LZO_LIBS=
++if test "$minilzo_enabled" != "yes"; then
++  AC_CHECK_LIB(lzo2, lzo1x_1_compress, LZO_LIBS=-llzo2)
++  if test "$LZO_LIBS" = ""; then
++    AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo, [
++      minilzo_enabled=yes
++      AC_MSG_WARN(
++***
++*** Could not find liblzo or liblzo2. Will use the included minilzo.
++)
++    ])
++  fi
++fi
++AC_SUBST(LZO_LIBS)
++
++if test "$LZO_LIBS" = "-llzo"; then
++  AC_CHECK_HEADERS(lzo1x.h)
++elif test "$LZO_LIBS" = "-llzo2"; then
++  AC_CHECK_HEADERS(lzo/lzo1x.h)
++fi
++
++if test "$minilzo_enabled" = "yes"; then
++  AC_DEFINE(USE_MINILZO, 1, [whether to use the included minilzo])
++fi
++
++AM_CONDITIONAL(USE_LZO, test "$use_lzo" = "yes")
++AM_CONDITIONAL(ENABLE_INCLUDED_LZO, test "$minilzo_enabled" = "yes")
++
+ HAVE_X11=0
+ 
+ if test "x$enable_x11_textmode" = "xyes"; then
+@@ -198,3 +238,4 @@
+ fi
+ echo "enable profiling:                 $enable_profiling" 1>&2
+ echo "make a release build:             $enable_release" 1>&2
++echo "using included minilzo:           $minilzo_enabled" 1>&2
diff --git a/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch b/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch
new file mode 100644
index 000000000000..67bae0087848
--- /dev/null
+++ b/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch
@@ -0,0 +1,24 @@
+--- /tmp/ht-2.0beta2/regex.c	2002-06-30 23:47:48.000000000 +1000
++++ ht-2.0beta2/regex.c	2007-01-27 21:08:15.000000000 +1100
+@@ -32,6 +32,7 @@
+ 
+ /* We need this for `regex.h', and perhaps for the Emacs include files.  */
+ #include <sys/types.h>
++#include <stdlib.h>
+ 
+ /* This is for other GNU distributions with internationalized messages.  */
+ #if HAVE_LIBINTL_H || defined (_LIBC)
+@@ -55,13 +56,6 @@
+    even if config.h says that we can.  */
+ #undef REL_ALLOC
+ 
+-#if defined (STDC_HEADERS) || defined (_LIBC)
+-#include <stdlib.h>
+-#else
+-char *malloc ();
+-char *realloc ();
+-#endif
+-
+ /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow.
+    If nothing else has been done, use the method below.  */
+ #ifdef INHIBIT_STRING_HEADER
diff --git a/app-editors/hteditor/hteditor-2.0_beta2.ebuild b/app-editors/hteditor/hteditor-2.0_beta2.ebuild
new file mode 100644
index 000000000000..e010c33a75ca
--- /dev/null
+++ b/app-editors/hteditor/hteditor-2.0_beta2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0_beta2.ebuild,v 1.1 2007/01/27 10:32:57 dragonheart Exp $
+
+inherit eutils autotools
+
+MY_PV=${PV/_/}
+DESCRIPTION="editor for executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/ht-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="
+	sys-libs/ncurses
+	X? ( x11-libs/libX11 )
+	>=dev-libs/lzo-2"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/ht-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-optionallzo.patch
+	epatch "${FILESDIR}"/${P}-regexneedstdlib.patch
+	cd "${S}"
+	eautoreconf
+}
+src_compile() {
+	econf --disable-release --enable-maintainer-mode $(use_enable X x11-textmode) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS KNOWNBUGS TODO README ChangeLog
+	dohtml doc/ht.html
+	doinfo doc/ht.info doc/hthelp.info
+}