Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 95 insertions, 6 deletions

diff --git a/app-text/xchm/ChangeLog b/app-text/xchm/ChangeLog
index 9f73aaf5e727..3c8357b2c947 100644
--- a/app-text/xchm/ChangeLog
+++ b/app-text/xchm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xchm
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.7 2009/04/14 21:59:24 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.8 2009/05/16 22:10:38 dirtyepic Exp $
+
+*xchm-1.16 (16 May 2009)
+
+  16 May 2009; Ryan Hill <dirtyepic@gentoo.org> +xchm-1.16.ebuild,
+  +files/xchm-1.16-gcc44.patch:
+  Version bump.
 
 *xchm-1.15 (14 Apr 2009)
 
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 09a13341214b..b9cbfcc2c0c2 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xchm-1.16-gcc44.patch 444 RMD160 c049dc606d0da97e3be07ef5ed61db7bb7bd6216 SHA1 d03a427b6b7579216303d82f3c1e6be3409e97fa SHA256 c38ffbd271dc49630d9265279b3c34044f1cd0fbb48b86d78603a813ab8a6f19
 AUX xchm.desktop 252 RMD160 f1e0a2c6c2cea3ee4d3c6cb5e2abb0c1c7d87476 SHA1 8494001d98d6d89be90b776f309c77d509477e08 SHA256 1c6ef7fbae93b80e36acacfb584b60808fb348e924a4d8156be2006fea0c1e3e
 AUX xchm.xml 257 RMD160 15a32737d412ecab29d6ea2c158759160987341f SHA1 959f4783bba46291b73d375735389686b2677c12 SHA256 e599df84873a55522b9dba4db06393d76084dd7657690d4d7bf5b0aa76803955
 DIST xchm-1.14.tar.gz 394735 RMD160 d0dafab82c5f99cecc2eaab94bdabc873428534e SHA1 e3f8aa469e403cc4de64646e79a69f5e442fddc9 SHA256 3c58152a83b12a395fe2e79bce9d4281f2ad9c19350e6750e72abba52282a83f
 DIST xchm-1.15.tar.gz 401691 RMD160 650b75f0c778b019c608b6bb7667c043512b95ea SHA1 8fd992e66e5cb777bf7ebb5418a4a6a94b028ef0 SHA256 9b42be067cf79f4c768ee78c711b8b26a6648535b3589d6cf74265577882cb6b
+DIST xchm-1.16.tar.gz 401586 RMD160 4610fff7a73264bc839213916ea3e238677950e0 SHA1 6d5291a6fd5dafcf8fb6e1120c9f3460b8a2bc1c SHA256 e1350eeb37f7b1069a8f4ab2eed88545a8a800954d57c028d1af11fc6c852ffe
 EBUILD xchm-1.14.ebuild 1258 RMD160 5fde93a64d37ab4f69e80e09a19e98f063ee91b1 SHA1 eecc6d011f02912d1cdc8ab3a3d2efe19ce28fda SHA256 da3ba2cd47e9a2d7df788d3d6d123c9e74e7f3aa2ddaa96faff2bb744068b866
 EBUILD xchm-1.15.ebuild 1261 RMD160 1f2696393ae0d15f94d45fe8e97bab189c5e8752 SHA1 e1b1d7e1725162902b0791029fbdd6505186bd7b SHA256 71c9ffdbb16bb844173ef24bdfae7154ddbf78cbe9ff4d7b374b57bf469fb112
-MISC ChangeLog 10834 RMD160 5890a26b5feda47295fbc29733665661d075f47a SHA1 085bd671bfdff9df8460f8f7e96322ff0385d651 SHA256 e308cc7ef8852fddf1a29495a0e5aa7433557c3719908efba67187beaa08bb88
+EBUILD xchm-1.16.ebuild 1318 RMD160 bd53e9f2678eedceed168bdc400aa28d664cf3a2 SHA1 cda4c4627a842bfcdf146bc404c9437d36c6de23 SHA256 e5d35ecfca5be4d6cf75e97d1e2cf6db151a90b5310438ca83e5c92a201b377b
+MISC ChangeLog 10976 RMD160 6da517e80d16433782736b86c5a791f94843751c SHA1 1c7a338f57a21fc787ee6cd71d9a5ed943da3329 SHA256 6914463eb2211ee473a9148fe868111916ac4aadd1fa55c39e0d27c973c448e1
 MISC metadata.xml 258 RMD160 9ac4d74e8cfb7c4d3b9bab9676a52755968bec01 SHA1 4c7b059fc8a6d9d81360e4ac132c2db306fe8cb4 SHA256 b66f1a4d91cfec01c1815b4a14ea1f77ca7381508d2d2a2c9349877c3ea5e533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknlB7IACgkQiqiDRvmkBmJ8lwCfePbYD3h/ef9J0vOVf/7IaPmK
-YUIAoMp1hTcXKpMC/hpf8nArqzAJPLqf
-=EpzZ
+iEYEARECAAYFAkoPOoUACgkQiqiDRvmkBmJ/rACgtE+90IdSERFtt37PU5Vn5kiJ
+NysAn3N+ZhIOUnRa9vbt08OxlNMXhx2r
+=V2f6
 -----END PGP SIGNATURE-----
diff --git a/app-text/xchm/files/xchm-1.16-gcc44.patch b/app-text/xchm/files/xchm-1.16-gcc44.patch
new file mode 100644
index 000000000000..49b5483ea5ce
--- /dev/null
+++ b/app-text/xchm/files/xchm-1.16-gcc44.patch
@@ -0,0 +1,22 @@
+https://sourceforge.net/tracker/?func=detail&aid=2792822&group_id=87007&atid=581690
+
+--- xchm-1.16-orig/src/bitfiddle.inl
++++ xchm-1.16/src/bitfiddle.inl
+@@ -22,6 +22,7 @@
+ */
+ 
+ 
++#include <stdint.h>
+ #include <wx/string.h>
+ 
+ 
+--- xchm-1.16-orig/src/chmfile.h
++++ xchm-1.16/src/chmfile.h
+@@ -24,6 +24,7 @@
+ #define __CHMFILE_H_
+ 
+ #include <config.h>
++#include <stdint.h>
+ #include <chm_lib.h>
+ #include <wx/filefn.h>
+ #include <wx/string.h>
diff --git a/app-text/xchm/xchm-1.16.ebuild b/app-text/xchm/xchm-1.16.ebuild
new file mode 100644
index 000000000000..5e98701e4f60
--- /dev/null
+++ b/app-text/xchm/xchm-1.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.16.ebuild,v 1.1 2009/05/16 22:10:38 dirtyepic Exp $
+
+EAPI=2
+
+WX_GTK_VER="2.8"
+
+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"
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:2.8"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	append-flags -fno-strict-aliasing
+}
+
+src_configure() {
+	econf ${myconf} \
+		$(use_enable nls) \
+		|| die "econf 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
+}