Fix docs installation. Reported by eldenz.

Package-Manager: portage-2.1.4_rc7

4 files changed, 24 insertions, 25 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 733a0c6a5c69..eb519ab111b1 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.166 2007/12/03 21:59:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.167 2007/12/04 18:42:40 dirtyepic Exp $
+
+  04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.7.1.ebuild:
+  Fix docs installation.  Reported by eldenz.
 
 *wxGTK-2.8.7.1 (03 Dec 2007)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8902943744cf..77e67cf916da 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -46,7 +46,6 @@ DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d65
 DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e SHA1 5526ee4c4cc57bcebb4950ea05e24639ef8b02dd SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3
 DIST wxWidgets-2.6.3-HTML.tar.gz 1349870 RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 SHA1 915f21d4cd2bb53403317f5b9514972111b72bdf SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
-DIST wxWidgets-2.8.7-HTML.zip 2596719 RMD160 790333f7c8a4c776cacbd2be6c0801b0c6829fa8 SHA1 7c00165026581d96d37d9f24696fa6cb8a4e8df4 SHA256 37f12a88552c19b91d6db9c9391a3e5ffffaa444dc63a37c50470741afa4c0dc
 EBUILD wxGTK-2.6.3.3.ebuild 5135 RMD160 41025c701f01da88680857191f741e32cf923ea1 SHA1 102cf81d2390d5b12c2aad91493e9e281f990bb8 SHA256 31d82ff2ace13e538a1e11df4f92d1dc6157f1ea623226b74e87135a644cc815
 MD5 cf4e9cdf542cce1bef0a55f2995e0d2a wxGTK-2.6.3.3.ebuild 5135
 RMD160 41025c701f01da88680857191f741e32cf923ea1 wxGTK-2.6.3.3.ebuild 5135
@@ -59,14 +58,14 @@ EBUILD wxGTK-2.6.4.0-r2.ebuild 4911 RMD160 52a9e7a601ef3adedb66e87ae526c817ef7c6
 MD5 a4d2aaf4b7b6f861157beabcf7c1f1a9 wxGTK-2.6.4.0-r2.ebuild 4911
 RMD160 52a9e7a601ef3adedb66e87ae526c817ef7c66ea wxGTK-2.6.4.0-r2.ebuild 4911
 SHA256 d62db40083f7102548a62ad14826b6858f31287d0fbb604954ceb75540c12c24 wxGTK-2.6.4.0-r2.ebuild 4911
-EBUILD wxGTK-2.8.7.1.ebuild 3534 RMD160 5c8b7bd43a6d394499ba69939f7fb4f7f5b809dd SHA1 d614c9d884931704cd63a93b4d87635b08ff6538 SHA256 1728afebd9b2a098cb8749cfd5c33ef519700e9b028007874138035c3c4c80a6
-MD5 13e39c475e1d1176bbb4e2948a986dd4 wxGTK-2.8.7.1.ebuild 3534
-RMD160 5c8b7bd43a6d394499ba69939f7fb4f7f5b809dd wxGTK-2.8.7.1.ebuild 3534
-SHA256 1728afebd9b2a098cb8749cfd5c33ef519700e9b028007874138035c3c4c80a6 wxGTK-2.8.7.1.ebuild 3534
-MISC ChangeLog 25853 RMD160 467325ce616f0365c755b682d7de4093ce956030 SHA1 832599c38e7f1c4cb6d190bf8d484dc928c519bf SHA256 610e5bb37818fc3a6dfeb174b94b66cdd21f5395b07814d5a985d7a0d83e6392
-MD5 bb71d364cc75a12af51be3f78dcbd537 ChangeLog 25853
-RMD160 467325ce616f0365c755b682d7de4093ce956030 ChangeLog 25853
-SHA256 610e5bb37818fc3a6dfeb174b94b66cdd21f5395b07814d5a985d7a0d83e6392 ChangeLog 25853
+EBUILD wxGTK-2.8.7.1.ebuild 3438 RMD160 cbc7184f62f7c5aef1835d79d5fa9989398383f1 SHA1 8455e95cd4e3ce58e754f57872a660e27baa6719 SHA256 2fcdc10a0fac1f4f3ffae865ffe207939848cf102ccbbe0e9c328608d05bdd70
+MD5 e8348184209b460998a2a492ac00244d wxGTK-2.8.7.1.ebuild 3438
+RMD160 cbc7184f62f7c5aef1835d79d5fa9989398383f1 wxGTK-2.8.7.1.ebuild 3438
+SHA256 2fcdc10a0fac1f4f3ffae865ffe207939848cf102ccbbe0e9c328608d05bdd70 wxGTK-2.8.7.1.ebuild 3438
+MISC ChangeLog 25970 RMD160 73de55e4b19a87d508f5ca3ca1d288707ffad057 SHA1 cc3edfc5d5d5bfe97ebd246867ebdf21332531ea SHA256 b3e0e6ae57914532bdc7ede1d595c2ee6dd4b6bd117daa60850f90840170cfb5
+MD5 abb49794188f09d3fa0dda4a23d37605 ChangeLog 25970
+RMD160 73de55e4b19a87d508f5ca3ca1d288707ffad057 ChangeLog 25970
+SHA256 b3e0e6ae57914532bdc7ede1d595c2ee6dd4b6bd117daa60850f90840170cfb5 ChangeLog 25970
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -80,13 +79,13 @@ SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/di
 MD5 93bb905fd69b1ddd387cf1e25b310ff7 files/digest-wxGTK-2.6.4.0-r2 536
 RMD160 02d6744262a4fcfa2095c4a56a9ac0e00e74e327 files/digest-wxGTK-2.6.4.0-r2 536
 SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/digest-wxGTK-2.6.4.0-r2 536
