Don't use deprecated python functions, switch to EAPI 2, use python version in

wrapper script.  No change in functionality.  Remove old.
(Portage version: 2.2_rc65/cvs/Linux x86_64)

5 files changed, 40 insertions, 137 deletions

diff --git a/dev-util/wxglade/ChangeLog b/dev-util/wxglade/ChangeLog
index 517d3cb9d3ec..5f2f603f0024 100644
--- a/dev-util/wxglade/ChangeLog
+++ b/dev-util/wxglade/ChangeLog
@@ -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.
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
index f793266b3b9c..000000000000
--- a/dev-util/wxglade/files/wxglade-0.6.1-wxversion.patch
+++ /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
index e8500bfbb850..000000000000
--- a/dev-util/wxglade/wxglade-0.6.1.ebuild
+++ /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
-}
diff --git a/dev-util/wxglade/wxglade-0.6.3.ebuild b/dev-util/wxglade/wxglade-0.6.3.ebuild
index 8cbfa783ba59..fc918b7e02e5 100644
--- a/dev-util/wxglade/wxglade-0.6.3.ebuild
+++ b/dev-util/wxglade/wxglade-0.6.3.ebuild
@@ -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
index aab2f48c4558..000000000000
--- a/dev-util/wxglade/wxglade-0.6.ebuild
+++ /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
-}