xchm

(Portage version: 2.2_pre8/cvs/Linux 2.6.25-gentoo-r5 x86_64)

4 files changed, 5 insertions, 162 deletions

diff --git a/app-text/xchm/ChangeLog b/app-text/xchm/ChangeLog
index 160cec5eb3c0..6c7e5d33e951 100644
--- a/app-text/xchm/ChangeLog
+++ b/app-text/xchm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2008/06/18 07:57:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.5 2008/06/19 03:19:24 dirtyepic Exp $
+
+  19 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  -files/xchm-1.13-gcc-4.3.patch, -xchm-1.13.ebuild, -xchm-1.13-r1.ebuild:
+  xchm
 
   18 Jun 2008; Christian Faulhammer <opfer@gentoo.org> xchm-1.14.ebuild:
   stable x86, bug 226451
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
deleted file mode 100644
index d5035b560a07..000000000000
--- a/app-text/xchm/files/xchm-1.13-gcc-4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/xchm-1.13-r1.ebuild b/app-text/xchm/xchm-1.13-r1.ebuild
deleted file mode 100644
index c25cece87b1b..000000000000
--- a/app-text/xchm/xchm-1.13-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
deleted file mode 100644
index 3ea70f91242c..000000000000
--- a/app-text/xchm/xchm-1.13.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
-}