#81047 and #91771 fixed

(Portage version: 2.0.51.22-r1)

5 files changed, 80 insertions, 34 deletions

diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index 14ed16a9a511..1291d743ff7a 100644
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xchm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.26 2005/06/14 00:10:02 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.27 2005/06/14 00:43:43 smithj Exp $
+
+*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)
 
diff --git a/x11-misc/xchm/Manifest b/x11-misc/xchm/Manifest
index 194ce2b16069..3d683cc40900 100644
--- a/x11-misc/xchm/Manifest
+++ b/x11-misc/xchm/Manifest
@@ -2,7 +2,7 @@ MD5 153d3959238ee5bd3df4b55cf63fc861 ChangeLog 4789
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 8b8727a304ea575b3bf6b6c9309fe74f xchm-0.9.6.ebuild 718
 MD5 ba76b5174f8b32140aba54f384ac0dad xchm-0.9.8.ebuild 721
-MD5 d54e32abf9f26f0de09febcbedbce048 xchm-1.0.ebuild 718
+MD5 e88030ff73114660c660a47163a9f132 xchm-1.0-r1.ebuild 2031
 MD5 1333608642124dbc0be70c60e627fd9c files/digest-xchm-0.9.6 127
 MD5 37082eeb0165e41ee380fd13e8b0882a files/digest-xchm-0.9.8 128
-MD5 42e73319b72a6c0c603afa32025bc888 files/digest-xchm-1.0 124
+MD5 42e73319b72a6c0c603afa32025bc888 files/digest-xchm-1.0-r1 124
diff --git a/x11-misc/xchm/files/digest-xchm-1.0 b/x11-misc/xchm/files/digest-xchm-1.0-r1
index 0a845e3a181f..0a845e3a181f 100644
--- a/x11-misc/xchm/files/digest-xchm-1.0
+++ b/x11-misc/xchm/files/digest-xchm-1.0-r1
diff --git a/x11-misc/xchm/xchm-1.0-r1.ebuild b/x11-misc/xchm/xchm-1.0-r1.ebuild
new file mode 100644
index 000000000000..59b5403b66db
--- /dev/null
+++ b/x11-misc/xchm/xchm-1.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.0-r1.ebuild,v 1.1 2005/06/14 00:43:43 smithj Exp $
+
+inherit eutils wxwidgets
+
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE="doc unicode"
+DEPEND=">=app-doc/chmlib-0.31
+	>=x11-libs/wxGTK-2.4.0"
+
+src_compile() {
+	local myconf
+	export WX_GTK_VER="2.6"
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc COPYING AUTHORS README
+
+	if use doc; then
+		cd ${S}"-doc"
+		dohtml html/*
+	fi
+
+	# fixes dekstop 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/chm.xpm
+	dodir /usr/share/icons/hicolor/32x32/mimetypes/
+	install -m 644 ${S}/art/xchmdoc-32.xpm \
+		${D}/usr/share/icons/hicolor/32x32/mimetypes/chm.xpm
+	dodir /usr/share/icons/hicolor/48x48/mimetypes/
+	install -m 644 ${S}/art/xchmdoc-48.xpm \
+		${D}/usr/share/icons/hicolor/48x48/mimetypes/chm.xpm
+	dodir /usr/share/icons/hicolor/128x128/mimetypes/
+	install -m 644 ${S}/art/xchmdoc-128.xpm \
+		${D}/usr/share/icons/hicolor/128x128/mimetypes/chm.xpm
+	make_desktop_entry xchm XCHM xchm
+}
diff --git a/x11-misc/xchm/xchm-1.0.ebuild b/x11-misc/xchm/xchm-1.0.ebuild
deleted file mode 100644
index 91a4fb9cdc00..000000000000
--- a/x11-misc/xchm/xchm-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.0.ebuild,v 1.1 2005/06/14 00:10:02 smithj Exp $
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="doc"
-DEPEND=">=app-doc/chmlib-0.31
-	>=x11-libs/wxGTK-2.4.0"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc COPYING AUTHORS README
-
-	if use doc; then
-	cd ${S}"-doc"
-	dohtml html/*
-	fi
-}