Version bump, see bug #129338.

Package-Manager: portage-2.1_pre7-r5

6 files changed, 89 insertions, 43 deletions

diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index 02c220a7f0ba..a6080bbdb731 100644
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xchm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.35 2006/02/17 19:45:27 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.36 2006/04/14 17:40:53 nelchael Exp $
+
+*xchm-1.7.1 (14 Apr 2006)
+
+  14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xchm-0.9.6.ebuild,
+  +xchm-1.7.1.ebuild:
+  Version bump, see bug #129338.
 
   17 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> xchm-1.2.ebuild:
   Stable on ppc.
diff --git a/x11-misc/xchm/Manifest b/x11-misc/xchm/Manifest
index fdc3af99bac6..b50d6b13649e 100644
--- a/x11-misc/xchm/Manifest
+++ b/x11-misc/xchm/Manifest
@@ -1,27 +1,27 @@
-MD5 f6b2feedd4403640aaae9d3c328008de ChangeLog 6090
-RMD160 8e26a9ca647eb20be2da3b3be6432f6e8aac928d ChangeLog 6090
-SHA256 825e7193276e75f57b9fec79774d1e70d59765462ac628d5e39d78f75c8e4fd1 ChangeLog 6090
-MD5 1333608642124dbc0be70c60e627fd9c files/digest-xchm-0.9.6 127
-RMD160 e3965d914d55f88d77f5a0b130d3e061a3095def files/digest-xchm-0.9.6 127
-SHA256 38984e8cce097f5dafdf7795c93603cc69de2a84abbe9155c51a68a78c1847c4 files/digest-xchm-0.9.6 127
+MD5 4363433624f6e1dba8ac561df5e7eb35 ChangeLog 6248
+RMD160 7988e30ab2a5dc3ea43d34513134d060c0a9aa52 ChangeLog 6248
+SHA256 567baa103ab78ded88d82c9afb658d00145e836cdc13e29bc4dab706c26e06fc ChangeLog 6248
 MD5 db39728e8cfb6b902e3ada54e924206b files/digest-xchm-1.2 124
 RMD160 98ecaf5901ac630a451732de0be1cc591a294849 files/digest-xchm-1.2 124
 SHA256 f30007c81a68e6ef7906c9f35f09efdef9d818d76eb105a8f57ac3f99f41f6b8 files/digest-xchm-1.2 124
 MD5 3c203d861fb03ba41c23adcee83e567d files/digest-xchm-1.3 464
 RMD160 71e1789645a2f225ec34f2b9d05c7793186ff04f files/digest-xchm-1.3 464
 SHA256 53a000e557e88695e12d07ca7ed8ae120e49e8dc4360dbe2a8671abf206eb039 files/digest-xchm-1.3 464
+MD5 a73212aa902a5b53dcfe0d4a9db094f3 files/digest-xchm-1.7.1 232
+RMD160 e88ebce679f98a2af50ff3688f5239babd604ce0 files/digest-xchm-1.7.1 232
+SHA256 9961c21f78baeeb459a130d80c279532b7639f2edf298ae2eff951112055737a files/digest-xchm-1.7.1 232
 MD5 60f1cc5854ad424377cb2bc44b9bd719 files/xchm-gcc41.patch 498
 RMD160 2f5f0788caab0d498d606703bf2ca3f695fbb384 files/xchm-gcc41.patch 498
 SHA256 e1c5adb5f049a8aa7319119c228e33a10b42fa0f2267e8aa79ee5a19953cce86 files/xchm-gcc41.patch 498
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata.xml 173
-MD5 4bd657172a43706d09cd05da0d86529e xchm-0.9.6.ebuild 712
-RMD160 5b27a76f10bbcd4a1180f856db2b172a0673b486 xchm-0.9.6.ebuild 712
-SHA256 218302c72964a6b180b05c7c8494c21c7736b3afc948640bbe322165bc2304ec xchm-0.9.6.ebuild 712
 MD5 c0926e4e2618c0547fab737ae8c139c9 xchm-1.2.ebuild 2293
 RMD160 9f4b6d8c43f526f901d0c56372a27e86edaeb9c7 xchm-1.2.ebuild 2293
 SHA256 a0dfb50b5c588a70cfdb05d30d7ebd3c51b8a18cd3622b2a6c514216f00fb175 xchm-1.2.ebuild 2293
 MD5 f5392af167cdfe8567fd73318e4eb2f6 xchm-1.3.ebuild 2194
 RMD160 5c986d3cac4e53d66bc26a02368a2bc6f7075376 xchm-1.3.ebuild 2194
 SHA256 e4b018646cc14ebeeb20b243f1b47ad44fc3915ac187cfd89fb6ebe673a80946 xchm-1.3.ebuild 2194
+MD5 718708047f628c2cfb024eb9f311e226 xchm-1.7.1.ebuild 2140
+RMD160 a2e11a8e2e67b52004e5232df679acf8f6455b46 xchm-1.7.1.ebuild 2140
+SHA256 8ce844f5401a82e586445c98e25baccac717c6ff6715a7f55176e76b7dd04c40 xchm-1.7.1.ebuild 2140
diff --git a/x11-misc/xchm/files/digest-xchm-0.9.6 b/x11-misc/xchm/files/digest-xchm-0.9.6
deleted file mode 100644
index 245b2a1759ec..000000000000
--- a/x11-misc/xchm/files/digest-xchm-0.9.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 68afb42cf0e547541ffdbdf62885c40c xchm-0.9.6.tar.gz 319726
-MD5 f7c4d617249e83409a79cdbf94f53a32 xchm-0.9.6-doc.tar.gz 75882
diff --git a/x11-misc/xchm/files/digest-xchm-1.7.1 b/x11-misc/xchm/files/digest-xchm-1.7.1
new file mode 100644
index 000000000000..8ebddb2b2e8c
--- /dev/null
+++ b/x11-misc/xchm/files/digest-xchm-1.7.1
@@ -0,0 +1,3 @@
+MD5 e9006ce834cce7dd7e0481049a366c48 xchm-1.7.1.tar.gz 353728
+RMD160 56e321a257597782347764ea390683308e5a2fc0 xchm-1.7.1.tar.gz 353728
+SHA256 21fce2806a2f348e12596ca795a2cff9241053cdbe3ddd2ac7e2e442102ac2c4 xchm-1.7.1.tar.gz 353728
diff --git a/x11-misc/xchm/xchm-0.9.6.ebuild b/x11-misc/xchm/xchm-0.9.6.ebuild
deleted file mode 100644
index edce15116cba..000000000000
--- a/x11-misc/xchm/xchm-0.9.6.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-0.9.6.ebuild,v 1.4 2005/11/01 13:08:39 nelchael 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 AUTHORS README
-
-	if use doc; then
-	cd ${S}"-doc"
-	dohtml html/*
-	fi
-}
diff --git a/x11-misc/xchm/xchm-1.7.1.ebuild b/x11-misc/xchm/xchm-1.7.1.ebuild
new file mode 100644
index 000000000000..90a8ad5373bc
--- /dev/null
+++ b/x11-misc/xchm/xchm-1.7.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.7.1.ebuild,v 1.1 2006/04/14 17:40:53 nelchael 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.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 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
+}