Use check_wxuse. Remove old.

(Portage version: 2.1.3_rc9)

4 files changed, 7 insertions, 70 deletions

diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index dda745f72305..6203fbf71f9a 100644
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2007/07/19 13:53:28 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.54 2007/07/30 02:31:07 dirtyepic Exp $
+
+  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
diff --git a/x11-misc/xchm/files/digest-xchm-1.9 b/x11-misc/xchm/files/digest-xchm-1.9
deleted file mode 100644
index 3d725cf78055..000000000000
--- a/x11-misc/xchm/files/digest-xchm-1.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12e1faf49447c743c5c936636cd8a172 xchm-1.9.tar.gz 358932
-RMD160 9c98b903850d05d703656e3311fd7e7c79a016fd xchm-1.9.tar.gz 358932
-SHA256 75e53dedb638ba9eb2efc08e5a8a2e20a4d13b86ea47d9bfa6601d6b9f39ca3b xchm-1.9.tar.gz 358932
diff --git a/x11-misc/xchm/xchm-1.13.ebuild b/x11-misc/xchm/xchm-1.13.ebuild
index 5dc88bda2f66..9cbf1742da39 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.5 2007/07/19 13:53:28 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.13.ebuild,v 1.6 2007/07/30 02:31:07 dirtyepic Exp $
 
 inherit wxwidgets flag-o-matic fdo-mime gnome2-utils
 
@@ -22,6 +22,7 @@ src_compile() {
 	export WX_GTK_VER="2.6"
 
 	if use unicode; then
+		check_wxuse unicode
 		need-wxwidgets unicode
 	else
 		need-wxwidgets gtk2
diff --git a/x11-misc/xchm/xchm-1.9.ebuild b/x11-misc/xchm/xchm-1.9.ebuild
deleted file mode 100644
index c8ee9c2b7654..000000000000
--- a/x11-misc/xchm/xchm-1.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.9.ebuild,v 1.5 2007/01/14 09:34:59 josejx Exp $
-
-inherit wxwidgets
-
-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="unicode"
-DEPEND=">=app-doc/chmlib-0.31
-	=x11-libs/wxGTK-2.6*"
-
-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 AUTHORS README
-
-	# 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
-}