[gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.8.7.1.ebuild

[Ryan Hill (dirtyepic)]

dirtyepic    07/12/04 18:42:41

  Modified:             ChangeLog wxGTK-2.8.7.1.ebuild
  Log:
  Fix docs installation.  Reported by eldenz.
  (Portage version: 2.1.4_rc7)

Revision  Changes    Path
1.167                x11-libs/wxGTK/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.166&r2=1.167

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog	3 Dec 2007 21:59:47 -0000	1.166
+++ ChangeLog	4 Dec 2007 18:42:40 -0000	1.167
@@ -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@g.o> wxGTK-2.8.7.1.ebuild:
+  Fix docs installation.  Reported by eldenz.
 
 *wxGTK-2.8.7.1 (03 Dec 2007)
 



1.2                  x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?r1=1.1&r2=1.2

Index: wxGTK-2.8.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.8.7.1.ebuild	3 Dec 2007 21:59:47 -0000	1.1
+++ wxGTK-2.8.7.1.ebuild	4 Dec 2007 18:42:40 -0000	1.2
@@ -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_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 @@
 		doc?	( wxWinFDL-3 )"
 
 S="${WORKDIR}/wxPython-src-${PV}"
-HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
 
 src_unpack() {
 	unpack ${A}
@@ -131,8 +129,10 @@
 		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



-- 
gentoo-commits@g.o mailing list