Moved from x11-misc/xchm, bug #220741, thank Antek Grzymala for report.

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

9 files changed, 582 insertions, 0 deletions

diff --git a/app-text/xchm/ChangeLog b/app-text/xchm/ChangeLog
new file mode 100644
index 000000000000..a10337373164
--- /dev/null
+++ b/app-text/xchm/ChangeLog
@@ -0,0 +1,330 @@
+# ChangeLog for app-text/xchm
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.1 2008/05/19 13:14:26 pva Exp $
+
+  19 May 2008; Peter Volkov <pva@gentoo.org> +files/xchm-1.13-gcc-4.3.patch,
+  +files/xchm.desktop, +files/xchm.xml, +metadata.xml, +xchm-1.13.ebuild,
+  +xchm-1.13-r1.ebuild, +xchm-1.14.ebuild:
+  Moved from x11-misc/xchm, bug #220741, thank Antek Grzymala for report.
+
+  13 May 2008; Peter Volkov <pva@gentoo.org> xchm-1.13.ebuild,
+  xchm-1.13-r1.ebuild, xchm-1.14.ebuild:
+  Moving app-doc/chmlib -> dev-libs/chmlib, bug #220741.
+
+*xchm-1.14 (05 Jan 2008)
+
+  05 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> files/xchm.desktop,
+  +xchm-1.14.ebuild:
+  Version bump.  Migrate to wxGTK-2.8.
+
+  20 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/xchm-1.13-gcc-4.3.patch, xchm-1.13-r1.ebuild:
+  Add patch from upstream cvs to fix GCC 4.3 build.
+
+*xchm-1.13-r1 (08 Dec 2007)
+
+  08 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> -files/xchm-1.13.desktop,
+  +files/xchm.desktop, +files/xchm.xml, xchm-1.13.ebuild,
+  +xchm-1.13-r1.ebuild:
+  Revision bump to clean up ebuild. Dropped old MIME entries and move to fdo
+  shared-mime-info standard. Install one icon rather than half a dozen. Steal
+  .desktop file from Ubuntu.
+
+  07 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> files/xchm-1.13.desktop,
+  xchm-1.13.ebuild:
+  Fix .desktop file to pass validation.  Clean up ebuild & fix quoting.
+
+  30 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> -xchm-1.9.ebuild,
+  xchm-1.13.ebuild:
+  Use check_wxuse.  Remove old.
+
+  19 Jul 2007; Christoph Mende <angelos@gentoo.org> xchm-1.13.ebuild:
+  Stable on amd64 wrt bug #185334
+
+  16 Jul 2007; Raúl Porcel <armin76@gentoo.org> xchm-1.13.ebuild:
+  x86 stable wrt #185334
+
+  16 Jul 2007; nixnut <nixnut@gentoo.org> xchm-1.13.ebuild:
+  Stable on ppc wrt bug 185334
+
+  14 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> -xchm-1.10.ebuild,
+  -xchm-1.11.ebuild, xchm-1.13.ebuild:
+  Remove old.
+
+  14 Jul 2007; Ryan Hill <dirtyepic@gentoo.org> -xchm-1.10.ebuild,
+  -xchm-1.11.ebuild, xchm-1.13.ebuild:
+  Remove old.
+
+*xchm-1.13 (25 Apr 2007)
+
+  25 Apr 2007; <leio@gentoo.org> +files/xchm-1.13.desktop,
+  +xchm-1.13.ebuild:
+  Version bump. Also fixes many MIME related issues - make launching of chm
+  files (with xCHM) work automatically from file managers; make the chm MIME
+  icon provided by this package work properly; update icon and desktop mime
+  database as necessary
+
+*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.
+
+  21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
+  Redigest for Manifest2
+
+  14 Jan 2007; Joseph Jezak <josejx@gentoo.org> xchm-1.9.ebuild:
+  Marked ppc stable for bug #159049.
+
+  09 Jan 2007; Olivier Crête <tester@gentoo.org> xchm-1.9.ebuild:
+  Stable on amd64 per bug #159049
+
+  09 Jan 2007; Andrej Kacian <ticho@gentoo.org> xchm-1.9.ebuild:
+  Stable on x86, bug #159049.
+
+  31 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> xchm-1.2.ebuild,
+  xchm-1.9.ebuild:
+  Fix DEPENDs - wxGTK-2.6 only.
+
+*xchm-1.10 (23 Dec 2006)
+
+  23 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> +xchm-1.10.ebuild:
+  Version bump.  wxGTK 2.8 friendly, plus image printing should be working again.
+
+  14 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xchm-1.3.ebuild,
+  -xchm-1.7.1.ebuild:
+  Remove old version.
+
+*xchm-1.9 (01 Jul 2006)
+
+  01 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> +xchm-1.9.ebuild:
+  Version bump, see bug #138464.
+
+  15 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> xchm-1.7.1.ebuild:
+  Fix bug #130059: xchm-1.7.1 tarball has files with modification date in future.
+
+  14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> xchm-1.7.1.ebuild:
+  Removed external docs.
+
+*xchm-1.7.1 (14 Apr 2006)
+
+  14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xchm-0.9.6.ebuild,
+  +xchm-1.7.1.ebuild:
+  Version bump, see bug #129338.
+
+  17 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> xchm-1.2.ebuild:
+  Stable on ppc.
+
+  16 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> xchm-1.2.ebuild:
+  Fixed bug #122834, unpack error.
+
+*xchm-1.3 (14 Feb 2006)
+
+  14 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xchm-1.1.ebuild,
+  xchm-1.2.ebuild, +xchm-1.3.ebuild:
+  Version 1.2 stable on x86 (bug #122700), bumped to 1.3.
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xchm-gcc41.patch, xchm-1.2.ebuild:
+  Fix bug #117798 - compilation with gcc 4.1, patch by Ryan Hill
+  <dirtyepic.sk@gmail.com>.
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> xchm-0.9.6.ebuild,
+  xchm-1.1.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+*xchm-1.2 (31 Oct 2005)
+
+  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xchm-0.9.8.ebuild,
+  -xchm-1.0-r1.ebuild, +xchm-1.2.ebuild:
+  Version bump, ebuild cleanup.
+
+*xchm-1.1 (31 Aug 2005)
+
+  31 Aug 2005; Martin Holzer <mholzer@gentoo.org> +xchm-1.1.ebuild:
+  Version bumpd.
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> xchm-1.0-r1.ebuild:
+  updated dependency on 1.0-r1 for #96032
+
+*xchm-1.0-r1 (14 Jun 2005)
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> -xchm-1.0.ebuild,
+  +xchm-1.0-r1.ebuild:
+  #81047 and #91771 to fix wxwidgets and icon/desktop entries
+
+*xchm-1.0 (14 Jun 2005)
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> -xchm-0.9.3.ebuild,
+  -xchm-0.9.7.ebuild, +xchm-1.0.ebuild:
+  version bump to close #95282, cleanup
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> xchm-0.9.6.ebuild:
+  Stable on ppc.
+
+*xchm-0.9.8 (23 Feb 2005)
+
+  23 Feb 2005; Martin Holzer <mholzer@gentoo.org> +xchm-0.9.8.ebuild:
+  Version bumped.
+
+*xchm-0.9.7 (24 Dec 2004)
+
+  24 Dec 2004; Martin Holzer <mholzer@gentoo.org> +xchm-0.9.7.ebuild:
+  Version bumped.
+
+*xchm-0.9.5 (24 Dec 2004)
+
+  24 Dec 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.5.ebuild:
+  x86 stable
+
+*xchm-0.9.6 (31 Oct 2004)
+
+  31 Oct 2004; Martin Holzer <mholzer@gentoo.org> +xchm-0.9.6.ebuild:
+  Version bumped.
+
+  29 Sep 2004; <pyrania@gentoo.org> xchm-0.9.2.ebuild, xchm-0.9.3.ebuild:
+  Marked stable on x86.
+
+*xchm-0.9.4 (16 Sep 2004)
+
+  16 Sep 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.4.ebuild:
+  Version bumped.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xchm-0.8.11.ebuild,
+  xchm-0.9.1.ebuild, xchm-0.9.2.ebuild, xchm-0.9.3.ebuild, xchm-0.9.ebuild:
+  Masked xchm-0.9.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xchm-0.8.11.ebuild,
+  xchm-0.9.1.ebuild, xchm-0.9.2.ebuild, xchm-0.9.3.ebuild:
+  Masked xchm-0.9.3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xchm-0.8.11.ebuild,
+  xchm-0.9.1.ebuild, xchm-0.9.2.ebuild:
+  Masked xchm-0.9.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xchm-0.8.11.ebuild,
+  xchm-0.9.1.ebuild:
+  Masked xchm-0.9.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xchm-0.8.11.ebuild:
+  Masked xchm-0.8.11.ebuild stable for ppc
+
+*xchm-0.9.3 (29 Aug 2004)
+
+  29 Aug 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.3.ebuild:
+  Version bumped.
+
+*xchm-0.9.2 (19 Jul 2004)
+
+  19 Jul 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.2.ebuild:
+  Version bumped. Closes 57516
+
+  03 Jul 2004; <pyrania@gentoo.org> xchm-0.9.1.ebuild:
+  Stable on x86.
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xchm-0.8.11.ebuild,
+  xchm-0.9.1.ebuild, xchm-0.9.ebuild:
+  QA - fix use invocation
+
+*xchm-0.9.1 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.1.ebuild:
+  Version bumped. Closes 52640
+
+  20 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> xchm-0.9.ebuild:
+  marked ~amd64
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> xchm-0.9.ebuild:
+  Marked stable on x86.
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.8.11.ebuild:
+  x86 stable
+
+*xchm-0.9 (24 Feb 2004)
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.9.ebuild:
+  Version bumped.
+
+*xchm-0.8.11 (24 Jan 2004)
+
+  24 Jan 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.8.11.ebuild:
+  Version bumped.
+
+  24 Jan 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.8.10.ebuild:
+  x86 stable
+
+  06 Jan 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.8.9.ebuild:
+  marking x86 stable
+
+*xchm-0.8.10 (06 Jan 2004)
+
+  06 Jan 2004; Martin Holzer <mholzer@gentoo.org> xchm-0.8.10.ebuild:
+  Version bumped.
+
+*xchm-0.8.9 (06 Dec 2003)
+
+  06 Dec 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.9.ebuild:
+  Version bumped
+
+*xchm-0.8.8 (18 Nov 2003)
+
+  18 Nov 2003; Ian Leitch <port001@gentoo.org> xchm-0.8.8.ebuild:
+  Moved from app-misc to x11-misc, metadata.xml created
+
+*xchm-0.8.8 (08 Nov 2003)
+
+  08 Nov 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.8.ebuild:
+  Version bumped.
+
+*xchm-0.8.7 (26 Oct 2003)
+
+  26 Oct 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.6.ebuild,
+  xchm-0.8.7.ebuild:
+  Version bumped.
+
+*xchm-0.8.6 (15 Oct 2003)
+
+  15 Oct 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.6.ebuild:
+  Version bumped.
+
+*xchm-0.8.5 (09 Oct 2003)
+
+  09 Oct 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.5.ebuild:
+  Version bumped.
+
+*xchm-0.8.4 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.4.ebuild:
+  Version bumped.
+
+  07 Oct 2003; David Holm <dholm@gentoo.org> xchm-0.8.3.ebuild:
+  Added to ~ppc.
+
+*xchm-0.8.3 (29 Sep 2003)
+
+  29 Sep 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.3.ebuild:
+  Version bumped.
+
+*xchm-0.8 (10 Sep 2003)
+
+  10 Sep 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.8.ebuild:
+  Version bumped.
+
+  10 Sep 2003; Sergey Kuleshov <svyatogor@gentoo.org> xchm-0.7.1.ebuild:
+  Fixed the dep for chmlib (changed dev-libs to app-doc).
+
+*xchm-0.7.1 (09 Sep 2003)
+
+  09 Sep 2003; Martin Holzer <mholzer@gentoo.org> xchm-0.7.1.ebuild:
+  Adding initial ebuild. Submitted by Kevin Carlson <kcarlson@kevinga.com>
+  in #27940.
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
new file mode 100644
index 000000000000..12ece4a6de85
--- /dev/null
+++ b/app-text/xchm/Manifest
@@ -0,0 +1,10 @@
+AUX xchm-1.13-gcc-4.3.patch 686 RMD160 527b88da8942ff14946fff8d165cf2589001479f SHA1 dd3a2bd536ab40a02d59a13f00163e812ef3942a SHA256 95b7b500665b6ffcb7bfceda0c8c43da93a62779e16f26843bdc8e3acb8791bc
+AUX xchm.desktop 252 RMD160 f1e0a2c6c2cea3ee4d3c6cb5e2abb0c1c7d87476 SHA1 8494001d98d6d89be90b776f309c77d509477e08 SHA256 1c6ef7fbae93b80e36acacfb584b60808fb348e924a4d8156be2006fea0c1e3e
+AUX xchm.xml 257 RMD160 15a32737d412ecab29d6ea2c158759160987341f SHA1 959f4783bba46291b73d375735389686b2677c12 SHA256 e599df84873a55522b9dba4db06393d76084dd7657690d4d7bf5b0aa76803955
+DIST xchm-1.13.tar.gz 390882 RMD160 07ac2962ee5da8a4aceda58fecd4578507a71ed9 SHA1 f062f584c9fd00107e28d96342d48ea36b2f2f49 SHA256 2419ed4bd3228f5e2b2dc6df341230b90fb334dacd0967dff1e4fd88d23d3a64
+DIST xchm-1.14.tar.gz 394735 RMD160 d0dafab82c5f99cecc2eaab94bdabc873428534e SHA1 e3f8aa469e403cc4de64646e79a69f5e442fddc9 SHA256 3c58152a83b12a395fe2e79bce9d4281f2ad9c19350e6750e72abba52282a83f
+EBUILD xchm-1.13-r1.ebuild 1540 RMD160 3b4000550c5b5e5f0ac8a77c73a3687fc4f97705 SHA1 00bd4b2a2e10adc8f9453ae0ab7402986802c6ee SHA256 b05ab8b311cfaba6a2397e003fdf52290c4f19b029dc244ca07830363a1173b1
+EBUILD xchm-1.13.ebuild 2524 RMD160 68568d1638e137975bdd8a687d324e252e53e045 SHA1 691bbf7cb1b9a7fa56842e5abbc2fd2a46ebfdf8 SHA256 416303c51afae361345ecafcdd780be39e5444b17aa1c52533f3e47ec5236efb
+EBUILD xchm-1.14.ebuild 1259 RMD160 e5da99cb439864d5e0b446595790816e8fb7e4d9 SHA1 0ff88cda6de53a86b80c8d5b75087b00631f751b SHA256 a87ecca8ee32cfdc85ebcc698e52e1fb7c09e8bf3c791c5ccfa2ab82f9b48353
+MISC ChangeLog 10291 RMD160 d8e908dbc31896e22bcf23c3ada5379377ffcdfc SHA1 293c237760e84651f88e5775848a61ed68fc2513 SHA256 69bf2fa659004d07464365e011e85e035af53f23e349a02dc4c97c09ad3d210c
+MISC metadata.xml 258 RMD160 9ac4d74e8cfb7c4d3b9bab9676a52755968bec01 SHA1 4c7b059fc8a6d9d81360e4ac132c2db306fe8cb4 SHA256 b66f1a4d91cfec01c1815b4a14ea1f77ca7381508d2d2a2c9349877c3ea5e533
diff --git a/app-text/xchm/files/xchm-1.13-gcc-4.3.patch b/app-text/xchm/files/xchm-1.13-gcc-4.3.patch
new file mode 100644
index 000000000000..d5035b560a07
--- /dev/null
+++ b/app-text/xchm/files/xchm-1.13-gcc-4.3.patch
@@ -0,0 +1,14 @@
+diff -Naur xchm-1.13-orig/src/chmfile.h xchm-1.13/src/chmfile.h
+--- xchm-1.13-orig/src/chmfile.h	2007-04-10 06:07:17.000000000 -0600
++++ xchm-1.13/src/chmfile.h	2007-12-19 19:00:16.000000000 -0600
+@@ -277,8 +277,8 @@
+ 
+ 	//! Retrieve the data (name/URL) for a single entry (TOC or index)
+ 	bool GetItem(UCharPtr& topics, UCharPtr& strings, UCharPtr& urltbl,
+-		     UCharPtr& urlstr, u_int32_t index, wxTreeCtrl *toBuild,
+-		     CHMListCtrl* toBuild, const wxString& idxName,
++		     UCharPtr& urlstr, u_int32_t index, wxTreeCtrl* tree,
++		     CHMListCtrl* list, const wxString& idxName,
+ 		     const wxCSConv& cv, int level, bool local);
+ 
+ 	//! Get the binary index (if available)
diff --git a/app-text/xchm/files/xchm.desktop b/app-text/xchm/files/xchm.desktop
new file mode 100644
index 000000000000..aced6708cb5e
--- /dev/null
+++ b/app-text/xchm/files/xchm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=xCHM
+Comment=Compiled HTML Help (CHM) file viewer
+Comment[fr]=Visionneuse de fichiers Compiled HTML Help (CHM)
+Icon=xchm
+TryExec=xchm
+Exec=xchm %f
+MimeType=application/x-chm;
+Categories=Viewer;Utility;
diff --git a/app-text/xchm/files/xchm.xml b/app-text/xchm/files/xchm.xml
new file mode 100644
index 000000000000..08cb9ca3f4b8
--- /dev/null
+++ b/app-text/xchm/files/xchm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-chm">
+    <comment>Compiled HTML Help Format</comment>
+    <glob pattern="*.chm"/>
+  </mime-type>
+</mime-info>
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
new file mode 100644
index 000000000000..ef2bd6f75747
--- /dev/null
+++ b/app-text/xchm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>dirtyepic@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/xchm/xchm-1.13-r1.ebuild b/app-text/xchm/xchm-1.13-r1.ebuild
new file mode 100644
index 000000000000..c25cece87b1b
--- /dev/null
+++ b/app-text/xchm/xchm-1.13-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.13-r1.ebuild,v 1.1 2008/05/19 13:14:26 pva Exp $
+
+inherit eutils wxwidgets flag-o-matic fdo-mime gnome2-utils
+
+DESCRIPTION="Utility for viewing Microsoft .chm files."
+HOMEPAGE="http://xchm.sf.net"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="nls unicode"
+DEPEND=">=dev-libs/chmlib-0.36
+	=x11-libs/wxGTK-2.6*"
+# Tested to work against a local install of 2.8.3
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+}
+
+src_compile() {
+	local myconf
+	export WX_GTK_VER="2.6"
+
+	use unicode && need-wxwidgets unicode || need-wxwidgets ansi
+
+	append-flags -fno-strict-aliasing
+
+	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/xchm/xchm-1.13.ebuild b/app-text/xchm/xchm-1.13.ebuild
new file mode 100644
index 000000000000..3ea70f91242c
--- /dev/null
+++ b/app-text/xchm/xchm-1.13.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.13.ebuild,v 1.1 2008/05/19 13:14:26 pva Exp $
+
+inherit wxwidgets flag-o-matic fdo-mime gnome2-utils
+
+DESCRIPTION="Utility for viewing Microsoft .chm files."
+HOMEPAGE="http://xchm.sf.net"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE="nls unicode"
+DEPEND=">=dev-libs/chmlib-0.31
+	=x11-libs/wxGTK-2.6*"
+# Tested to work against a local install of 2.8.3
+
+src_compile() {
+	local myconf
+	export WX_GTK_VER="2.6"
+
+	use unicode && need-wxwidgets unicode || need-wxwidgets ansi
+
+	append-flags -fno-strict-aliasing
+
+	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README ChangeLog
+
+	# 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 \
+		"${D}"/usr/share/icons/hicolor/16x16/apps/xchm.xpm
+	dodir /usr/share/icons/hicolor/32x32/apps/
+	install -m 644 "${S}"/art/xchm-32.xpm \
+		"${D}"/usr/share/icons/hicolor/32x32/apps/xchm.xpm
+	dodir /usr/share/icons/hicolor/48x48/apps/
+	install -m 644 "${S}"/art/xchm-48.xpm \
+		"${D}"/usr/share/icons/hicolor/48x48/apps/xchm.xpm
+	dodir /usr/share/icons/hicolor/128x128/apps/
+	install -m 644 "${S}"/art/xchm-128.xpm \
+		"${D}"/usr/share/icons/hicolor/128x128/apps/xchm.xpm
+	dodir /usr/share/icons/hicolor/16x16/mimetypes/
+	install -m 644 "${S}"/art/xchmdoc-16.xpm \
+		"${D}"/usr/share/icons/hicolor/16x16/mimetypes/application-x-chm.xpm
+	dodir /usr/share/icons/hicolor/32x32/mimetypes/
+	install -m 644 "${S}"/art/xchmdoc-32.xpm \
+		"${D}"/usr/share/icons/hicolor/32x32/mimetypes/application-x-chm.xpm
+	dodir /usr/share/icons/hicolor/48x48/mimetypes/
+	install -m 644 "${S}"/art/xchmdoc-48.xpm \
+		"${D}"/usr/share/icons/hicolor/48x48/mimetypes/application-x-chm.xpm
+	dodir /usr/share/icons/hicolor/128x128/mimetypes/
+	install -m 644 "${S}"/art/xchmdoc-128.xpm \
+		"${D}"/usr/share/icons/hicolor/128x128/mimetypes/application-x-chm.xpm
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/xchm.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/xchm/xchm-1.14.ebuild b/app-text/xchm/xchm-1.14.ebuild
new file mode 100644
index 000000000000..d1abf1a8b240
--- /dev/null
+++ b/app-text/xchm/xchm-1.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.14.ebuild,v 1.1 2008/05/19 13:14:26 pva Exp $
+
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets flag-o-matic fdo-mime gnome2-utils
+
+DESCRIPTION="Utility for viewing Microsoft .chm files."
+HOMEPAGE="http://xchm.sf.net"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="nls"
+DEPEND=">=dev-libs/chmlib-0.36
+	=x11-libs/wxGTK-2.8*"
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}