summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2007-12-04 18:42:41 +0000
committerRyan Hill <dirtyepic@gentoo.org>2007-12-04 18:42:41 +0000
commit469e64445c174274317a0ecfe92a2cecdc2e5d50 (patch)
tree19c264799c9de98d01a0606333393b1234f93644 /x11-libs/wxGTK
parentStable for HPPA (bug #201122). (diff)
downloadgentoo-2-469e64445c174274317a0ecfe92a2cecdc2e5d50.tar.gz
gentoo-2-469e64445c174274317a0ecfe92a2cecdc2e5d50.tar.bz2
gentoo-2-469e64445c174274317a0ecfe92a2cecdc2e5d50.zip
Fix docs installation. Reported by eldenz.
(Portage version: 2.1.4_rc7)
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog5
-rw-r--r--x11-libs/wxGTK/files/digest-wxGTK-2.8.7.13
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild12
3 files changed, 10 insertions, 10 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/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