Version bump, removed old docs. Added demo files.

Package-Manager: portage-2.0.51.20-r5

11 files changed, 104 insertions, 82 deletions

diff --git a/dev-python/wxpython-docs/ChangeLog b/dev-python/wxpython-docs/ChangeLog
index d38e9e952109..ae7fb9624193 100644
--- a/dev-python/wxpython-docs/ChangeLog
+++ b/dev-python/wxpython-docs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/wxpython-docs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.12 2005/04/24 10:06:48 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.13 2005/05/02 19:02:13 pythonhead Exp $
+
+*wxpython-docs-2.6.0.0 (02 May 2005)
+*wxpython-docs-2.4.2.4-r1 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -wxpython-docs-2.4.0.7.ebuild, -wxpython-docs-2.4.1.2.ebuild,
+  -wxpython-docs-2.4.2.4.ebuild, +wxpython-docs-2.4.2.4-r1.ebuild,
+  +wxpython-docs-2.6.0.0.ebuild:
+  Version bump. Include demo files, removed ancient versions.
 
   24 Apr 2005; Simon Stelling <blubb@gentoo.org>
   wxpython-docs-2.4.2.4.ebuild:
diff --git a/dev-python/wxpython-docs/Manifest b/dev-python/wxpython-docs/Manifest
index 90ed37d9edc4..8adf1c46b38d 100644
--- a/dev-python/wxpython-docs/Manifest
+++ b/dev-python/wxpython-docs/Manifest
@@ -1,8 +1,16 @@
-MD5 ab7c64d1bf56bf881d82567617b0c8e5 ChangeLog 1852
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 284dff0eab5d76821e02a51da1e11405 ChangeLog 2215
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 1fc522baf8856106715f40af497e010e wxpython-docs-2.4.0.7.ebuild 684
-MD5 17cb6fdb5a1129a233fcde430652bb05 wxpython-docs-2.4.1.2.ebuild 684
-MD5 76238780fb5574017c7876c66829e2e2 wxpython-docs-2.4.2.4.ebuild 685
-MD5 52f0f1eee85a5d6f1988758ac11c7a71 files/digest-wxpython-docs-2.4.0.7 73
-MD5 faca6b36631fc49721584435a37f2ee6 files/digest-wxpython-docs-2.4.1.2 73
-MD5 b0fe04f82390f60887781f76d1ebbff2 files/digest-wxpython-docs-2.4.2.4 73
+MD5 036257b95ad62e8247c6dc14f04e8273 wxpython-docs-2.4.2.4-r1.ebuild 1042
+MD5 9c758eca8750f9a1f84940bc78369428 wxpython-docs-2.6.0.0.ebuild 1475
+MD5 2911f08ca57d7ce8297146ffd74e5fca files/digest-wxpython-docs-2.4.2.4-r1 146
+MD5 2e16d6b640e3678d8d85abe15dfbc3b0 files/digest-wxpython-docs-2.6.0.0 225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCdnlPz2gxt1z4IGYRAswQAKCz63OmL+suq2T6Ly1AN4XE1d5HiACggXcj
+b3nr91uRTTWdr7pUI30J1c4=
+=YI+b
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.0.7 b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.0.7
deleted file mode 100644
index 460492fbf95e..000000000000
--- a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46d3ae7cdde36d8f82c70c7ab03fc59c wxPythonDocs-2.4.0.7.tar.gz 1683743
diff --git a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.1.2 b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.1.2
deleted file mode 100644
index 4a2fd4b75c5d..000000000000
--- a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8865ea2414eb0b6351c9c5a2ea116741 wxPythonDocs-2.4.1.2.tar.gz 1686879
diff --git a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.2.4 b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.2.4-r1
index 6c760936d31a..12358ea6cdae 100644
--- a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.2.4
+++ b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.4.2.4-r1
@@ -1 +1,2 @@
 MD5 00770cb20eca9ed82c1a1ee7a338befe wxPythonDocs-2.4.2.4.tar.gz 1689524
