Version bump. Fixes bug 163264.

Package-Manager: portage-2.1.2.9

4 files changed, 85 insertions, 5 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 72aee7b2e742..12ae97b12f23 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.25 2007/03/26 08:53:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.26 2007/06/17 12:16:09 philantrop Exp $
+
+*kchmviewer-3.1_p2 (17 Jun 2007)
+
+  17 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +kchmviewer-3.1_p2.ebuild:
+  Version bump. Fixes bug 163264.
 
   26 Mar 2007; <pva@gentoo.org> +files/kchmviewer-3.0-fix-as-needed.diff,
   kchmviewer-3.0.ebuild:
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index ba17f3503a22..00aa03f2c69b 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kchmviewer-2.5-gcc41.patch 510 RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4e5 SHA1 7e19162f1beac10002d2acb7820e7a92f48d626a SHA256 944d8ffb37f536c3c79b241a4d2da8c57af6faed5f2df6ac76e23a784b9044a7
 MD5 38c09653219e8b651c80336bfbb054bf files/kchmviewer-2.5-gcc41.patch 510
 RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4e5 files/kchmviewer-2.5-gcc41.patch 510
@@ -19,6 +22,7 @@ DIST kchmviewer-2.6.tar.gz 671666 RMD160 8a774e37e1e5824a4ff46123d54f246a1389974
 DIST kchmviewer-2.7.tar.gz 685588 RMD160 6014d7f9ce68fb6793d026c39ce968dd7f953815 SHA1 4973d36867842eb1dbb05e0292bcf633d67fe281 SHA256 d6b1fd711e00ff9ed71adcbd1a8e8a052d64867830031ade415534e194f9fe01
 DIST kchmviewer-3.0-admin-dir.tar.bz2 187244 RMD160 19ef2e27ed5db9675d98730d6f1c4850bbdafd17 SHA1 320dd7bbb06b723a4eb89f34d9a13e7fafdb744d SHA256 23626c5b3d831508f32535f012c9b642b052058c22c94c97332aa19370e21919
 DIST kchmviewer-3.0.tar.gz 707997 RMD160 7c1b3ecd7d870e4cc06b4f8c1ab669ec7be66194 SHA1 300367920aea79500ee75973d55d0108f29133f3 SHA256 706a74a2ed9e2354decc2796e7e3eebf03d976a1da9eda30b7a57a1d67a6eb34
+DIST kchmviewer-3.1-2.tar.gz 945640 RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 SHA1 b89c0f1e56b820de2419e4890efc5537fefc4b1e SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
 EBUILD kchmviewer-2.5.ebuild 1213 RMD160 bc21a657701594bc0147d5b51d2800dafa5781bb SHA1 bfcfd5c81105096b30b53c72ef62fe3d2b3a1a5e SHA256 6a45261493da39cf1972d79e233e5c2b619bc1ad81589fa81f3afea16e72c7b3
 MD5 b4a3723ce2c87a8e4de43324d9c771af kchmviewer-2.5.ebuild 1213
 RMD160 bc21a657701594bc0147d5b51d2800dafa5781bb kchmviewer-2.5.ebuild 1213
@@ -35,10 +39,14 @@ EBUILD kchmviewer-3.0.ebuild 1713 RMD160 ecd9699158c36ab036999adfaf6b58e3f492761
 MD5 47f2262508ef103c1db7370b075186a1 kchmviewer-3.0.ebuild 1713
 RMD160 ecd9699158c36ab036999adfaf6b58e3f492761f kchmviewer-3.0.ebuild 1713
 SHA256 1da24c3a99b3bdb161541645848f550e447558ca46ebdc784072cf8923305457 kchmviewer-3.0.ebuild 1713
