Version bump.

"xCHM is now the first non-MS CHM viewer able to parse and use the binary table
of contents and index files inside CHM books. Upgrading to 1.11 is strongly
recommended, as this version loads CHMs way faster, and it also fixes a couple
of bugs."

Cleaned up the ebuild and added an nls USE flag.  Removed old version.
Package-Manager: portage-2.1.2.2

diff --git a/x11-misc/xchm/ChangeLog b/x11-misc/xchm/ChangeLog
index d2570973559d118f6c2a087e9ef5de07ef385d4d..ca46d41150c488764425a11926ccaba9c65e52bf 100644 (file)
--- a/x11-misc/xchm/ChangeLog
+++ b/x11-misc/xchm/ChangeLog
@@ -1,6 +1,19 @@
 # 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.47 2007/03/10 04:34:14 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/ChangeLog,v 1.48 2007/03/24 01:34:04 dirtyepic Exp $
+
+*xchm-1.11 (24 Mar 2007)
+
+  24 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> -files/xchm-gcc41.patch,
+  -xchm-1.2.ebuild, +xchm-1.11.ebuild:
+  Version bump.
+  
+  "xCHM is now the first non-MS CHM viewer able to parse and use the binary table
+  of contents and index files inside CHM books. Upgrading to 1.11 is strongly
+  recommended, as this version loads CHMs way faster, and it also fixes a couple
+  of bugs."
+  
+  Cleaned up the ebuild and added an nls USE flag.  Removed old version.
 
   10 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Add myself as co-maintainer.

diff --git a/x11-misc/xchm/Manifest b/x11-misc/xchm/Manifest
index e3c66ccb2d22a3fd6e569fdffb595dca7a18e996..d9fbf9c24bcd92b1e468b11987f367c0a02b5d32 100644 (file)
--- a/x11-misc/xchm/Manifest
+++ b/x11-misc/xchm/Manifest
@@ -1,27 +1,22 @@
-AUX xchm-gcc41.patch 498 RMD160 2f5f0788caab0d498d606703bf2ca3f695fbb384 SHA1 1c59286b4804f6c3c2a59a3cd41b3d9f6976e472 SHA256 e1c5adb5f049a8aa7319119c228e33a10b42fa0f2267e8aa79ee5a19953cce86
-MD5 60f1cc5854ad424377cb2bc44b9bd719 files/xchm-gcc41.patch 498
-RMD160 2f5f0788caab0d498d606703bf2ca3f695fbb384 files/xchm-gcc41.patch 498
-SHA256 e1c5adb5f049a8aa7319119c228e33a10b42fa0f2267e8aa79ee5a19953cce86 files/xchm-gcc41.patch 498
 DIST xchm-1.10.tar.gz 371871 RMD160 b7f556c4755cb1aa5097e4865e07404af8b4c203 SHA1 bc9c8b347c877f4983c825737ba3e7a7dab6b125 SHA256 dbed9ed4df515f4035c8c881ff72203cbc1ef697640eeb876267be469343a524