-MD5 8ae65758490de0e735640eb65d7317b7 files/digest-wxGTK-2.8.7.1 527
-RMD160 1280967166670a8a81c91836f4ce29ae7dbb3905 files/digest-wxGTK-2.8.7.1 527
-SHA256 34d21b7c589329d7cbdd5b8cefa3b1b1452a4d2e67f382e44ebc647999091b76 files/digest-wxGTK-2.8.7.1 527
+MD5 16a83c00efb7cffcc252710da5e1b150 files/digest-wxGTK-2.8.7.1 271
+RMD160 979ef657661bd66c15cbedf5d9707535ae0ab30f files/digest-wxGTK-2.8.7.1 271
+SHA256 8531b5ba29a31f35b419ac4a011209640df603c73b00cc48b9aa092ca02e5534 files/digest-wxGTK-2.8.7.1 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHVHxgiqiDRvmkBmIRAiQ6AJwMjfmojHQoXZOdtTXe85B5a+XVcgCg5c6j
-P7/yw/9RlWx7QjDMRsmj+SQ=
-=DXl5
+iD8DBQFHVZ+qiqiDRvmkBmIRAlDDAJsFZbYZtMN0ksKECmT+iU/KXzIakACghI84
+4uxzpUxw+uB94YGe9UejYsk=
+=unOs
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1
index 7ca9e5fd1a3c..37ff37eafa0c 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1
@@ -1,6 +1,3 @@
 MD5 04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 26362160
 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e wxPython-src-2.8.7.1.tar.bz2 26362160
 SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3 wxPython-src-2.8.7.1.tar.bz2 26362160
-MD5 28e726b67f6fcb18a35bd40cffd93ded wxWidgets-2.8.7-HTML.zip 2596719
-RMD160 790333f7c8a4c776cacbd2be6c0801b0c6829fa8 wxWidgets-2.8.7-HTML.zip 2596719
-SHA256 37f12a88552c19b91d6db9c9391a3e5ffffaa444dc63a37c50470741afa4c0dc wxWidgets-2.8.7-HTML.zip 2596719
diff --git a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
index 2befdc99f15f..2eeab87374ea 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.1 2007/12/03 21:59:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.2 2007/12/04 18:42:40 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -11,9 +11,8 @@ BASE_PV="$(get_version_component_range 1-3)"
 BASE_P="${PN}-${BASE_PV}"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
-# are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.zip )"
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X doc debug gnome gstreamer odbc opengl pch sdl"
@@ -54,7 +53,6 @@ LICENSE="wxWinLL-3
 		doc?	( wxWinFDL-3 )"
 
 S="${WORKDIR}/wxPython-src-${PV}"
-HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
 
 src_unpack() {
 	unpack ${A}
@@ -131,8 +129,10 @@ src_install() {
 		emake DESTDIR="${D}" install || die "install contrib failed."
 	fi
 
+	cd "${S}"
+
 	if use doc; then
-		dohtml -r "${HTML_S}"/docs/html/*
+		dohtml -r "${S}"/docs/html/*
 	fi
 
 	# We don't want this