-MISC ChangeLog 3691 RMD160 304bfcbb9421800a51548f168ad9f0308d5dbda3 SHA1 9a0aaac3d7cc754e4119e37e001b7fc1a178e840 SHA256 8d4dff5457a765b7dbcadc878a28cd1efa39333a6e8ac6995cf518a0b6e32fb6
-MD5 99a51f462289fddb113583e43cc6652d ChangeLog 3691
-RMD160 304bfcbb9421800a51548f168ad9f0308d5dbda3 ChangeLog 3691
-SHA256 8d4dff5457a765b7dbcadc878a28cd1efa39333a6e8ac6995cf518a0b6e32fb6 ChangeLog 3691
+EBUILD kchmviewer-3.1_p2.ebuild 1501 RMD160 3733b246397e0be8cdc5152e9ff037e76e1b2ab2 SHA1 f7153641977f178cdbf363d5e27644f4d4244afd SHA256 062fca397b970c19389614b3477c7f0dfb8b436c105fa1614c429a6a9c310d56
+MD5 1d6c115e77bfbecf0f7f08da2b6dc628 kchmviewer-3.1_p2.ebuild 1501
+RMD160 3733b246397e0be8cdc5152e9ff037e76e1b2ab2 kchmviewer-3.1_p2.ebuild 1501
+SHA256 062fca397b970c19389614b3477c7f0dfb8b436c105fa1614c429a6a9c310d56 kchmviewer-3.1_p2.ebuild 1501
+MISC ChangeLog 3851 RMD160 ae276252a1646786a5524482ca1eee9d9cf8dc59 SHA1 8208714611561d32ddf257470fda547e306391f5 SHA256 aa4e16e2567d450ecc39b0f84d56a75f296e26acf6b1e75259b6f8035a5a2332
+MD5 4914ed5de70ad25c98f3b96259895ea5 ChangeLog 3851
+RMD160 ae276252a1646786a5524482ca1eee9d9cf8dc59 ChangeLog 3851
+SHA256 aa4e16e2567d450ecc39b0f84d56a75f296e26acf6b1e75259b6f8035a5a2332 ChangeLog 3851
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
 MD5 07c8bb5ee028fbbae21335bd33e80318 metadata.xml 897
 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 metadata.xml 897
@@ -55,3 +63,13 @@ SHA256 fbc979bc3a1d346ba4f8b4eaafd1b47f6357c64615c9376b57ebd9dade2a3c9d files/di
 MD5 63aa273c3a48691a21f4ecb235e7a4f6 files/digest-kchmviewer-3.0 521
 RMD160 54a09897b0580d8582fea49d007858aa43c385d0 files/digest-kchmviewer-3.0 521
 SHA256 ec47ded6b46609a2bf5d71f7d1af0e764f053207d13aafc570c0514c53f49c00 files/digest-kchmviewer-3.0 521
+MD5 1ec0cd2e910ce99ee9aae95f9bc12d79 files/digest-kchmviewer-3.1_p2 250
+RMD160 daaddfcae2b8586406830b50b0d0cdf827a0e23f files/digest-kchmviewer-3.1_p2 250
+SHA256 fca7df462299607eca35c62a7cb7c3d86d766bdf0733c9045973f5caf843806c files/digest-kchmviewer-3.1_p2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGdSYRCkvF58q80IkRAnvhAKCo/xNIv9roja3FQKwpWP2RZ4Kw6QCfQSWA
+upyLul5BzxLpgduMEinBZw0=
+=Jq7z
+-----END PGP SIGNATURE-----
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-3.1_p2 b/app-doc/kchmviewer/files/digest-kchmviewer-3.1_p2
new file mode 100644
index 000000000000..b5f94a3eddeb
--- /dev/null
+++ b/app-doc/kchmviewer/files/digest-kchmviewer-3.1_p2
@@ -0,0 +1,3 @@
+MD5 bc376ce29784f33bf0b5f8d1ae5141bf kchmviewer-3.1-2.tar.gz 945640
+RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 kchmviewer-3.1-2.tar.gz 945640
+SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db kchmviewer-3.1-2.tar.gz 945640
diff --git a/app-doc/kchmviewer/kchmviewer-3.1_p2.ebuild b/app-doc/kchmviewer/kchmviewer-3.1_p2.ebuild
new file mode 100644
index 000000000000..46262f4df0a4
--- /dev/null
+++ b/app-doc/kchmviewer/kchmviewer-3.1_p2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-3.1_p2.ebuild,v 1.1 2007/06/17 12:16:09 philantrop Exp $
+
+inherit autotools kde-functions eutils versionator
+
+MY_P="${PN}-$(replace_version_separator 2 '-')"
+MY_P="${MY_P/p}"
+
+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 ~x86"
+IUSE="arts kde"
+
+DEPEND="=x11-libs/qt-3*
+	app-doc/chmlib
+	kde? ( kde-base/kdelibs )"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	if use kde && use arts && ! built_with_use kde-base/kdelibs arts ; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled."
+		eerror "However, $(best_version kde-base/kdelibs) was compiled with this flag disabled."
+		eerror
+		eerror "You must either disable this use flag, or recompile"
+		eerror "$(best_version kde-base/kdelibs) with this use flag enabled."
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# broken configure script, assure it doesn't fall back to internal libs
+	echo "# We use the external chmlib!" > lib/chmlib/chm_lib.h
+}
+
+src_compile() {
+	set-kdedir 3
+
+	econf $(use_with kde) $(use_with arts) || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog FAQ DCOP-bingings README
+}