-DIST xchm-1.2-doc.tar.gz 109173 RMD160 0a571258f43f6eb322606223aa79db452587096b SHA1 53c02f0aa4ff1f2bed898668a40b411fafcfa5b2 SHA256 53e8cba5814ef2e17df4503480155eff15af275aa3cb1d815f1fab2beb785b4b
-DIST xchm-1.2.tar.gz 334678 RMD160 ffdae1ef452834524bfbc083f77a47c9e2245d44 SHA1 b26afd7ad834123670de99340989da209a6107fc SHA256 0f75142cdc17f892e1f58e447d6ca4b3dcc033d77b159faaa28c967bb123aede
+DIST xchm-1.11.tar.gz 391284 RMD160 081d97e5a2eb3ca47594534f08301a9fc1c99914 SHA1 7ae2712433d4c323dcf43c2d9e7d2d661b11fcd5 SHA256 d463600b3b898069ef45b8bf3a0eca3d86a85666444789ca7aa17c4bdafaa5bd
 DIST xchm-1.9.tar.gz 358932 RMD160 9c98b903850d05d703656e3311fd7e7c79a016fd SHA1 c362f63584b2f693bb8903a3633cc70258f2985d SHA256 75e53dedb638ba9eb2efc08e5a8a2e20a4d13b86ea47d9bfa6601d6b9f39ca3b
 EBUILD xchm-1.10.ebuild 2085 RMD160 13f45a4f0e41fecf36ad9ec97ef855badfe047bd SHA1 47bfc83f41dc63e5b9fe377ee537e05426cd8592 SHA256 03811c8ab99594fe6e22976bd56f3c99e9c485ae7b023544e061a5026ecf57ff
 MD5 61f25ea98ebd2ae706ed0f3509467a88 xchm-1.10.ebuild 2085
 RMD160 13f45a4f0e41fecf36ad9ec97ef855badfe047bd xchm-1.10.ebuild 2085
 SHA256 03811c8ab99594fe6e22976bd56f3c99e9c485ae7b023544e061a5026ecf57ff xchm-1.10.ebuild 2085
-EBUILD xchm-1.2.ebuild 2294 RMD160 3a076fd0177826f9bf1eeeaabb19b723bee77beb SHA1 f4bd52f5274fa75997599ec14e3f753ecd1bfce3 SHA256 c62bbe5c4d6fe5f43c7d433512f40f74c8c6586a4663994245068a885521e317
-MD5 9149422078a5f313af3aa637ca87bf83 xchm-1.2.ebuild 2294
-RMD160 3a076fd0177826f9bf1eeeaabb19b723bee77beb xchm-1.2.ebuild 2294
-SHA256 c62bbe5c4d6fe5f43c7d433512f40f74c8c6586a4663994245068a885521e317 xchm-1.2.ebuild 2294
+EBUILD xchm-1.11.ebuild 2197 RMD160 f00f1e7470301ddfc2fbbcf4639bb3e30da0d183 SHA1 6833c1906716c75fe07b5c50e97281c30bcb695e SHA256 ff84ace87228021d2d8e56230dc7e6cd295cd3a5f59c6a25148f8544e043681a
+MD5 eed9c8f5e2fffcec802e6ff50a4d3c87 xchm-1.11.ebuild 2197
+RMD160 f00f1e7470301ddfc2fbbcf4639bb3e30da0d183 xchm-1.11.ebuild 2197
+SHA256 ff84ace87228021d2d8e56230dc7e6cd295cd3a5f59c6a25148f8544e043681a xchm-1.11.ebuild 2197
 EBUILD xchm-1.9.ebuild 2076 RMD160 08e23408d40d24e88ae64f11a56c067c90b3bc75 SHA1 b5461574b0150c9f6b5f6a9bd65bb1fff5cfae24 SHA256 773ebe57cf1f91df24614d73d7f96f9af081d3223b02101fd7d03cba130d75a9
 MD5 56ef8c2fd4e15141d2abd544585aea20 xchm-1.9.ebuild 2076
 RMD160 08e23408d40d24e88ae64f11a56c067c90b3bc75 xchm-1.9.ebuild 2076
 SHA256 773ebe57cf1f91df24614d73d7f96f9af081d3223b02101fd7d03cba130d75a9 xchm-1.9.ebuild 2076
