Don't use deprecated python functions, switch to EAPI 2, use python version in
authorRyan Hill <rhill@gentoo.org>
Sat, 6 Mar 2010 05:42:22 +0000 (05:42 +0000)
committerRyan Hill <rhill@gentoo.org>
Sat, 6 Mar 2010 05:42:22 +0000 (05:42 +0000)
wrapper script.  No change in functionality.  Remove old.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

dev-util/wxglade/ChangeLog
dev-util/wxglade/Manifest
dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch [deleted file]
dev-util/wxglade/wxglade-0.6.1.ebuild [deleted file]
dev-util/wxglade/wxglade-0.6.3.ebuild
dev-util/wxglade/wxglade-0.6.ebuild [deleted file]

index 517d3cb9d3ec3a71e17b459d393d9b91674cc2dd..5f2f603f0024b432f016361d91aa08ba405b4fec 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/wxglade
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.50 2008/10/18 19:23:57 fmccor Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/ChangeLog,v 1.51 2010/03/06 05:42:22 dirtyepic Exp $
+
+  06 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> -wxglade-0.6.ebuild,
+  -wxglade-0.6.1.ebuild, -files/wxglade-0.6.1-wxversion.patch,
+  wxglade-0.6.3.ebuild:
+  Don't use deprecated python functions, switch to EAPI 2, use python version in
+  wrapper script.  No change in functionality.  Remove old.
 
   18 Oct 2008; Ferris McCormick <fmccor@gentoo.org> wxglade-0.6.3.ebuild:
   Sparc stable, Bug #242114.
index 8e5fca64223a0f55a4ac3b0e535d84f170df08ad..14183c100b26c0a819879bc41db5685555fe881b 100644 (file)
@@ -1,10 +1,15 @@
-AUX wxglade-0.6.1-wxversion.patch 362 RMD160 72fb56b5e88c1eaea4dccbad71720f5d51ccd3e8 SHA1 24024def4df3ad05cf87cbd293ecd2b638f6b9db SHA256 d94ab14bdc70c6dc667bc62307923b2db4cca5ef14a55577330cbfb720dfefd6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wxglade-0.6.3-wxversion.patch 362 RMD160 1232ee91b1b5a154bee794c09e52f6f508449d7d SHA1 d43c63cb04254bbda24c35344b1e1b10d72250dd SHA256 d9778a005b4190eceb966f1661deab5d92e9d49c50b87803d21883cf7126ed76
-DIST wxGlade-0.6.1.tar.gz 582089 RMD160 3ac92508766c7975e2d34ed5e5b400568b37afe6 SHA1 59b1afb803ccfadd1d27caeaefca7e030eb107ab SHA256 06c163a98bf1bac449a4281d0082c1766ea860ff2fe68d63492412b001a76c8a
 DIST wxGlade-0.6.3.tar.gz 595243 RMD160 e315c02eedc1919b1d517d8a2f18be52b4e3d786 SHA1 2f48b28e7990684c26f105ed6f9acdf1b617f187 SHA256 28f0a15a8eb4d16039a1981bdcdc74bed12b595a4de8c11cf068b970fb80a68d
-DIST wxGlade-0.6.tar.gz 562519 RMD160 0c338ad258776a3482aff48a8be15d69cedd783c SHA1 12475c998cb0da162a94b2a6e24cfa346c20fbd6 SHA256 35dfad6f21894115811d9e7a4f08e1bcebb2fbef7c1dbb46cf22b40c472c7923
-EBUILD wxglade-0.6.1.ebuild 1609 RMD160 b5a022af2f1d1971e11a0038e1c85c566b256cbb SHA1 6e531acc8714163b18efab957194bf677f018714 SHA256 5b8db80660ad1bb7d34773dbf083909c71a57fab84a42de61ef9c016bb63362e
-EBUILD wxglade-0.6.3.ebuild 1611 RMD160 19047af9f46f268be967012e80cb78f76227f22e SHA1 7e35b593b74eb5c1d7857d1ac88ee78ccaecae75 SHA256 cebb350df39d14f46eed00f0398a21191073a66c538ae136f7b329d76838a762
-EBUILD wxglade-0.6.ebuild 1610 RMD160 03498a35eab8a0b2f629b8e5a8f821a9bd1d5970 SHA1 73fd57090e4bb1c588a701279bf5b7c4063f1195 SHA256 8df599a7f3e70a36a3941fbe35c626f3294f0faacf8cb60de1c1265519eacf38
-MISC ChangeLog 6511 RMD160 bb759eda7db1bd739bb5e734c09b11296d5afcc6 SHA1 1b6bc4c94cf3c91beaa0e4eebe37497d30c0e0a2 SHA256 6d0d20cd72b41b9e3c0c3926f40a9c8f914d33154cef58933000464333d8a7bb
+EBUILD wxglade-0.6.3.ebuild 1367 RMD160 28e01d28b935afb3bf187de405dfa4d5cd828769 SHA1 1d58c58b2682dade8712f9864b8670a6e69a966c SHA256 df037501d3a42a4f403574e3b0e47783e3d0db260daca36439ea675e739e8478
+MISC ChangeLog 6812 RMD160 692270d4ff367a827e9f989448bd674e91a16968 SHA1 87ef0ca071746634b182b02ae03b5f7832cdcec7 SHA256 f0cee540eba02490db19e167a96ab6ec3c2a63a9c8df0b89953f9ac73cacfb65
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkuR69sACgkQiqiDRvmkBmKq9QCeMGz82lobKQvMwv/g3tGBQv2t
+mA8AoOvcRZkURkDy7kkmp1beXeFuluuR
+=fegj
+-----END PGP SIGNATURE-----
diff --git a/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch
deleted file mode 100644 (file)
index f793266..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxGlade-0.6.1-orig/main.py wxGlade-0.6.1/main.py
---- wxGlade-0.6.1-orig/main.py 2007-10-25 01:03:22.000000000 -0600
-+++ wxGlade-0.6.1/main.py      2007-12-04 09:36:20.000000000 -0600
-@@ -7,7 +7,7 @@
- # THIS PROGRAM COMES WITH NO WARRANTY
- 
- import wxversion
--wxversion.ensureMinimal("2.6")
-+wxversion.select("2.6")
- 
- #from wxPython.wx import *
- import wx
diff --git a/dev-util/wxglade/wxglade-0.6.1.ebuild b/dev-util/wxglade/wxglade-0.6.1.ebuild
deleted file mode 100644 (file)
index e8500bf..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.1.ebuild,v 1.4 2008/05/29 16:50:57 hawking Exp $
-
-inherit python multilib eutils
-
-MY_P="wxGlade-${PV}"
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-S="${WORKDIR}/${MY_P}"
-DEPEND=">=dev-lang/python-2.3
-       =dev-python/wxpython-2.6*"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}"/${P}-wxversion.patch
-}
-
-src_install() {
-       python_version
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-       dodoc CHANGES.txt README.txt TODO.txt credits.txt
-       cp credits.txt "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dohtml -r docs/*
-       rm -rf docs *txt
-       cp -R * "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dosym /usr/share/doc/${PF}/html /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/docs
-       echo "#!/bin/bash" > wxglade
-       echo "exec python /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/wxglade.py \$*" >> wxglade
-       exeinto /usr/bin
-       doexe wxglade
-       insinto /usr/share/pixmaps
-       newins icons/icon.xpm wxglade.xpm
-       make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
-
-pkg_postinst() {
-       python_version
-       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/wxglade
-}
-
-pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/wxglade
-}
index 8cbfa783ba59481ffa38bf276b3483bb153ced71..fc918b7e02e5d8cf90d46c4989c5bd0a1162a648 100644 (file)
@@ -1,51 +1,62 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.3.ebuild,v 1.6 2008/10/18 19:23:57 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.3.ebuild,v 1.7 2010/03/06 05:42:22 dirtyepic Exp $
 
