version bump thanks to Sebastian Biallas in bug #169829

(Portage version: 2.1.2.2)

11 files changed, 15 insertions, 344 deletions

diff --git a/app-editors/hteditor/ChangeLog b/app-editors/hteditor/ChangeLog
index 82388dad5250..66e9cc04c541 100644
--- a/app-editors/hteditor/ChangeLog
+++ b/app-editors/hteditor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-editors/hteditor
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.26 2007/03/08 11:18:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/ChangeLog,v 1.27 2007/04/19 20:43:38 dragonheart Exp $
+
+*hteditor-2.0.3 (19 Apr 2007)
+
+  19 Apr 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/hteditor-0.9.4-asneeded.patch,
+  -files/hteditor-2.0_beta2-optionallzo.patch,
+  -files/hteditor-2.0_beta2-regexneedstdlib.patch, -hteditor-0.9.1.ebuild,
+  -hteditor-0.9.4.ebuild, -hteditor-2.0_beta2.ebuild,
+  +hteditor-2.0.3.ebuild:
+  version bump thanks to Sebastian Biallas in bug #169829
 
 *hteditor-2.0 (08 Mar 2007)
 
diff --git a/app-editors/hteditor/files/digest-hteditor-0.9.1 b/app-editors/hteditor/files/digest-hteditor-0.9.1
deleted file mode 100644
index 36129542fd79..000000000000
--- a/app-editors/hteditor/files/digest-hteditor-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2dd4bf6ae959b2ed2c9d8373164d2693 ht-0.9.1.tar.bz2 737690
-RMD160 dd14227fe5c7d93f5db2965fcd61e832f2f1bbd9 ht-0.9.1.tar.bz2 737690
-SHA256 8b2aca19b1a81af9191df812d4b2c7f38492f24ea2725262d2e2f335d6e14b78 ht-0.9.1.tar.bz2 737690
diff --git a/app-editors/hteditor/files/digest-hteditor-0.9.4 b/app-editors/hteditor/files/digest-hteditor-0.9.4
deleted file mode 100644
index eb013850336c..000000000000
--- a/app-editors/hteditor/files/digest-hteditor-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 00031f3d71596e2874ec6bd066da9054 ht-0.9.4.tar.bz2 773249
-RMD160 01670635667856bf28b3c72296d34a99ed10b141 ht-0.9.4.tar.bz2 773249
-SHA256 dc594b08ec4f5997269d217875fc8a9bef43dc316151e45b949a3942ea6af9ec ht-0.9.4.tar.bz2 773249
diff --git a/app-editors/hteditor/files/digest-hteditor-2.0.3 b/app-editors/hteditor/files/digest-hteditor-2.0.3
new file mode 100644
index 000000000000..1a4a6054d58c
--- /dev/null
+++ b/app-editors/hteditor/files/digest-hteditor-2.0.3
@@ -0,0 +1,3 @@
+MD5 8ede64d20b4671fa218f6bc499db64ee ht-2.0.3.tar.bz2 855191
+RMD160 672fb8dad95a4cc17a35f6aac1d767d8fe2f3ca8 ht-2.0.3.tar.bz2 855191
+SHA256 485d9b6a3c442811c0c464ee143d4a04b5b1118d99935bf3a56a5086bc2cf2c1 ht-2.0.3.tar.bz2 855191
diff --git a/app-editors/hteditor/files/digest-hteditor-2.0_beta2 b/app-editors/hteditor/files/digest-hteditor-2.0_beta2
deleted file mode 100644
index 82692d1122f7..000000000000
--- a/app-editors/hteditor/files/digest-hteditor-2.0_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-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-0.9.4-asneeded.patch b/app-editors/hteditor/files/hteditor-0.9.4-asneeded.patch
deleted file mode 100644
index 425b27e2d8e0..000000000000
--- a/app-editors/hteditor/files/hteditor-0.9.4-asneeded.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in.orig	2006-10-29 19:44:25.000000000 +1100
-+++ configure.in	2006-10-29 19:45:02.000000000 +1100
-@@ -147,9 +147,9 @@
- fi    
- 
- dnl Makefile vars.
--HT_LDFLAGS="$HT_LIBS $HT_LDFLAGS"
- AC_SUBST(IO_DIR)
- AC_SUBST(HT_LDFLAGS)
-+AC_SUBST(HT_LIBS)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
---- Makefile.am.orig	2006-10-29 19:44:31.000000000 +1100
-+++ Makefile.am	2006-10-29 19:45:38.000000000 +1100
-@@ -17,9 +17,8 @@
- 
- 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)/$(SRT_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 $(SRT_DIR)/libsrt.a
-+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 $(SRT_DIR)/libsrt.a @HT_LIBS@
- ht_LDFLAGS	= @HT_LDFLAGS@
--ht_LIBS		= @HT_LIBS@
- 
- ht_SOURCES	= htdoc.c htdoc.h blockop.cc blockop.h coff_s.h common.cc common.h \
- config.h cstream.cc cstream.h demangle.h elfstruc.h htendian.cc \
diff --git a/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch b/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch
deleted file mode 100644
index 0384d717181e..000000000000
--- a/app-editors/hteditor/files/hteditor-2.0_beta2-optionallzo.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-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
deleted file mode 100644
index 67bae0087848..000000000000
--- a/app-editors/hteditor/files/hteditor-2.0_beta2-regexneedstdlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- /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-0.9.1.ebuild b/app-editors/hteditor/hteditor-0.9.1.ebuild
deleted file mode 100644
index 95b79a931d8f..000000000000
--- a/app-editors/hteditor/hteditor-0.9.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.9.1.ebuild,v 1.2 2006/05/22 10:09:05 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="editor for executable files"
-HOMEPAGE="http://hte.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.4
-	sys-devel/autoconf
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/ht-${PV}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/hteditor-gcc41.patch"
-}
-
-
-src_compile() {
-	econf || die
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS KNOWNBUGS TODO README
-	dohtml doc/ht.html
-	doinfo doc/*.info
-}
diff --git a/app-editors/hteditor/hteditor-0.9.4.ebuild b/app-editors/hteditor/hteditor-0.9.4.ebuild
deleted file mode 100644
index e5b4e794969e..000000000000
--- a/app-editors/hteditor/hteditor-0.9.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.9.4.ebuild,v 1.1 2006/10/29 08:50:30 dragonheart Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="editor for executable files"
-HOMEPAGE="http://hte.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.4
-	sys-devel/autoconf
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/ht-${PV}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	eautoreconf
-}
-
-
-src_compile() {
-	econf || die
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS KNOWNBUGS TODO README
-	dohtml doc/ht.html
-	doinfo doc/*.info
-}
diff --git a/app-editors/hteditor/hteditor-2.0_beta2.ebuild b/app-editors/hteditor/hteditor-2.0.3.ebuild
index e010c33a75ca..6b4e0efe4345 100644
--- a/app-editors/hteditor/hteditor-2.0_beta2.ebuild
+++ b/app-editors/hteditor/hteditor-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.3.ebuild,v 1.1 2007/04/19 20:43:38 dragonheart Exp $
 
 inherit eutils autotools
 
@@ -24,13 +24,6 @@ DEPEND="${RDEPEND}
 
 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