7 files changed, 96 insertions, 13 deletions
diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index 290345f2584a..88c86860c98a 100644
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,15 @@
 # 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.55 2007/12/07 02:59:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.56 2007/12/08 23:51:19 dirtyepic Exp $
+
+*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:
diff --git a/x11-misc/xchm/files/digest-xchm-1.13-r1 b/x11-misc/xchm/files/digest-xchm-1.13-r1
new file mode 100644
index 000000000000..bc6d7489732d
--- /dev/null
+++ b/x11-misc/xchm/files/digest-xchm-1.13-r1
@@ -0,0 +1,3 @@
+MD5 b444e36d6f1c7b3d772d1986ea9929dc xchm-1.13.tar.gz 390882
+RMD160 07ac2962ee5da8a4aceda58fecd4578507a71ed9 xchm-1.13.tar.gz 390882
+SHA256 2419ed4bd3228f5e2b2dc6df341230b90fb334dacd0967dff1e4fd88d23d3a64 xchm-1.13.tar.gz 390882
diff --git a/x11-misc/xchm/files/xchm-1.13.desktop b/x11-misc/xchm/files/xchm-1.13.desktop
deleted file mode 100644
index 869e26455d64..000000000000
--- a/x11-misc/xchm/files/xchm-1.13.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=xCHM
-Comment=Utility for viewing Microsoft .chm files
-Exec=xchm %f
-Icon=xchm
-StartupNotify=true
-Type=Application
-Categories=Office;Viewer;
-MimeType=application/x-chm;
diff --git a/x11-misc/xchm/files/xchm.desktop b/x11-misc/xchm/files/xchm.desktop
new file mode 100644
index 000000000000..c94f68c367d2
--- /dev/null
+++ b/x11-misc/xchm/files/xchm.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=xCHM
+Comment=Compiled HTML Help (CHM) file viewer
+Comment[fr]=Visionneuse de fichiers Compiled HTML Help (CHM)
+Exec=xchm %f
+TryExec=xchm
+Terminal=false
+Type=Application
+Icon=xchm
+Categories=Viewer;Utility;
+MimeType=application/x-chm;
+
+[Desktop Action View]
+Exec=xchm %f
diff --git a/x11-misc/xchm/files/xchm.xml b/x11-misc/xchm/files/xchm.xml
new file mode 100644
index 000000000000..08cb9ca3f4b8
--- /dev/null
+++ b/x11-misc/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/x11-misc/xchm/xchm-1.13-r1.ebuild b/x11-misc/xchm/xchm-1.13-r1.ebuild
new file mode 100644
index 000000000000..666fcabaf3c9
--- /dev/null
+++ b/x11-misc/xchm/xchm-1.13-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.13-r1.ebuild,v 1.1 2007/12/08 23:51:19 dirtyepic 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=">=app-doc/chmlib-0.36
+	=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 "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/x11-misc/xchm/xchm-1.13.ebuild b/x11-misc/xchm/xchm-1.13.ebuild
index 27fc161b0014..0ffb7f639d96 100644
--- a/x11-misc/xchm/xchm-1.13.ebuild
+++ b/x11-misc/xchm/xchm-1.13.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/x11-misc/xchm/xchm-1.13.ebuild,v 1.7 2007/12/07 02:59:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.13.ebuild,v 1.8 2007/12/08 23:51:19 dirtyepic Exp $
 
 inherit wxwidgets flag-o-matic fdo-mime gnome2-utils
 
@@ -66,7 +66,7 @@ src_install() {
 	install -m 644 "${S}"/art/xchmdoc-128.xpm \
 		"${D}"/usr/share/icons/hicolor/128x128/mimetypes/application-x-chm.xpm
 	insinto /usr/share/applications
-	newins "${FILESDIR}"/${P}.desktop ${PN}.desktop
+	doins "${FILESDIR}"/xchm.desktop
 }
 
 pkg_postinst() {