-inherit python multilib eutils
+EAPI="2"
+
+inherit eutils multilib python
 
 MY_P="wxGlade-${PV}"
+
 DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
 HOMEPAGE="http://wxglade.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
-S="${WORKDIR}/${MY_P}"
-DEPEND=">=dev-lang/python-2.3
-       =dev-python/wxpython-2.8*"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+DEPEND="dev-python/wxpython:2.8"
+PYTHON_DEPEND="2:2.3"
 
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
        epatch "${FILESDIR}"/${P}-wxversion.patch
 }
 
 src_install() {
-       python_version
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
        dodoc CHANGES.txt README.txt TODO.txt credits.txt
-       cp credits.txt "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dohtml -r docs/*
+
+       pydir=$(python_get_sitedir)/wxglade
+
+       dodir "${pydir}"
+       mv "${S}"/credits.txt "${D}${pydir}"
+       dohtml -r "${S}"/docs/*
        rm -rf docs *txt
-       cp -R * "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dosym /usr/share/doc/${PF}/html /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/docs
-       echo "#!/bin/bash" > wxglade
-       echo "exec python /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/wxglade.py \$*" >> wxglade
+
+       cp -R "${S}"/* "${D}${pydir}"
+       dosym /usr/share/doc/${PF}/html "${pydir}"/docs
+
+       cat > "${S}"/wxglade <<-EOF
+               #!/bin/sh
+               $(PYTHON) ${pydir}/wxglade.py \$*
+       EOF
+
        exeinto /usr/bin
-       doexe wxglade
+       doexe "${S}"/wxglade
+
        insinto /usr/share/pixmaps
        newins icons/icon.xpm wxglade.xpm
+
        make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
 }
 
 pkg_postinst() {
-       python_version
-       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/wxglade
+       python_mod_optimize "$(python_get_sitedir)"/wxglade
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/wxglade
+       python_mod_cleanup "$(python_get_sitedir)"/wxglade
 }
diff --git a/dev-util/wxglade/wxglade-0.6.ebuild b/dev-util/wxglade/wxglade-0.6.ebuild
deleted file mode 100644 (file)
index aab2f48..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wxglade/wxglade-0.6.ebuild,v 1.9 2008/05/29 16:50:57 hawking Exp $
-
-inherit python multilib eutils
-
-MY_P="wxGlade-${PV}"
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-S="${WORKDIR}/${MY_P}"
-DEPEND=">=dev-lang/python-2.3
-       =dev-python/wxpython-2.6*"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}"/${PN}-0.6.1-wxversion.patch
-}
-
-src_install() {
-       python_version
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-       dodoc CHANGES.txt README.txt TODO.txt credits.txt
-       cp credits.txt "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dohtml -r docs/*
-       rm -rf docs *txt
-       cp -R * "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/
-       dosym /usr/share/doc/${PF}/html /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/docs
-       echo "#!/bin/bash" > wxglade
-       echo "exec python /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/wxglade.py \$*" >> wxglade
-       exeinto /usr/bin
-       doexe wxglade
-       insinto /usr/share/pixmaps
-       newins icons/icon.xpm wxglade.xpm
-       make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
-
-pkg_postinst() {
-       python_version
-       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/wxglade
-}
-
-pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/wxglade
-}