From: Ryan Hill Date: Fri, 9 Dec 2011 03:29:30 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b4e3e12d453ab5c946f457a3f593be7e2f5a495a;p=gentoo.git Remove old. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 03a4bb09c7b6..cefd6dd88129 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/wxpython # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.150 2011/07/16 09:34:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.151 2011/12/09 03:29:30 dirtyepic Exp $ + + 09 Dec 2011; Ryan Hill -wxpython-2.8.10.1.ebuild, + -files/wxpython-2.8-drop-editra.patch: + Remove old. 16 Jul 2011; Kacper Kowalik wxpython-2.8.11.0.ebuild: ppc64 stable wrt #364203 diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index aa67a4eae9ab..bf4e52f050f8 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -3,39 +3,32 @@ Hash: SHA1 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084 AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 -AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc00d5ebf9 SHA1 755549eea057f3f84ffdd19c3d7ea8f1ed7a3ca8 SHA256 b54b8ddf0f50e0d6c214d7e7d7105389a160a633ee2307b2f4a4c09b40a65f28 AUX wxpython-2.8-wxversion-demo.patch 219 RMD160 5ec8b5179fe03493786965849494adb0f697eb23 SHA1 92ccb9e099def1ff9ff842b5bfbbd769c1d06c6e SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c AUX wxpython-2.8.11-drop-editra.patch 2197 RMD160 49364666c2c71f58bc89d63dbce7086cf786ea95 SHA1 9777b6e20a095249eb9a51f99ecefdea709c5066 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b AUX wxpython-2.8.12-drop-editra.patch 2643 RMD160 11d3cda0646e79ec78fa720650d188cec452d2f7 SHA1 5ac5dd8506d86968a2b8621e8ee6b85f8e1757cc SHA256 bbe4960ab735f344916e36cb772a1a6c7e27d6540c7ee1dcd8437bff8fb6bee8 AUX wxpython-2.8.9-wxversion-scripts.patch 7730 RMD160 e93c7b883b1ad22011df069d8d6ad24938ea8b07 SHA1 cf05e834a6e4325f51881f62113922e3aa20f5c4 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 AUX wxpython-2.9-wxversion-demo.patch 147 RMD160 5a666314fe5893d8246b73ebbc32e00b928c9e1a SHA1 73499356a2cd2f8262ca0624dea6f9b38f93a371 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 AUX wxpython-2.9-wxversion-scripts.patch 4600 RMD160 6bc6f7966c39c2e072aec65412858843c957b4d0 SHA1 983db57bcfd143378cd81d28a1008f0d04733e1c SHA256 6c5cd5f3daa51bf3c033f1c934ac1ce219a421a7e993660c64ac532a9dd96675 -DIST wxPython-demo-2.8.10.1.tar.bz2 3605257 RMD160 00aa54621e3b0a16c2f77bb8b7663a64328c5e75 SHA1 2dc2df3ae3180866715ee7a2e9c2eb5bd7231ab2 SHA256 b2f15413e117547344a4b80db8bf6d2750c333454fcea427b38c9b62793643a0 DIST wxPython-demo-2.8.11.0.tar.bz2 3894559 RMD160 74337736081d809e85e212c72a45cfd7bd23c236 SHA1 9e9a148bf8590d69bc652c535c8dc5b860f01043 SHA256 b4463d50bb597b66471e218f94e6e6f94e05689735038348f9689de941cc24d3 DIST wxPython-demo-2.8.12.0.tar.bz2 3907278 RMD160 784cb3aae45efe6ccbe3bd8dcb5ca7e77dfd3713 SHA1 7698d8a8960882aed3bba76d93abdef560e9a67c SHA256 d85bec805a84e0f00ca18198c8e74243b714f79cf900cef44747cdd6795d8a49 DIST wxPython-demo-2.9.1.1.tar.bz2 3925228 RMD160 082f1610dc2b2a9852d52077c09da54f3e162d73 SHA1 8b0fe8032d6e85950850d42dbd57882d1fda7fc9 SHA256 f3b689e17f347744b55fff948dc68f58905ba35a9647c3b3c2cf881374522371 -DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cda3c06cd60bf SHA1 d096994904aabdc23ca6717af640b32963798a16 SHA256 3992384869dcb3c757da5f4e63e7ef4ab24f2fa1842edd5e126be4856bb951c0 DIST wxPython-docs-2.8.11.0.tar.bz2 2331727 RMD160 da31b1da7e8f4862c404a14de2216216ab53aae4 SHA1 6d42177e72b93f286f55cc298bc7ab29531ffa7f SHA256 1e95cf1033902fd4c7abc1b9d34688179f8b699a0f74455fec541a6ad421590d DIST wxPython-docs-2.8.12.0.tar.bz2 2331441 RMD160 1e857c7f3995f2fcb9c6f1aaec4ac3e9e8b69772 SHA1 7c8e39604ad605092f6350a94146e7fbcb5b1abc SHA256 f8cb26593ba3f51b423f04ab6b1872ffe92aa8b78419e3aa36a6a850e53e70d7 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca26d1ad1a28a5d SHA1 eedef5ef87824b28a6fe4d338420cf6249ac1f2f SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba -DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a EBUILD wxpython-2.6.4.0-r2.ebuild 3575 RMD160 e98b4ed5d66c10061ac28fac635d8d0f1d5c761d SHA1 6e54f848057fd4edbcfd41565b7345633b0d521b SHA256 b670af6696125128c1d98b3bb4085652a82ff0e776d7c8bcfc9b8a0bd3e51a76 -EBUILD wxpython-2.8.10.1.ebuild 5392 RMD160 b57c9d3fedc1520011182b32cd7df9a51f821fd2 SHA1 0a9a5d1060f27de8dce94a98519e1995de728763 SHA256 04ec3086543c4e75b114126b64f3428cc1916392afda6904e484175c1523d864 EBUILD wxpython-2.8.11.0.ebuild 5459 RMD160 4b097238379f7b06abedf4a64fac4e9437645f10 SHA1 d2727f3f4b3ef143813914d45d2045289d094367 SHA256 2b247905e294a59b83a6ec7f4468cfb2f8340a9190c6fd727cdf3e8c23661771 EBUILD wxpython-2.8.12.0.ebuild 5479 RMD160 c8a5a72d867d8ac066021fa54ddd87e63fc7aa1f SHA1 5996ddf034bc6663ee142bd2b14150b0c3500654 SHA256 5665683612d6f812f7aedb3a7002d725a20879fb5e5825d4b75b0ef2628b0d3f EBUILD wxpython-2.9.1.1.ebuild 4943 RMD160 547558442c83bbc874ec088c581393fef22c2c73 SHA1 62db1bc37fb8e0a65129270d54801a8ef2ab4440 SHA256 4350e3a00af3fee267764b6077ec373e7f6f8997ab2baeeca6c4325f9e7ab5f2 -MISC ChangeLog 27433 RMD160 caa7c33f54849141823a58add052922d69cd4ac1 SHA1 a41553639ef43eb7a038bf8f94cdf25fa53b966d SHA256 2e50cf3c18cd78b5a084301adb53190828bcd88a623dbe536b46b0d2c5eb91cf +MISC ChangeLog 27563 RMD160 e35ddd100fd1d1c28187114d8d25052755fa2ce7 SHA1 d76799dbf60da31c338642e2f2d1d1d7da0c04ce SHA256 10945eb58c90fa3d11783ac9df9c37232f6588769136fcb65b13993c5f7966a5 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk4hWysACgkQIiMqcbOVdxQHRwP/T29Tvze0hNaqan1RM79MG0Zv -I/v3DNzYbucFeDmFwIYuY+DumGyRp9yV/Xb+3MR8UUuyfxknMqA+ARjt+HhD8Ti6 -kquqV/tB2AOBVN2o/tmmqJ3o56T4okxV0Z/+5f+PjUm//gKvpFtEQFDVtOcPfImm -XGky7vd5rqER5ZHaoqQ= -=TkbX +iEYEARECAAYFAk7hgv0ACgkQiqiDRvmkBmL07gCgz4PutiChsD+BWf0MZJ4bOeKS +NkoAn2wNGNaMjMcYzLciOcGw/dSB5dkj +=Imry -----END PGP SIGNATURE----- diff --git a/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch deleted file mode 100644 index bd1705c62ee5..000000000000 --- a/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/setup.py wxPython-src-2.8.9.2/wxPython/setup.py ---- wxPython-src-2.8.9.2-orig/wxPython/setup.py 2009-02-21 13:13:31.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/setup.py 2009-02-21 13:14:12.000000000 -0600 -@@ -878,12 +878,6 @@ WX_PKGLIST = [ 'wx', - 'wx.tools', - 'wx.tools.XRCed', - 'wx.tools.XRCed.plugins', -- 'wx.tools.Editra', -- 'wx.tools.Editra.src', -- 'wx.tools.Editra.src.autocomp', -- 'wx.tools.Editra.src.eclib', -- 'wx.tools.Editra.src.extern', -- 'wx.tools.Editra.src.syntax', - ] - - if not EGGing: -@@ -910,7 +904,6 @@ else: - opj('scripts/pywrap'), - opj('scripts/pywxrc'), - opj('scripts/xrced'), -- opj('scripts/editra'), - ] - - -@@ -922,16 +915,6 @@ DATA_FILES += find_data_files('wx/tools/ - DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') - DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') - --DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') --DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') --DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', -- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') --DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') --DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') --DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') --DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') --DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) -- - - ## import pprint - ## pprint.pprint(DATA_FILES) -@@ -981,7 +964,6 @@ if EGGing: - 'pyshell = wx.py.PyShell:main', - 'pywrap = wx.py.PyWrap:main', - 'helpviewer = wx.tools.helpviewer:main', -- 'editra = wx.tools.Editra.launcher:main', - 'xrced = wx.tools.XRCed.xrced:main', - ], - }, diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild deleted file mode 100644 index a11c4d80d563..000000000000 --- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.20 2011/04/21 01:20:09 arfrever Exp $ - -EAPI="2" -PYTHON_DEPEND="2" -WX_GTK_VER="2.8" -SUPPORT_PYTHON_ABIS="1" - -inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets - -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 - doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 - mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) - examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" - -LICENSE="wxWinLL-3" -SLOT="2.8" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="cairo doc examples opengl" - -RDEPEND=" - dev-python/setuptools - >=x11-libs/wxGTK-${PV}:2.8[X,opengl?] - x11-libs/gtk+:2 - >=x11-libs/pango-1.2 - dev-libs/glib:2 - media-libs/libpng - virtual/jpeg - media-libs/tiff - cairo? ( >=dev-python/pycairo-1.8.4 ) - opengl? ( >=dev-python/pyopengl-2.0.0.44 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -RESTRICT_PYTHON_ABIS="3.* *-jython" - -S="${WORKDIR}/${MY_P}/wxPython" -DOC_S="${WORKDIR}/wxPython-${PV}" - -src_prepare() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch - # drop editra - we have it as a separate package now - epatch "${FILESDIR}"/${PN}-${SLOT}-drop-editra.patch - - if use doc; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch - fi - - if use examples; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - python_copy_sources -} - -src_configure() { - need-wxwidgets unicode - - append-flags -fno-strict-aliasing - - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - - mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" -} - -src_compile() { - building() { - "$(PYTHON)" setup.py ${mypyconf} build - } - python_execute_function -s building -} - -src_install() { - local mypyconf - - mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" - - installation() { - "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir) - } - python_execute_function -s installation - - # Collision protection. - for file in "${D}"/usr/bin/*; do - mv "${file}" "${file}-${SLOT}" - done - rename_files() { - for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || return 1 - done - } - python_execute_function -q rename_files - - dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - insinto /usr/share/applications - doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop - insinto /usr/share/pixmaps - newins "${S}"/wx/py/PyCrust_32.png PyCrust.png - newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png - - if use doc; then - dodir /usr/share/doc/${PF}/docs - cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/ - # For some reason 2.8.10.1 api docs are not available, so use 2.8.9.2's - cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/ - fi - - if use examples; then - dodir /usr/share/doc/${PF}/demo - dodir /usr/share/doc/${PF}/samples - cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ - cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_execute_function -q create_symlinks - - python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "2.6 or 2.8 with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - elog - if use doc; then - elog "To access the general wxWidgets documentation, run" - elog "/usr/share/doc/${PF}/docs/viewdocs.py" - elog - elog "wxPython documentation is available by pointing a browser" - elog "at /usr/share/doc/${PF}/docs/api/index.html" - elog - fi - if use examples; then - elog "The demo.py app which contains hundreds of demo modules" - elog "with documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - elog - elog "Many more example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi - echo - ewarn "Editra is no longer packaged with wxpython in Gentoo." - ewarn "You can find it in the tree as app-editors/editra" - echo -} - -pkg_postrm() { - python_mod_cleanup wx-${SLOT}-gtk2-unicode wxversion.py - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_execute_function -q create_symlinks -}