Fix docs installation (bug #324163). Also remove old version.

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

5 files changed, 30 insertions, 16 deletions

diff --git a/dev-libs/qjson/ChangeLog b/dev-libs/qjson/ChangeLog
index fe9c6a766993..d927810b4632 100644
--- a/dev-libs/qjson/ChangeLog
+++ b/dev-libs/qjson/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/qjson
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/ChangeLog,v 1.11 2010/01/20 22:07:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/ChangeLog,v 1.12 2010/06/16 15:44:01 ayoy Exp $
+
+*qjson-0.7.1-r1 (16 Jun 2010)
+*qjson-0.6.3-r1 (16 Jun 2010)
+
+  16 Jun 2010; Dominik Kapusta <ayoy@gentoo.org> -qjson-0.6.2.ebuild,
+  qjson-0.6.3.ebuild, +qjson-0.6.3-r1.ebuild, -qjson-0.7.1.ebuild,
+  +qjson-0.7.1-r1.ebuild:
+  Fix docs installation (bug #324163). Also remove old version.
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> qjson-0.7.1.ebuild:
   Marking qjson-0.7.1 ~ppc64 for bug 292413
diff --git a/dev-libs/qjson/Manifest b/dev-libs/qjson/Manifest
index 795ef202e375..37855ea1f9c5 100644
--- a/dev-libs/qjson/Manifest
+++ b/dev-libs/qjson/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qjson-quint64.patch 456 RMD160 dfce2684c36d29965f7acb2ef6e748cb7d934454 SHA1 cf9388d2c89280e6a5c6daa291ba9d2ab6679c82 SHA256 492d3862845f8336296b81052167f83d86acf83840baa9e2e25996b7c31e1812
-DIST qjson-0.6.2.tar.bz2 36008 RMD160 09673639e1d0b1c1f6eb63df5a247da2cd79a2a7 SHA1 3bd73c20ee590bf3f73505b35e96693a6d380e61 SHA256 6660ddb06fc5dfebcb8e681e4d08ec4550dcd958c1b206a459174abeab0e8d24
 DIST qjson-0.6.3.tar.bz2 36042 RMD160 053c14e371009cab63bb21c326ab0c390e84a7ec SHA1 e3e6d0f58ce2f5d88816b7abe3623d9f3cd64917 SHA256 5e9ee3f38884b0f71a1c45d8ba0fc2c6ded032b34545f2afa80579ff3111d192
 DIST qjson-0.7.1.tar.bz2 38075 RMD160 9b333dda51c70a8994d3203b238fe33ec3281af5 SHA1 19bbef24132b238e99744bb35194c6dadece98f9 SHA256 3b8e94345fe846171c4b4d7d3518891d5fc864fda1e0c10d935bdb77bd3db994
-EBUILD qjson-0.6.2.ebuild 991 RMD160 75a3e7704e302e6962fec1970b2abbb1ddb151ca SHA1 3c51fc4dd024ecaee9d616b17cf944210791d149 SHA256 da3bf97ea9af7197d344c1b70d3dcb1ef3597987ffb8ef59593acf7b392348f4
-EBUILD qjson-0.6.3.ebuild 928 RMD160 9d58e1db6a428392a68cf3248696c8d34354a40f SHA1 800e73618d5301da2f98d1575fca0ca3e8f314d8 SHA256 a710b9a5e7175a84ff56673927cdb959475f2f98d15c2e25bfe5fb4d3eb13845
-EBUILD qjson-0.7.1.ebuild 941 RMD160 e6ca7b41d0fa1a9e556881a6ed7c15851cdbb747 SHA1 7ea4083db151112481906f1cbb5692a22e4942ae SHA256 669f97fe657147c7bacabc0b5636a5d176d2e08152b0c9c0995eee6bd9f4ec57
-MISC ChangeLog 1520 RMD160 d327be63310bdfb5169dda512f5e7d9d3441eda3 SHA1 06db825362eeac05d674dac8130c7bc713a8c346 SHA256 a2337022b6233a78962bd246d795096bf837e323c779fde646e8b2f5a74855d6
+EBUILD qjson-0.6.3-r1.ebuild 934 RMD160 0d6bce5e47db6b4de546041e7883dedab9365a2a SHA1 1c878ae55fd40c5d7e2529ac548c4065de9e9ddc SHA256 19eb0a52868b7cd01bbe49452526248429d32431ed83af2d31095f7c412cfe45
+EBUILD qjson-0.6.3.ebuild 928 RMD160 8872583988eeaf8a6227f9cb4d1d6678f19035f1 SHA1 d405d0c9055a25dcd0d8873884dfc8d0442066af SHA256 ef2cceb9917d50ad9c5deb5cc1c3eea3fadb48d638a539fbe0f5c0f98810c106
+EBUILD qjson-0.7.1-r1.ebuild 941 RMD160 fb15357099f7b24f06a38cc9e8436c35e1f1a26d SHA1 57a336dc6b6e1e86605800a2627843454b04ae55 SHA256 ed6af360027a77a71d8b5fe94eeb77ff4e499b4ba9cabd47c051555cced76aa6
+MISC ChangeLog 1807 RMD160 7d51c59a6aab68a79cf6abdfb4fcab8a250e9bd9 SHA1 8faebfaa2df101b3667133f213e7348f9406161c SHA256 e55d4591fe689fd474caa80d8ca5bdced7635105846bee5bba821bcf4c475f0a
 MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwY8WIACgkQ+CZEqwt+F6aYvwCdH6ktfqzn/R1O5VCxjayrGKvF
+SLwAn0Kn9aVMxyVl5dHSBsdUOnxvC186
+=/MeL
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/qjson/qjson-0.6.2.ebuild b/dev-libs/qjson/qjson-0.6.3-r1.ebuild
index 29c998697e27..4dbbd264e8d7 100644
--- a/dev-libs/qjson/qjson-0.6.2.ebuild
+++ b/dev-libs/qjson/qjson-0.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.2.ebuild,v 1.3 2009/11/08 15:50:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.3-r1.ebuild,v 1.1 2010/06/16 15:44:01 ayoy Exp $
 
 EAPI="2"
 
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 DOCS=( "${S}/README" )
 
-# bug 292387
-PATCHES=( "${FILESDIR}/${PN}-quint64.patch" )
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use test QJSON_BUILD_TESTS)"
@@ -37,7 +34,7 @@ src_install() {
 	if use doc; then
 		cd "${S}/doc"
 		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( "${S}/doc/html/*" )
+		HTML_DOCS=( "${S}/doc/html/" )
 	fi
 
 	cmake-utils_src_install
diff --git a/dev-libs/qjson/qjson-0.6.3.ebuild b/dev-libs/qjson/qjson-0.6.3.ebuild
index fc69eec257b7..c86549b81b4d 100644
--- a/dev-libs/qjson/qjson-0.6.3.ebuild
+++ b/dev-libs/qjson/qjson-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.3.ebuild,v 1.4 2010/01/05 15:58:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.3.ebuild,v 1.5 2010/06/16 15:44:01 ayoy Exp $
 
 EAPI="2"
 
@@ -34,7 +34,7 @@ src_install() {
 	if use doc; then
 		cd "${S}/doc"
 		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( "${S}/doc/html/*" )
+		HTML_DOCS=( "${S}/doc/html/" )
 	fi
 
 	cmake-utils_src_install
diff --git a/dev-libs/qjson/qjson-0.7.1.ebuild b/dev-libs/qjson/qjson-0.7.1-r1.ebuild
index 7fa712e01fb4..4a5b1d991009 100644
--- a/dev-libs/qjson/qjson-0.7.1.ebuild
+++ b/dev-libs/qjson/qjson-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1.ebuild,v 1.2 2010/01/20 22:07:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.7.1-r1.ebuild,v 1.1 2010/06/16 15:44:01 ayoy Exp $
 
 EAPI="2"
 
@@ -34,7 +34,7 @@ src_install() {
 	if use doc; then
 		cd "${S}/doc"
 		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( "${S}/doc/html/*" )
+		HTML_DOCS=( "${S}/doc/html/" )
 	fi
 
 	cmake-utils_src_install