# ChangeLog for app-text/kchmviewer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.32 2010/05/17 10:25:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.33 2010/05/17 10:28:39 pva Exp $
+
+ 17 May 2010; Peter Volkov <pva@gentoo.org>
+ -files/kchmviewer-3.1_p2-gcc43.patch, -kchmviewer-4.1.ebuild,
+ -kchmviewer-4.2.ebuild:
+ Drop old.
*kchmviewer-5.2 (17 May 2010)
-AUX kchmviewer-3.1_p2-gcc43.patch 496 RMD160 597af1509a949d6710ac63878a46851d774c4424 SHA1 d1aae7dbc5ac1d87d364ef58de857a9a1f90e0d2 SHA256 6157ab84b0cd46814eb2b667c546d2a15a22cc7df760c7000e6f52c3f4cf86dd
-DIST kchmviewer-4.1.tar.gz 257818 RMD160 d07546fda972082d51fccb4c3f98f61dabd30036 SHA1 ffb057fb3d614c8cbaf4a7d178aeb1a33d9b0397 SHA256 98977b167466003af1d2b4bf87aa4b8cfcdad6458712f2c06ecd58d4cf191fd3
-DIST kchmviewer-4.2.tar.gz 260935 RMD160 30a35419a9886acf64e9bea3dfbf786e54301068 SHA1 1f9e58311c96ce13d936a490a200a59bd2257874 SHA256 d24507ec25c3d5ab865150b194aa29921b370b54820768014747b8b3701715a3
DIST kchmviewer-5.1.tar.gz 263934 RMD160 381f946f58461540f8f87fe4f398e3bd06b8b900 SHA1 465ae7864d7b2f58036043232161a86e80d35350 SHA256 a1ed61f35e35432d23fb98d9d11bf6755ff388d45571436bb3cadb8c08ecb38f
DIST kchmviewer-5.2.tar.gz 283874 RMD160 596ecd96c94f1a33c180869ec91b5e774e1f5e12 SHA1 bba7c5ff141e224cbbcc306f8c07d08708ec386f SHA256 4b5054baa7dc7a5969c64eb7dec860c335f0e3603bf96688f3b121908a20c947
-EBUILD kchmviewer-4.1.ebuild 2187 RMD160 a5f40bdebfaefa622cb888e233b971b57a8a4bed SHA1 ac30de37696a6eabc2d1af620bc571b0efc85f58 SHA256 f394011c3087c1f2788cbafe2416220620abef3ee78758dc9646900e5ee47c87
-EBUILD kchmviewer-4.2.ebuild 2186 RMD160 470f485605c04d614ff15c773348f84a3745f8ff SHA1 babdc2acd1766ca18ad6c51da45d57b20ee7f0cd SHA256 4704028bcd5076889942e8af11302efe2fae050a476254a908f8238c2b05e1d3
EBUILD kchmviewer-5.1.ebuild 1905 RMD160 782beed3b9ad29d083ed77198cbe9722fcd5b713 SHA1 94de1b16da43d020894bddf5d4e3c2ec77fb6567 SHA256 608c20832d82e62a41e81e65500e9a4998c240917062e1f5f627c30f524b2621
EBUILD kchmviewer-5.2.ebuild 1905 RMD160 56a50729192adae661a6c18fd6ef6fec0de85520 SHA1 cd79d9d9aaac47e96c896d994fbd0684440b532a SHA256 faef7177fa7ddb836665b6b1486aec6527688f5726753b491c16b75dcd07c95d
-MISC ChangeLog 10679 RMD160 8c523bf310523f5b13f9fd6417a351931bda7fb3 SHA1 e6887c3b92939199d5bc3fb1a0fb382bc12a2250 SHA256 47de4671ee0b57a7b709e10991536cb9d3a12815da6b26b328fd0ec47e37e0dd
+MISC ChangeLog 10827 RMD160 36c0d178f59ffa8b9c5b061888bbd253c355c894 SHA1 006ef375eeecf6b5eca03b100e91c3e10cfc967a SHA256 98885f46381b889ac410980b04ac91cf596dae5830d509b0a10ba179c7670846
MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
+++ /dev/null
-diff -urNad kchmviewer-3.1.orig/lib/libchmfile/libchmfileimpl.h kchmviewer-3.1/lib/libchmfile/libchmfileimpl.h
---- kchmviewer-3.1.orig/lib/libchmfile/libchmfileimpl.h 2008-04-09 17:33:13.000000000 +0100
-+++ kchmviewer-3.1/lib/libchmfile/libchmfileimpl.h 2008-04-09 17:33:59.000000000 +0100
-@@ -25,6 +25,8 @@
- #include "libchmfile.h"
- #include "libchmtocimage.h"
-
-+#include <sys/types.h> /* for u_int{32,64}_t */
-+
- //! Keeps the intermediate search result
- class LCHMSearchProgressResult
- {
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.1.ebuild,v 1.2 2009/11/16 22:03:16 maekke Exp $
-
-EAPI="2"
-KDE_REQUIRED="never"
-inherit fdo-mime qt4 kde4-base
-
-MY_P="${PN}-${PV/_beta/beta}"
-
-DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="kde"
-
-RDEPEND="dev-libs/chmlib
- x11-libs/qt-dbus:4
- x11-libs/qt-webkit:4
- !kde? ( x11-libs/qt-gui:4
- x11-libs/qt-qt3support:4 )
- kde? ( >=kde-base/kdelibs-4.1
- !kde-base/okular[chm] )"
-DEPEND="${RDEPEND}
- kde? ( dev-util/cmake )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use kde; then
- kde4-base_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \
- -i lib/kio-msits/CMakeLists.txt
- sed "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" -i src/kde/CMakeLists.txt
- sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
- -e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
- -i src/CMakeLists.txt
- echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
-}
-
-src_configure() {
- if use kde; then
- kde4-base_src_configure
- else
- eqmake4
- fi
-}
-
-src_compile() {
- if use kde; then
- kde4-base_src_compile
- else
- emake || die
- fi
-}
-
-src_test() {
- einfo "No tests exist."
-}
-
-src_install() {
- if use kde; then
- kde4-base_src_install
- else
- dobin bin/kchmviewer || die "dobin kchmviewer failed"
- newmenu src/kde/kchmviewer.desktop kchmviewer.desktop
- dodoc ChangeLog README || die
- fi
- # install icons in hicolor since it's fallback in kde irrespectively of
- # ICON_INSTALL_DIR (this is really strange...)
- for size in 48 64 128; do
- insinto /usr/share/icons/hicolor/${size}x${size}/apps && \
- newins src/kde/cr${size}-app-kchmviewer.png kchmviewer.png || die
- done
- dodoc "${S}"/{DBUS-bindings,FAQ} || die
-}
-
-pkg_postinst() {
- use kde && kde4-base_pkg_postinst
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- use kde && kde4-base_pkg_postrm
- fdo-mime_desktop_database_update
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.2.ebuild,v 1.4 2010/01/07 15:35:06 josejx Exp $
-
-EAPI="2"
-KDE_REQUIRED="never"
-inherit fdo-mime qt4 kde4-base
-
-MY_P="${PN}-${PV/_beta/beta}"
-
-DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="kde"
-
-RDEPEND="dev-libs/chmlib
- x11-libs/qt-dbus:4
- x11-libs/qt-webkit:4
- !kde? ( x11-libs/qt-gui:4
- x11-libs/qt-qt3support:4 )
- kde? ( >=kde-base/kdelibs-4.1
- !kde-base/okular[chm] )"
-DEPEND="${RDEPEND}
- kde? ( dev-util/cmake )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use kde; then
- kde4-base_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \
- -i lib/kio-msits/CMakeLists.txt
- sed "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" -i src/kde/CMakeLists.txt
- sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
- -e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
- -i src/CMakeLists.txt
- echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
-}
-
-src_configure() {
- if use kde; then
- kde4-base_src_configure
- else
- eqmake4
- fi
-}
-
-src_compile() {
- if use kde; then
- kde4-base_src_compile
- else
- emake || die
- fi
-}
-
-src_test() {
- einfo "No tests exist."
-}
-
-src_install() {
- if use kde; then
- kde4-base_src_install
- else
- dobin bin/kchmviewer || die "dobin kchmviewer failed"
- newmenu src/kde/kchmviewer.desktop kchmviewer.desktop
- dodoc ChangeLog README || die
- fi
- # install icons in hicolor since it's fallback in kde irrespectively of
- # ICON_INSTALL_DIR (this is really strange...)
- for size in 48 64 128; do
- insinto /usr/share/icons/hicolor/${size}x${size}/apps && \
- newins src/kde/cr${size}-app-kchmviewer.png kchmviewer.png || die
- done
- dodoc "${S}"/{DBUS-bindings,FAQ} || die
-}
-
-pkg_postinst() {
- use kde && kde4-base_pkg_postinst
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- use kde && kde4-base_pkg_postrm
- fdo-mime_desktop_database_update
-}