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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 16 insertions, 11 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/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