-MISC ChangeLog 7522 RMD160 57cbed7415cc09be34cc779c7494924aacd036cc SHA1 6a610546f41209dbab16d6dc1ba750fb80ee98ca SHA256 ea38bfa7cd94abca47bcfa97af392d50076a38223de361a0cca5c49cbe095ad9
-MD5 4575974fa65958e2c59c17e55d346e32 ChangeLog 7522
-RMD160 57cbed7415cc09be34cc779c7494924aacd036cc ChangeLog 7522
-SHA256 ea38bfa7cd94abca47bcfa97af392d50076a38223de361a0cca5c49cbe095ad9 ChangeLog 7522
+MISC ChangeLog 8009 RMD160 0d1bfe558c9d27faa584b58c01b653d4e121e22b SHA1 e6c51192725f4aa89c4c317df2e4775c47970663 SHA256 fa2e92e328177bbf542d3d2e6f658463a769246b040c38f380a6010e9a77b342
+MD5 fc0a4fcf43646006afede8b5156dceb5 ChangeLog 8009
+RMD160 0d1bfe558c9d27faa584b58c01b653d4e121e22b ChangeLog 8009
+SHA256 fa2e92e328177bbf542d3d2e6f658463a769246b040c38f380a6010e9a77b342 ChangeLog 8009
 MISC metadata.xml 258 RMD160 9ac4d74e8cfb7c4d3b9bab9676a52755968bec01 SHA1 4c7b059fc8a6d9d81360e4ac132c2db306fe8cb4 SHA256 b66f1a4d91cfec01c1815b4a14ea1f77ca7381508d2d2a2c9349877c3ea5e533
 MD5 b3eaea0776f1bc5e23ac048a309415e5 metadata.xml 258
 RMD160 9ac4d74e8cfb7c4d3b9bab9676a52755968bec01 metadata.xml 258
@@ -29,9 +24,9 @@ SHA256 b66f1a4d91cfec01c1815b4a14ea1f77ca7381508d2d2a2c9349877c3ea5e533 metadata
 MD5 392ebf9b5726e8cdbc3ee52d7211fe93 files/digest-xchm-1.10 229
 RMD160 7a3f51617a42126845f8979a235228783b37cc97 files/digest-xchm-1.10 229
 SHA256 ce81dee3b75452e4a3f8b21b8f2a0d08487e8b80abd411992c6b5e65a71e086d files/digest-xchm-1.10 229
-MD5 eb34997a38ebfa2a72a71691fc7c0b93 files/digest-xchm-1.2 464
-RMD160 866741eae40b47cb89342ae785fae4fdd88c6497 files/digest-xchm-1.2 464
-SHA256 ad1dbd5d2dab3d1da4058e90fa3913bda0e8d07796d0ff4f40327b684093c35b files/digest-xchm-1.2 464
+MD5 218762a92a749ed4d6f5ec8bd4f9e9f0 files/digest-xchm-1.11 229
+RMD160 a0b230dd25fb6bf39a0047b20ed948dc68c2b243 files/digest-xchm-1.11 229
+SHA256 9b7fad6626f9f73e43323282340d0152bf689c8601e509c588a55ff73b0626bb files/digest-xchm-1.11 229
 MD5 a322d4474f6bf3ad510423dcc4685281 files/digest-xchm-1.9 226
 RMD160 cded7f3eb77dac2b487fd6768a63a9164c68e9a7 files/digest-xchm-1.9 226
 SHA256 ab292fbdd9cf3a6069643d4a5b4abdecf85e57fcfb36429888cff67aae14b91b files/digest-xchm-1.9 226

diff --git a/x11-misc/xchm/files/digest-xchm-1.11 b/x11-misc/xchm/files/digest-xchm-1.11
new file mode 100644 (file)
index 0000000..7ab34f6
--- /dev/null
+++ b/x11-misc/xchm/files/digest-xchm-1.11
@@ -0,0 +1,3 @@
+MD5 59610ca44a8434a6909c4b4e944de940 xchm-1.11.tar.gz 391284
+RMD160 081d97e5a2eb3ca47594534f08301a9fc1c99914 xchm-1.11.tar.gz 391284
+SHA256 d463600b3b898069ef45b8bf3a0eca3d86a85666444789ca7aa17c4bdafaa5bd xchm-1.11.tar.gz 391284

