3 files changed, 53 insertions, 70 deletions
diff --git a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
index 319bb85c1663..f788e0bff492 100644
--- a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
+++ b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
@@ -1,5 +1,5 @@
 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-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
diff --git a/dev-util/wxglade/wxglade-0.6.3-r1.ebuild b/dev-util/wxglade/wxglade-0.6.3-r1.ebuild
deleted file mode 100644
index 54ec6b075558..000000000000
--- a/dev-util/wxglade/wxglade-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-
-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=""
-
-DEPEND="dev-python/wxpython:2.8"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wxversion.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt TODO.txt
-	newicon icons/icon.xpm wxglade.xpm || die "installing wxglade.xpm failed"
-	doman "${S}"/debian/wxglade.1 || die "installing man failed"
-	rm -rf "${S}"/debian
-	dohtml -r "${S}"/docs/* || die "installing docs failied"
-	rm -rf "${S}"/docs
-
-	python_copy_sources
-
-	installation() {
-		pydir=$(python_get_sitedir)/${PN}
-		insinto "${pydir}"
-		doins "${S}"/credits.txt || die "installing credits.txt failed"
-		doins -r ./* || die "installing failed"
-		dosym /usr/share/doc/${PF}/html "${pydir}"/docs || die "doc symlink failed"
-		fperms 775 "${pydir}"/wxglade.py
-		dosym "${pydir}"/wxglade.py /usr/bin/wxglade-$(python_get_version) \
-			|| die "main symlink failed"
-	}
-	python_execute_function -s installation
-
-	python_generate_wrapper_scripts -E -f -q "${D}"usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
-
-pkg_postinst() {
-	python_mod_optimize wxglade
-}
-
-pkg_postrm() {
-	python_mod_cleanup wxglade
-}
diff --git a/dev-util/wxglade/wxglade-0.6.3-r2.ebuild b/dev-util/wxglade/wxglade-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..f260240ca396
--- /dev/null
+++ b/dev-util/wxglade/wxglade-0.6.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+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=""
+
+RDEPEND="dev-python/wxpython:2.8[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-wxversion.patch
+	eapply_user
+}
+
+src_compile() {
+	python_fix_shebang wxglade.py
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt TODO.txt
+	newicon icons/icon.xpm wxglade.xpm
+	doman debian/wxglade.1
+	dodoc -r docs
+	rm -r debian docs || die
+
+	python_moduleinto /usr/lib/wxglade
+	python_domodule .
+	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
+	fperms 775 /usr/lib/wxglade/wxglade.py
+	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
+
+	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
+}