Version bump.

"xCHM is now the first non-MS CHM viewer able to parse and use the binary table
of contents and index files inside CHM books. Upgrading to 1.11 is strongly
recommended, as this version loads CHMs way faster, and it also fixes a couple
of bugs."

Cleaned up the ebuild and added an nls USE flag.  Removed old version.
(Portage version: 2.1.2.2)

5 files changed, 37 insertions, 47 deletions

diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index d2570973559d..ca46d41150c4 100644
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-misc/xchm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.47 2007/03/10 04:34:14 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.48 2007/03/24 01:34:04 dirtyepic Exp $
+
+*xchm-1.11 (24 Mar 2007)
+
+  24 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> -files/xchm-gcc41.patch,
+  -xchm-1.2.ebuild, +xchm-1.11.ebuild:
+  Version bump.
+  
+  "xCHM is now the first non-MS CHM viewer able to parse and use the binary table
+  of contents and index files inside CHM books. Upgrading to 1.11 is strongly
+  recommended, as this version loads CHMs way faster, and it also fixes a couple
+  of bugs."
+  
+  Cleaned up the ebuild and added an nls USE flag.  Removed old version.
 
   10 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Add myself as co-maintainer.
diff --git a/x11-misc/xchm/files/digest-xchm-1.11 b/x11-misc/xchm/files/digest-xchm-1.11
new file mode 100644
index 000000000000..7ab34f67a497
--- /dev/null
+++ b/x11-misc/xchm/files/digest-xchm-1.11
@@ -0,0 +1,3 @@
+MD5 59610ca44a8434a6909c4b4e944de940 xchm-1.11.tar.gz 391284
+RMD160 081d97e5a2eb3ca47594534f08301a9fc1c99914 xchm-1.11.tar.gz 391284
+SHA256 d463600b3b898069ef45b8bf3a0eca3d86a85666444789ca7aa17c4bdafaa5bd xchm-1.11.tar.gz 391284
diff --git a/x11-misc/xchm/files/digest-xchm-1.2 b/x11-misc/xchm/files/digest-xchm-1.2
deleted file mode 100644
index bec784d589df..000000000000
--- a/x11-misc/xchm/files/digest-xchm-1.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8499bcafd023293673d9f8b4fd1dc792 xchm-1.2-doc.tar.gz 109173
-RMD160 0a571258f43f6eb322606223aa79db452587096b xchm-1.2-doc.tar.gz 109173
-SHA256 53e8cba5814ef2e17df4503480155eff15af275aa3cb1d815f1fab2beb785b4b xchm-1.2-doc.tar.gz 109173
-MD5 17f2cda873f61470636dbfeebb4a531d xchm-1.2.tar.gz 334678
-RMD160 ffdae1ef452834524bfbc083f77a47c9e2245d44 xchm-1.2.tar.gz 334678
-SHA256 0f75142cdc17f892e1f58e447d6ca4b3dcc033d77b159faaa28c967bb123aede xchm-1.2.tar.gz 334678
diff --git a/x11-misc/xchm/files/xchm-gcc41.patch b/x11-misc/xchm/files/xchm-gcc41.patch
deleted file mode 100644
index 59a046ebbb39..000000000000
--- a/x11-misc/xchm/files/xchm-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xchm-1.2-orig/src/chmframe.h xchm-1.2/src/chmframe.h
---- xchm-1.2-orig/src/chmframe.h	2006-01-04 17:40:19.702114632 -0600
-+++ xchm-1.2/src/chmframe.h	2006-01-04 17:41:29.929438456 -0600
-@@ -166,7 +166,7 @@
- 	void OnPrint(wxCommandEvent& event);
- 
- 	//! Called when the user selects a file from the file history.
--	void CHMFrame::OnHistFile(wxCommandEvent& event);
-+	void OnHistFile(wxCommandEvent& event);
- 
- 	//! Called when the user types Ctrl-F.
- 	void OnFind(wxCommandEvent& event);
diff --git a/x11-misc/xchm/xchm-1.2.ebuild b/x11-misc/xchm/xchm-1.11.ebuild
index 8b8e6139f7ca..f97205728ae2 100644
--- a/x11-misc/xchm/xchm-1.2.ebuild
+++ b/x11-misc/xchm/xchm-1.11.ebuild
@@ -1,56 +1,48 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.2.ebuild,v 1.6 2006/12/31 23:06:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.11.ebuild,v 1.1 2007/03/24 01:34:04 dirtyepic Exp $
 
-inherit eutils wxwidgets
+inherit wxwidgets flag-o-matic
 
 DESCRIPTION="Utility for viewing Microsoft .chm files."
 HOMEPAGE="http://xchm.sf.net"
-SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz
-	doc? ( mirror://sourceforge/xchm/${P}-doc.tar.gz )"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="doc unicode"
+IUSE="nls unicode"
 DEPEND=">=app-doc/chmlib-0.31
-	=x11-libs/wxGTK-2.6*"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fixes bug #117798:
-	epatch "${FILESDIR}/${PN}-gcc41.patch"
-
-}
+	>=x11-libs/wxGTK-2.6.0"
 
 src_compile() {
 	local myconf
 	export WX_GTK_VER="2.6"
+
 	if use unicode; then
 		need-wxwidgets unicode
 	else
 		need-wxwidgets gtk2
 	fi
+
+	append-flags -fno-strict-aliasing
+
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	econf ${myconf} || die "econf failed"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		|| die "econf failed"
+
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die
-	dodoc AUTHORS README
-
-	if use doc; then
-		cd ${S}"-doc"
-		dohtml html/*
-	fi
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README ChangeLog
 
-	# fixes dekstop and icon problems
-	rm ${D}/usr/share/pixmaps/xchm-*.xpm
-	${D}/usr/share/pixmaps/xchmdoc-*.xpm
+	# fixes desktop and icon problems
+	rm ${D}/usr/share/pixmaps/xchm-*.xpm ${D}/usr/share/pixmaps/xchmdoc-*.xpm
 
 	dodir /usr/share/icons/hicolor/16x16/apps/
 	install -m 644 ${S}/art/xchm-16.xpm \