diff --git a/x11-misc/xchm/files/digest-xchm-1.2 b/x11-misc/xchm/files/digest-xchm-1.2
deleted file mode 100644 (file)
index bec784d..0000000
--- a/x11-misc/xchm/files/digest-xchm-1.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8499bcafd023293673d9f8b4fd1dc792 xchm-1.2-doc.tar.gz 109173
-RMD160 0a571258f43f6eb322606223aa79db452587096b xchm-1.2-doc.tar.gz 109173
-SHA256 53e8cba5814ef2e17df4503480155eff15af275aa3cb1d815f1fab2beb785b4b xchm-1.2-doc.tar.gz 109173
-MD5 17f2cda873f61470636dbfeebb4a531d xchm-1.2.tar.gz 334678
-RMD160 ffdae1ef452834524bfbc083f77a47c9e2245d44 xchm-1.2.tar.gz 334678
-SHA256 0f75142cdc17f892e1f58e447d6ca4b3dcc033d77b159faaa28c967bb123aede xchm-1.2.tar.gz 334678

diff --git a/x11-misc/xchm/files/xchm-gcc41.patch b/x11-misc/xchm/files/xchm-gcc41.patch
deleted file mode 100644 (file)
index 59a046e..0000000
--- a/x11-misc/xchm/files/xchm-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xchm-1.2-orig/src/chmframe.h xchm-1.2/src/chmframe.h
---- xchm-1.2-orig/src/chmframe.h       2006-01-04 17:40:19.702114632 -0600
-+++ xchm-1.2/src/chmframe.h    2006-01-04 17:41:29.929438456 -0600
-@@ -166,7 +166,7 @@
-       void OnPrint(wxCommandEvent& event);
- 
-       //! Called when the user selects a file from the file history.
--      void CHMFrame::OnHistFile(wxCommandEvent& event);
-+      void OnHistFile(wxCommandEvent& event);
- 
-       //! Called when the user types Ctrl-F.
-       void OnFind(wxCommandEvent& event);

diff --git a/x11-misc/xchm/xchm-1.2.ebuild b/x11-misc/xchm/xchm-1.11.ebuild
similarity index 70%
rename from x11-misc/xchm/xchm-1.2.ebuild
rename to x11-misc/xchm/xchm-1.11.ebuild
index 8b8e6139f7ca6c5c2536bc263fed881b5c12947e..f97205728ae210ce0c4b3995af25b1a9d7c96054 100644 (file)
--- a/x11-misc/xchm/xchm-1.2.ebuild
+++ b/x11-misc/xchm/xchm-1.11.ebuild
@@ -1,56 +1,48 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.2.ebuild,v 1.6 2006/12/31 23:06:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xchm/xchm-1.11.ebuild,v 1.1 2007/03/24 01:34:04 dirtyepic Exp $
 
-inherit eutils wxwidgets
+inherit wxwidgets flag-o-matic
 
 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 )"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="doc unicode"
+IUSE="nls unicode"
 DEPEND=">=app-doc/chmlib-0.31
-       =x11-libs/wxGTK-2.6*"
-
-src_unpack() {
-
-       unpack ${A}
-
-       # Fixes bug #117798:
-       epatch "${FILESDIR}/${PN}-gcc41.patch"
-
-}
+       >=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
+
+       append-flags -fno-strict-aliasing
+
        myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-       econf ${myconf} || die "econf failed"
+
+       econf ${myconf} \
+               $(use_enable nls) \
+               || die "econf failed"
+
        emake || die "emake failed"
 }
 
 src_install() {
-       einstall || die
-       dodoc AUTHORS README
-
-       if use doc; then
-               cd ${S}"-doc"
-               dohtml html/*
-       fi
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS README ChangeLog
 
-       # fixes dekstop and icon problems
-       rm ${D}/usr/share/pixmaps/xchm-*.xpm
-       ${D}/usr/share/pixmaps/xchmdoc-*.xpm
+       # 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 \