patch to work with NDEBUG thanks to Guenther Brunthaler bug #205269. QA improvements thanks to Jakub. removed old versions

Package-Manager: portage-2.1.4.4

6 files changed, 72 insertions, 70 deletions

diff --git a/app-editors/lfhex/ChangeLog b/app-editors/lfhex/ChangeLog
index e2f846c30a74..9bd6662109ae 100644
--- a/app-editors/lfhex/ChangeLog
+++ b/app-editors/lfhex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/lfhex
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.19 2007/07/22 08:56:15 omp Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.20 2008/04/01 15:38:03 dragonheart Exp $
+
+*lfhex-0.4-r1 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org> +files/ndebug.patch,
+  -lfhex-0.3.7-r1.ebuild, -lfhex-0.3.7.1.ebuild, +lfhex-0.4-r1.ebuild:
+  patch to work with NDEBUG thanks to Guenther Brunthaler bug #205269. QA
+  improvements thanks to Jakub. removed old versions
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> lfhex-0.3.7-r1.ebuild,
   lfhex-0.3.7.1.ebuild, lfhex-0.3.7.2.ebuild, lfhex-0.4.ebuild:
diff --git a/app-editors/lfhex/Manifest b/app-editors/lfhex/Manifest
index f2dc692ee894..2673d382b218 100644
--- a/app-editors/lfhex/Manifest
+++ b/app-editors/lfhex/Manifest
@@ -1,11 +1,9 @@
 AUX lfhex-gcc3-inline-fix.patch 539 RMD160 40f10149457d829d661ce72817ae872a78e59066 SHA1 60016ce3d5de61e8cc39d37514063da8531474cb SHA256 636899e06188d8e3b0b136d32bbdaf3a20568df2b031d0db8343b09d814aeed3
-DIST lfhex-0.3.7.1.tar.gz 70863 RMD160 f3554d122d65678a2bf435e7cdfd7d9710a85732 SHA1 d9236dc69c937c1ed3bc368ecf9184c745354fc6 SHA256 e36ad33be4de6533473fec4b2c6623ccee3f4d14e63e8729285b49c73e81b969
+AUX ndebug.patch 778 RMD160 1e15778bf00957f068571189cdce24f5e239c8a1 SHA1 bb74a2b8f54fd43c4b15aa23e6d14dd0f13baf6f SHA256 2f9ebbc42d606f501669214cad9f9e437e672accefa03b04e6417010eb639871
 DIST lfhex-0.3.7.2.tar.gz 70871 RMD160 b343a22e32c6c451ad69a62bfd8c9b3f2f57cb9c SHA1 2fd4c71bf8eaf35301f1b19d93f495d747d17c22 SHA256 65c83e85012697099b09dc18db4860c03f5a0ec28e4405e85f085de1ddf46c0a
-DIST lfhex-0.3.7.tar.gz 69947 RMD160 7aaa4163eec493a2547d1a647b4ed5079d2769df SHA1 3aba91ba7bec6241c7f3ccdefa6fc7d0f208c70f SHA256 bc9cd25f051298833e9a96c5129c357d0a98b17c2ba556463f950170e05f4650
 DIST lfhex-0.4.tar.gz 39180 RMD160 a23cbe5b7f62b0ac1234c4caa54457d41671bf5c SHA1 c99b6434559818d26f48152607d3bd70ea930888 SHA256 97e3f481a275671395d2b500d904474dfaaf5055b42b0f230e3ac6a2478897b0
-EBUILD lfhex-0.3.7-r1.ebuild 805 RMD160 984eddec0afd9af75505553915da1734d3571620 SHA1 35356473e21f9a2b64ecf4dd604f67f1a9298abb SHA256 0a58b45baebbe86733883275338906c6d2c8bab5b5a91c2a8a4792f18b81a7ee
-EBUILD lfhex-0.3.7.1.ebuild 696 RMD160 177bf2006232e699ba466dd68114903a9e1e97e7 SHA1 76b9d6dc4a7f9496f4db957c2e183d5a4e1489e5 SHA256 035c442cffd419bbb258792f551b757a8f4fbc62735d084d5fab0d2d5cd35f9f
 EBUILD lfhex-0.3.7.2.ebuild 693 RMD160 b953023cafae5a0eb86b721d7753ebac5f1446ce SHA1 b0f84edd05bf90df95865f12a34cb4756ceea26e SHA256 1478280be31930c26235164c13ee86969f0292ae87650b589a53162003876a48
+EBUILD lfhex-0.4-r1.ebuild 843 RMD160 b2d45c45326d706e46e5e93c79129518e64c4d0f SHA1 dd5158c9cfa476c275bb99af97a4c65e89f0ff63 SHA256 96e6568b9bea57314f00277577956cac438a944cd46369691af4c129415a8949
 EBUILD lfhex-0.4.ebuild 885 RMD160 082155bc2169699a7b7543dd23e3af47fc90b043 SHA1 0a379aa6e173b238b19229106838455705514e3c SHA256 d808272036932d452b582fe01de3384bba8738f05196915843d3223df90ede3f
