New version. Fixes access violations (#95459).

Package-Manager: portage-2.0.51.19

5 files changed, 124 insertions, 12 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index ac4694efdd29..77848a1aa73e 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.1 2005/06/06 06:16:31 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.2 2005/06/09 12:48:33 greg_g Exp $
+
+*kchmviewer-0.9 (09 Jun 2005)
+
+  09 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kchmviewer-0.9-pic.patch, +kchmviewer-0.9.ebuild:
+  New version. Fixes access violations (#95459).
 
   06 Jun 2005; Dominik Stadler <centic@gentoo.org> ChangeLog:
   New package, fixes Bug 91193
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index 829140c3a0cf..3af2d1041d06 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
+MD5 38e82f9b926080c9419c3c8466722127 ChangeLog 493
 MD5 9ceb5dfc5ca9ef57f93b890473a2c44a kchmviewer-0.3.ebuild 838
-MD5 9eff4a9413da1885a9a0ea33497bffc3 ChangeLog 303
+MD5 d7c4220e5b07eeaf33a33a3258179732 kchmviewer-0.9.ebuild 951
+MD5 5f6b3a72c66b4a0a4be5b051c914c60f files/kchmviewer-0.9-pic.patch 2456
 MD5 0f0684bc9db01b960a34231eeca812d0 files/digest-kchmviewer-0.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCo+pZ7IRIh26aCTkRAuCMAJ9FcF1ECG75JZ4o+D4ieg8YDYzVbwCgpgDK
-AOOXAxBwtkcLuY1bd5jBA8U=
-=OhLw
------END PGP SIGNATURE-----
+MD5 c6c46ad868e18a50c2388d0085e9ec04 files/digest-kchmviewer-0.9 66
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-0.9 b/app-doc/kchmviewer/files/digest-kchmviewer-0.9
new file mode 100644
index 000000000000..74321ee8d3cb
--- /dev/null
+++ b/app-doc/kchmviewer/files/digest-kchmviewer-0.9
@@ -0,0 +1 @@
+MD5 b22807dd9dea954bf1a7a06d878582b5 kchmviewer-0.9.tar.gz 559634
diff --git a/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch b/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch
new file mode 100644
index 000000000000..5d3d17a0779a
--- /dev/null
+++ b/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch
@@ -0,0 +1,65 @@
+diff -Nur kchmviewer-0.9.orig/chmlib-0.35/Makefile.am kchmviewer-0.9/chmlib-0.35/Makefile.am
+--- kchmviewer-0.9.orig/chmlib-0.35/Makefile.am	2005-05-04 15:42:10.000000000 +0200
++++ kchmviewer-0.9/chmlib-0.35/Makefile.am	2005-06-08 18:22:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-noinst_LIBRARIES = libchm.a
++noinst_LTLIBRARIES = libchm.la
+ noinst_HEADERS = chm_lib.h lzx.h
+ 
+-libchm_a_SOURCES = chm_lib.c lzx.c
++libchm_la_SOURCES = chm_lib.c lzx.c
+diff -Nur kchmviewer-0.9.orig/configure.ac kchmviewer-0.9/configure.ac
+--- kchmviewer-0.9.orig/configure.ac	2005-06-07 11:11:43.000000000 +0200
++++ kchmviewer-0.9/configure.ac	2005-06-08 18:32:05.000000000 +0200
+@@ -31,9 +31,7 @@
+ EXTRA_SUBDIRS=""
+ CHMLIBDIR="chmlib-0.35"
+ CHM_INCLUDES="\$(top_srcdir)/$CHMLIBDIR/"
+-CHM_LIBS="\$(top_builddir)/$CHMLIBDIR/libchm.a"
+-
+-LIBS="$LIBS $CHM_LIBS"
++CHM_LIBS="\$(top_builddir)/$CHMLIBDIR/libchm.la"
+ 
+ AC_ARG_WITH(kde,    AC_HELP_STRING([--with-kde],[enable KDE support]))
+ 
+@@ -45,13 +43,14 @@
+ 	EXTRA_SUBDIRS="$EXTRA_SUBDIRS kio-msits"
+ fi
+ 
+-if test "x$with_kde" = "x"; then
++if test "x$with_kde" != "xyes"; then
+ 	include_ARTS_FALSE="yes"
+ 	AC_PREFIX_DEFAULT(${prefix:-/usr/local})
+ fi
+ 
+ AC_SUBST(EXTRA_SUBDIRS)
+ AC_SUBST(CHM_INCLUDES)
++AC_SUBST(CHM_LIBS)
+ 
+ AC_OUTPUT(src/Makefile Makefile kio-msits/Makefile chmlib-0.35/Makefile)
+ 
+diff -Nur kchmviewer-0.9.orig/kio-msits/Makefile.am kchmviewer-0.9/kio-msits/Makefile.am
+--- kchmviewer-0.9.orig/kio-msits/Makefile.am	2005-05-05 09:09:12.000000000 +0200
++++ kchmviewer-0.9/kio-msits/Makefile.am	2005-06-08 18:24:22.000000000 +0200
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kio_msits.la
+ 
+ kio_msits_la_SOURCES = msits.cpp
+-kio_msits_la_LIBADD = -lkio
++kio_msits_la_LIBADD = -lkio $(CHM_LIBS)
+ kio_msits_la_LDFLAGS = -module -avoid-version $(QT_LIBS) $(KDE_LDFLAGS) $(KDE_LIBS) $(KDE_PLUGIN)
+ 
+ protocol_DATA = msits.protocol
+diff -Nur kchmviewer-0.9.orig/src/Makefile.am kchmviewer-0.9/src/Makefile.am
+--- kchmviewer-0.9.orig/src/Makefile.am	2005-05-10 18:31:34.000000000 +0200
++++ kchmviewer-0.9/src/Makefile.am	2005-06-08 18:24:26.000000000 +0200
+@@ -10,7 +10,8 @@
+ INCLUDES = $(QT_INCLUDES) -I$(CHM_INCLUDES) $(KDE_INCLUDES)
+ 
+ # the library search path.
+-kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(LIB_QT) $(KDE_LDFLAGS) $(LIB_KDEUI) $(LIB_KHTML)
++kchmviewer_LDADD = $(CHM_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
++kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS)
+ 
+ #LIB_KDEPRINT = -lkdeprint
+ #LIB_KDEUI = -lkdeui
diff --git a/app-doc/kchmviewer/kchmviewer-0.9.ebuild b/app-doc/kchmviewer/kchmviewer-0.9.ebuild
new file mode 100644
index 000000000000..0878388ffa6c
--- /dev/null
+++ b/app-doc/kchmviewer/kchmviewer-0.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-0.9.ebuild,v 1.1 2005/06/09 12:48:33 greg_g Exp $
+
+inherit kde-functions eutils
+
+DESCRIPTION="Qt-based feature rich CHM file viewer."
+HOMEPAGE="http://kchmviewer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="kde"
+
+RDEPEND="kde? ( kde-base/kdelibs )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+need-qt 3.3
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix PIC issue. Submitted upstream.
+	epatch "${FILESDIR}/${P}-pic.patch"
+
+	# Regenerate configure for the pic patch.
+	einfo "Running autoreconf..."
+	autoreconf || die
+	perl am_edit || die
+}
+
+src_compile() {
+	set-kdedir 3
+
+	econf $(use_with kde) || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog
+}