summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2008-01-10 23:34:08 +0000
committerRyan Hill <rhill@gentoo.org>2008-01-10 23:34:08 +0000
commit3331cc1cd9c61b29308d6b656476bc74b474226a (patch)
treed274a965652755a8722e2042ad50057dae232902
parentbump to 0.8.6d, applying some security patches (diff)
downloadhistorical-3331cc1cd9c61b29308d6b656476bc74b474226a.tar.gz
historical-3331cc1cd9c61b29308d6b656476bc74b474226a.tar.bz2
historical-3331cc1cd9c61b29308d6b656476bc74b474226a.zip
Remove old.
Package-Manager: portage-2.1.4_rc14
-rw-r--r--dev-python/wxpython/ChangeLog7
-rw-r--r--dev-python/wxpython/Manifest22
-rw-r--r--dev-python/wxpython/files/digest-wxpython-2.6.3.33
-rw-r--r--dev-python/wxpython/wxpython-2.6.3.3.ebuild120
4 files changed, 12 insertions, 140 deletions
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 5323f403d0a3..c7a9d2c18c75 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/wxpython
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.76 2007/12/25 16:31:37 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.77 2008/01/10 23:34:08 dirtyepic Exp $
+
+ 10 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.6.3.3.ebuild:
+ Remove old.
25 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0.ebuild:
Make sure we set WX_GTK_VER before calling check_wxuse. Bug #203298 by Fabio
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 5d42d740055f..e82dbec1ca46 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -13,13 +13,8 @@ AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a2867974
MD5 7da3dbdb1c62236baec5d70c191f6a51 files/wxpython-2.8.7-wxversion-scripts.patch 5398
RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 files/wxpython-2.8.7-wxversion-scripts.patch 5398
SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a files/wxpython-2.8.7-wxversion-scripts.patch 5398
-DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e SHA1 5526ee4c4cc57bcebb4950ea05e24639ef8b02dd SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3
-EBUILD wxpython-2.6.3.3.ebuild 3182 RMD160 f1646d6d0361aed77863caebd1a4dee9eefe1c04 SHA1 ce776c4a856cbbd49766e765cfef655a7282625d SHA256 598352ccd7ba01356c1c077c1ca7d8cb6730e13c17d86cf59fd6d1d96e79723a
-MD5 51185b662f6ec740dff58a664727b2d2 wxpython-2.6.3.3.ebuild 3182
-RMD160 f1646d6d0361aed77863caebd1a4dee9eefe1c04 wxpython-2.6.3.3.ebuild 3182
-SHA256 598352ccd7ba01356c1c077c1ca7d8cb6730e13c17d86cf59fd6d1d96e79723a wxpython-2.6.3.3.ebuild 3182
EBUILD wxpython-2.6.4.0-r1.ebuild 3104 RMD160 1a998a53ba880c1ca891412d8d8ea42026f60c83 SHA1 b0f881c2d2a23410b98beef668b54f45c8f3e270 SHA256 e3c54cefe4543e69960468d9edfcfac2865962345c57fe56584af6d2ff47703f
MD5 fec5957e313e703e8c97253a7a395534 wxpython-2.6.4.0-r1.ebuild 3104
RMD160 1a998a53ba880c1ca891412d8d8ea42026f60c83 wxpython-2.6.4.0-r1.ebuild 3104
@@ -32,17 +27,14 @@ EBUILD wxpython-2.8.7.1.ebuild 2858 RMD160 cce2435909f256a551d06bd35518ae552d03f
MD5 0b2cfa642c74d7352778839cd58d2ac2 wxpython-2.8.7.1.ebuild 2858
RMD160 cce2435909f256a551d06bd35518ae552d03fb75 wxpython-2.8.7.1.ebuild 2858
SHA256 57cf5be36cb3f412f064cb21b9490dc63eed0df51698ee63537b521735a86c92 wxpython-2.8.7.1.ebuild 2858
-MISC ChangeLog 16635 RMD160 8f74f2de4d914449fb7832690f729fe3de8686e0 SHA1 939518f13bbe0c2b6503086fdfba6e25b13a6070 SHA256 93fdf52e7d83566b60e8d9038e18935fd428841b3b1cc7e754e0fe4b9b0da132
-MD5 d9add2ca4064c6565fd601751ad04d00 ChangeLog 16635
-RMD160 8f74f2de4d914449fb7832690f729fe3de8686e0 ChangeLog 16635
-SHA256 93fdf52e7d83566b60e8d9038e18935fd428841b3b1cc7e754e0fe4b9b0da132 ChangeLog 16635
+MISC ChangeLog 16724 RMD160 2088b5c4337c59d4f6bb69c3fe06aeb114149c20 SHA1 e44f16f87d57a2a3f6cd9957308364ebbd55f521 SHA256 968444912c76911b79c011a1d0f58434d9fd665490d711edd327876e0b2f4b98
+MD5 d9f62b225c24386ec6128caf78b60e97 ChangeLog 16724
+RMD160 2088b5c4337c59d4f6bb69c3fe06aeb114149c20 ChangeLog 16724
+SHA256 968444912c76911b79c011a1d0f58434d9fd665490d711edd327876e0b2f4b98 ChangeLog 16724
MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5
MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182
RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182
SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5 metadata.xml 182
-MD5 4865b7c2ac0ec50eb4588b9c8782f5f9 files/digest-wxpython-2.6.3.3 271
-RMD160 bc71a86558bf3216ddd97ea35e83fd50fd934587 files/digest-wxpython-2.6.3.3 271
-SHA256 fd33053a2b85e0e330fff5bb181c0cd89d25c524f5ea2a6987e791480a83b814 files/digest-wxpython-2.6.3.3 271
MD5 f496654bafb9821890f407c13e4229de files/digest-wxpython-2.6.4.0 271
RMD160 9814e2bef74890e3742b4454037db4ddf0b1ddb3 files/digest-wxpython-2.6.4.0 271
SHA256 1404a03e99b28ea09a2469be3919e28da39a2f8a0fb8443b2cccc9ec43d0aade files/digest-wxpython-2.6.4.0 271
@@ -55,7 +47,7 @@ SHA256 8531b5ba29a31f35b419ac4a011209640df603c73b00cc48b9aa092ca02e5534 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.8 (GNU/Linux)
-iEYEARECAAYFAkeF6OEACgkQj9hvisErhMIeSgCdEH4iQZULaNqnBSeOgNjUxWME
-6GUAoIhRTxB02tCMq2tBGXRtz0DaEEYz
-=o2Iy
+iEYEARECAAYFAkeGq3sACgkQiqiDRvmkBmIeAgCg8WaKnnzSwYHLpVs2IxHslt81
+4LsAoITZzfsMBqB2LoPS35ZcR8QH5oCY
+=6Rh9
-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.3.3 b/dev-python/wxpython/files/digest-wxpython-2.6.3.3
deleted file mode 100644
index 642b5d8cee64..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.6.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 66b9c5f8e20a9505c39dab1a1234daa9 wxPython-src-2.6.3.3.tar.bz2 18963104
-RMD160 7feacff6808574143590a0a421ee60f3692eb783 wxPython-src-2.6.3.3.tar.bz2 18963104
-SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb wxPython-src-2.6.3.3.tar.bz2 18963104
diff --git a/dev-python/wxpython/wxpython-2.6.3.3.ebuild b/dev-python/wxpython/wxpython-2.6.3.3.ebuild
deleted file mode 100644
index c62195d6d872..000000000000
--- a/dev-python/wxpython/wxpython-2.6.3.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v 1.17 2007/12/22 13:49:08 dirtyepic Exp $
-
-inherit python wxwidgets eutils multilib
-
-MY_P="${P/wxpython-/wxPython-src-}"
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="2.6"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="unicode opengl"
-
-RDEPEND=">=dev-lang/python-2.1
- =x11-libs/wxGTK-2.6*
- >=x11-libs/gtk+-2.0
- >=x11-libs/pango-1.2
- >=dev-libs/glib-2.0
- media-libs/libpng
- media-libs/jpeg
- media-libs/tiff
- >=sys-libs/zlib-1.1.4
- opengl? ( >=dev-python/pyopengl-2.0.0.44 )
- !<dev-python/wxpython-2.4.2.4-r1"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}/wxPython/
-
-pkg_setup() {
- if use opengl; then
- if ! built_with_use x11-libs/wxGTK opengl; then
- echo
- eerror "To build wxpython with opengl support, wxGTK must also be"
- eerror "built with USE=\"opengl\"."
- die "Rebuild wxGTK with USE=\"opengl\""
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
- epatch "${FILESDIR}/scripts-multiver-2.6.1.0.diff"
-}
-
-src_compile() {
- local mypyconf
- export WX_GTK_VER="2.6"
- if use unicode; then
- need-wxwidgets unicode || die "Please re-emerge wxGTK with unicode " \
- "in USE"
- else
- need-wxwidgets gtk2
- fi
-
- mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
- use opengl \
- && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
- || mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
- mypyconf="${mypyconf} WXPORT=gtk2"
-
- use unicode && mypyconf="${mypyconf} UNICODE=1"
-
- python setup.py ${mypyconf} build || die "build failed"
-}
-
-src_install() {
- python_version
- local mypyconf
- local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
- dodir ${site_pkgs}
-
- mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
- use opengl \
- && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
- || mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
- mypyconf="${mypyconf} WXPORT=gtk2"
-
- use unicode && mypyconf="${mypyconf} UNICODE=1"
-
- python setup.py ${mypyconf} install --prefix=/usr --root="${D}" || die
-
- if [ -e "${site_pkgs}/wx.pth" ] && [ "`grep -o 2.4 ${site_pkgs}/wx.pth`" = "2.4" ]; then
- rm "${D}"/${site_pkgs}/wx.pth
- elog "Keeping 2.4 as system default wxPython"
- else
- if use unicode; then
- wx_name=wx-${PV:0:3}-gtk2-unicode
- else
- wx_name=wx-${PV:0:3}-gtk2-ansi
- fi
-
- elog "Setting ${wx_name} as system default wxPython"
- echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
- die "Couldn't create wx.pth"
-
- fi
-
- cp "${FILESDIR}"/wxpy-config.py "${D}"/${site_pkgs}/
-
- #Add ${PV} suffix to all /usr/bin/* programs to avoid clobbering SLOT'd
- for filename in "${D}"/usr/bin/* ; do
- mv ${filename} ${filename}-2.6
- done
-}
-
-pkg_postinst() {
- elog "Gentoo now uses the Multi-version method for SLOT'ing"
- elog "Developers see this site for instructions on using 2.4 or 2.6"
- elog "with your apps:"
- elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-}