-MISC ChangeLog 2388 RMD160 3bdff786478e526353792faeafa66ac101a828b4 SHA1 34f9c95145363b0260cd4c54e29101722b51f9e0 SHA256 e63c7a82c5f07e425f98b54f9ef7b9e0f3a9e284a6ac7f70605282a57a5fd775
+MISC ChangeLog 2698 RMD160 5e5e56cf4f12d6a34b24af801075172c59edc01e SHA1 568cd537fc384bf65e6ec8d22ddca5259818691a SHA256 845dda54b6704cce5f4a08c320b0f8048af7fc6bb6fe684fa6d9c61555b21e45
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
diff --git a/app-editors/lfhex/files/ndebug.patch b/app-editors/lfhex/files/ndebug.patch
new file mode 100644
index 000000000000..e2f76607f32a
--- /dev/null
+++ b/app-editors/lfhex/files/ndebug.patch
@@ -0,0 +1,23 @@
+Patches lfhex to compile fine with -DNDEBUG (which is typically used to
+compile release versions without debugging information).
+
+The original version made an essential function call within an assert()
+statement - but defining NDEBUG makes any assert statements into no-ops.
+
+Patch written 2008 by Guenther Brunthaler <gb_about_gnu@gmx.net>
+Index: src/reader.cpp
+===================================================================
+--- src.orig/reader.cpp
++++ src/reader.cpp
+@@ -278,7 +278,11 @@ uchar Reader::operator[] (off_t offset)
+ 		       "attempt to access past end of file");
+ 
+   off_t page_idx = offset/_pageSize;
++  #ifdef NDEBUG
++  (void)loadPage( page_idx );
++  #else
+   assert( loadPage( page_idx ) );
++  #endif
+   return _data[page_idx][ offset%_pageSize ];
+ }
+ 
diff --git a/app-editors/lfhex/lfhex-0.3.7-r1.ebuild b/app-editors/lfhex/lfhex-0.3.7-r1.ebuild
deleted file mode 100644
index 7feb6e184ffc..000000000000
--- a/app-editors/lfhex/lfhex-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.3.7-r1.ebuild,v 1.10 2007/07/22 08:56:15 omp Exp $
-
-inherit eutils
-
-DESCRIPTION="A fast, efficient hex-editor with support for large files and comparing binary files"
-HOMEPAGE="http://freshmeat.net/projects/lfhex"
-SRC_URI="http://home.earthlink.net/~eyekode/data/${P}.tar.gz"
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-
-IUSE=""
-
-RDEPEND="=x11-libs/qt-3*
-	>=x11-libs/libXt-1.0.0"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/grep
-	sys-apps/net-tools"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/lfhex-gcc3-inline-fix.patch
-}
-
-src_install() {
-	dobin bin/lfhex
-	dodoc README
-	dodoc README.install
-}
diff --git a/app-editors/lfhex/lfhex-0.3.7.1.ebuild b/app-editors/lfhex/lfhex-0.3.7.1.ebuild
deleted file mode 100644
index d838a09a8a96..000000000000
--- a/app-editors/lfhex/lfhex-0.3.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.3.7.1.ebuild,v 1.3 2007/07/22 08:56:15 omp Exp $
-
-inherit eutils
-
-DESCRIPTION="A fast, efficient hex-editor with support for large files and comparing binary files"
-HOMEPAGE="http://freshmeat.net/projects/lfhex"
-SRC_URI="http://home.earthlink.net/~eyekode/data/${P}.tar.gz"
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-RDEPEND="=x11-libs/qt-3*
-	>=x11-libs/libXt-1.0.0"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/grep
-	sys-apps/net-tools"
-
-src_install() {
-	dobin bin/lfhex
-	dodoc README
-}
diff --git a/app-editors/lfhex/lfhex-0.4-r1.ebuild b/app-editors/lfhex/lfhex-0.4-r1.ebuild
new file mode 100644
index 000000000000..449b9b9e6c87
--- /dev/null
+++ b/app-editors/lfhex/lfhex-0.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.4-r1.ebuild,v 1.1 2008/04/01 15:38:03 dragonheart Exp $
+
+inherit qt4 toolchain-funcs
+
+DESCRIPTION="A fast, efficient hex-editor with support for large files and comparing binary files"
+HOMEPAGE="http://stoopidsimple.com/lfhex"
+SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="$(qt4_min_version 4)
+	>=x11-libs/libXt-1.0.0"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ndebug.patch
+}
+src_compile() {
+#	eqmake4 lfhex.pro
+	eqmake4 || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin lfhex
+	dodoc README
+}