+MD5 f162e5a74f39b7a1e453d199db06ee94 wxPythonDemo-2.4.2.4.tar.gz 1473868
diff --git a/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0 b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0
new file mode 100644
index 000000000000..75d8976c475f
--- /dev/null
+++ b/dev-python/wxpython-docs/files/digest-wxpython-docs-2.6.0.0
@@ -0,0 +1,3 @@
+MD5 7c5ec640e5298b289f488893359b6fc8 wxPython-docs-2.6.0.0.tar.gz 2181962
+MD5 8a8eb58f2075f7b9c77642a2640f091e wxPython-demo-2.6.0.0.tar.gz 2479036
+MD5 dcc0b45fde996d2ddef5979817aee3a3 wxPython-newdocs-2.6.0.0.tar.gz 1067483
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.0.7.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.0.7.ebuild
deleted file mode 100644
index bdd4844e9312..000000000000
--- a/dev-python/wxpython-docs/wxpython-docs-2.4.0.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.0.7.ebuild,v 1.9 2004/08/15 18:30:14 pythonhead Exp $
-
-MY_P="${P/wxpython-docs/wxPythonDocs}"
-
-DESCRIPTION="wxPython documentation"
-HOMEPAGE="http://www.wxpython.org"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
-
-LICENSE="wxWinFDL-3"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxPython-${PVR}"
-
-src_install() {
-	dodir /usr/share/doc/${DOCDIR}
-	dodir /usr/share/doc/${DOCDIR}/docs
-	cp -R ${WORKDIR}/${DOCDIR}/docs/* ${D}/usr/share/doc/${DOCDIR}/docs/
-}
-
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.1.2.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.1.2.ebuild
deleted file mode 100644
index 732da76f2c45..000000000000
--- a/dev-python/wxpython-docs/wxpython-docs-2.4.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.1.2.ebuild,v 1.6 2004/08/15 18:30:14 pythonhead Exp $
-
-MY_P="${P/wxpython-docs/wxPythonDocs}"
-
-DESCRIPTION="wxPython documentation"
-HOMEPAGE="http://www.wxpython.org"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
-
-LICENSE="wxWinFDL-3"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxPython-${PVR}"
-
-src_install() {
-	dodir /usr/share/doc/${DOCDIR}
-	dodir /usr/share/doc/${DOCDIR}/docs
-	cp -R ${WORKDIR}/${DOCDIR}/docs/* ${D}/usr/share/doc/${DOCDIR}/docs/
-}
-
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
new file mode 100644
index 000000000000..9bcae5dbb9d3
--- /dev/null
+++ b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild,v 1.1 2005/05/02 19:02:13 pythonhead Exp $
+
+MY_P="${P/wxpython-docs/wxPythonDocs}"
+
+DESCRIPTION="wxPython documentation"
+HOMEPAGE="http://www.wxpython.org"
+SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz
+	mirror://sourceforge/wxpython/wxPythonDemo-${PV}.tar.gz"
+
+LICENSE="wxWinFDL-3 LGPL-2.1"
+SLOT="2.4"
+KEYWORDS="x86 ~sparc amd64"
+IUSE=""
+
+S="${WORKDIR}/wxPython-${PVR}"
+DOCDIR="wxpython-${PVR}"
+
+src_install() {
+	dodir /usr/share/doc/${DOCDIR}/docs
+	cp -R ${WORKDIR}/${DOCDIR}/docs/* ${D}/usr/share/doc/${DOCDIR}/docs/
+	dodir /usr/share/doc/${DOCDIR}/demo
+	dodir /usr/share/doc/${DOCDIR}/samples
+	cp -R ${WORKDIR}/${DOCDIR}/demo/* ${D}/usr/share/doc/${DOCDIR}/demo/
+	cp -R ${WORKDIR}/${DOCDIR}/samples/* ${D}/usr/share/doc/${DOCDIR}/samples/
+}
+
+pkg_postinst() {
+	einfo "The demo files are now included with dev-python/wxpython-docs"
+}
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4.ebuild
deleted file mode 100644
index 204d71c22596..000000000000
--- a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.2.4.ebuild,v 1.9 2005/04/24 10:06:48 blubb Exp $
-
-MY_P="${P/wxpython-docs/wxPythonDocs}"
-
-DESCRIPTION="wxPython documentation"
-HOMEPAGE="http://www.wxpython.org"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
-
-LICENSE="wxWinFDL-3"
-SLOT="0"
-KEYWORDS="x86 ~sparc amd64"
-IUSE=""
-
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxPython-${PVR}"
-
-src_install() {
-	dodir /usr/share/doc/${DOCDIR}
-	dodir /usr/share/doc/${DOCDIR}/docs
-	cp -R ${WORKDIR}/${DOCDIR}/docs/* ${D}/usr/share/doc/${DOCDIR}/docs/
-}
-
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
new file mode 100644
index 000000000000..975f798e1287
--- /dev/null
+++ b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.6.0.0.ebuild,v 1.1 2005/05/02 19:02:13 pythonhead Exp $
+
+inherit eutils
+
+DESCRIPTION="wxPython documentation"
+HOMEPAGE="http://www.wxpython.org"
+SRC_URI="mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.gz
+	mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.gz
+	mirror://sourceforge/wxpython/wxPython-newdocs-${PV}.tar.gz"
+
+LICENSE="wxWinFDL-3 LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE=""
+
+S="${WORKDIR}/wxPython-${PVR}"
+DOCDIR="wxPython-${PVR}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	epatch ${FILESDIR}/demo-${PV}-version.patch
+}
+
+src_install() {
+	dodir /usr/share/doc/${DOCDIR}/docs
+	cp -R ${WORKDIR}/${DOCDIR}/docs/* ${D}/usr/share/doc/${DOCDIR}/docs/
+	dodir /usr/share/doc/${DOCDIR}/demo
+	dodir /usr/share/doc/${DOCDIR}/samples
+	cp -R ${WORKDIR}/${DOCDIR}/demo/* ${D}/usr/share/doc/${DOCDIR}/demo/
+	cp -R ${WORKDIR}/${DOCDIR}/samples/* ${D}/usr/share/doc/${DOCDIR}/samples/
+	mv ${D}/usr/share/doc/${DOCDIR} ${D}/usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "The demo files are now included with dev-python/wxpython-docs."
+	einfo "The new-style documentation is in:"
+	einfo "/usr/share/doc/${PF}/docs/api"
+	einfo " "
+	einfo "The old-style documentation can still be accessed by running"
+	einfo "/usr/share/doc/${PF}/docs/viewdocs.py"
+}