xchm

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25-gentoo-r5 x86_64

5 files changed, 9 insertions, 170 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/Manifest b/app-text/xchm/Manifest
index ca463ca518b7..49e9550b71c9 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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 1258 RMD160 5fde93a64d37ab4f69e80e09a19e98f063ee91b1 SHA1 eecc6d011f02912d1cdc8ab3a3d2efe19ce28fda SHA256 da3ba2cd47e9a2d7df788d3d6d123c9e74e7f3aa2ddaa96faff2bb744068b866
-MISC ChangeLog 10582 RMD160 e42f53c24735d6a76110265df768e43ea4c00ba1 SHA1 71bcc43588a633e246b07508551966882cc6f707 SHA256 25abc9a3555e50081f5487f8b4b8e692d43abe470fb6a53ea988c4174e556fd4
+MISC ChangeLog 10717 RMD160 056cbeab8b9a49d131ff272fa64f1208b3df8558 SHA1 4bfab1622ed85885cc5b05ba5d3e860d934fe03e SHA256 eb8869d33c0f28f336a8dae0690f8dc7513d4c914b6b0fdafbac25f494c0f602
 MISC metadata.xml 258 RMD160 9ac4d74e8cfb7c4d3b9bab9676a52755968bec01 SHA1 4c7b059fc8a6d9d81360e4ac132c2db306fe8cb4 SHA256 b66f1a4d91cfec01c1815b4a14ea1f77ca7381508d2d2a2c9349877c3ea5e533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhYv+EACgkQNQqtfCuFneNASQCgkLgolj2udqCDjbV1x73s3AIG
-4G0An0hBWd9LDXRLPrWO34ajV9oAnURX
-=rv6R
+iEYEARECAAYFAkhZ0EUACgkQiqiDRvmkBmLFDwCfZuCjwuV2KxYtFk3I4ZwSJxZE
+r10AoKPDzLm8MpVymtQ61j4XMEkJjsaw
+=B3sT
 -----END PGP SIGNATURE-----
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
-}