[patch] Patch converting to distutils-r1

0001-media-radio-radiotray-convert-to-distutils-r1.patch (text/plain), 4.01 KB, created by Michał Górny on 2013-07-22 10:45:25 UTC

From ba9ebb3ac0bc078be5db62b287c06865929817e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Mon, 22 Jul 2013 12:44:26 +0200
Subject: [PATCH] media-radio/radiotray: convert to distutils-r1.

---
 ...y-0.7.3-r1.ebuild => radiotray-0.7.3-r2.ebuild} | 22 ++++++++---------
 gx86/media-radio/radiotray/radiotray-9999.ebuild   | 28 ++++++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)
 copy gx86/media-radio/radiotray/{radiotray-0.7.3-r1.ebuild => radiotray-0.7.3-r2.ebuild} (65%)

diff --git a/gx86/media-radio/radiotray/radiotray-0.7.3-r1.ebuild b/gx86/media-radio/radiotray/radiotray-0.7.3-r2.ebuild
similarity index 65%
copy from gx86/media-radio/radiotray/radiotray-0.7.3-r1.ebuild
copy to gx86/media-radio/radiotray/radiotray-0.7.3-r2.ebuild
index 52dc1c5..eb84571 100644
--- a/gx86/media-radio/radiotray/radiotray-0.7.3-r1.ebuild
+++ b/gx86/media-radio/radiotray/radiotray-0.7.3-r2.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-radio/radiotray/radiotray-0.7.3-r1.ebuild,v 1.4 2012/12/02 16:57:22 eva Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_COMPAT='python2_6 python2_7'
-inherit base python-distutils-ng
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit distutils-r1
 
 DESCRIPTION="Online radio streaming player"
 HOMEPAGE="http://radiotray.sourceforge.net/"
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/dbus-python
-	dev-python/gst-python:0.10
-	dev-python/pygtk
-	dev-python/lxml
-	dev-python/pyxdg
-	dev-python/pygobject:2
-	dev-python/notify-python
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
 	media-libs/gst-plugins-good:0.10
 	media-libs/gst-plugins-ugly:0.10
 	media-plugins/gst-plugins-alsa:0.10
@@ -33,4 +33,4 @@ RDEPEND="dev-python/dbus-python
 	media-plugins/gst-plugins-soup:0.10
 	media-plugins/gst-plugins-vorbis:0.10"
 
-DEPEND="dev-python/pyxdg"
+DEPEND="dev-python/pyxdg[${PYTHON_USEDEP}]"
diff --git a/gx86/media-radio/radiotray/radiotray-9999.ebuild b/gx86/media-radio/radiotray/radiotray-9999.ebuild
index 3ab16f0..db5b345 100644
--- a/gx86/media-radio/radiotray/radiotray-9999.ebuild
+++ b/gx86/media-radio/radiotray/radiotray-9999.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-radio/radiotray/radiotray-9999.ebuild,v 1.8 2012/12/27 19:01:32 ottxor Exp $
 
-EAPI=4
-PYTHON_COMPAT='python2_6 python2_7'
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
 
-inherit mercurial python-distutils-ng
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+inherit distutils-r1 mercurial
 
 DESCRIPTION="Online radio streaming player"
 HOMEPAGE="http://radiotray.sourceforge.net/"
@@ -24,12 +26,12 @@ for x in ${LANGS}; do
 	IUSE="${IUSE} linguas_${x}"
 done
 
-RDEPEND="dev-python/gst-python:0.10
-	dev-python/pygtk
-	dev-python/lxml
-	dev-python/pyxdg
-	dev-python/pygobject:2
-	dev-python/notify-python
+RDEPEND="dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
 	media-libs/gst-plugins-good:0.10
 	media-libs/gst-plugins-ugly:0.10
 	media-plugins/gst-plugins-alsa:0.10
@@ -42,15 +44,15 @@ RDEPEND="dev-python/gst-python:0.10
 
 DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS CONTRIBUTORS NEWS README"
+DOCS=( AUTHORS CONTRIBUTORS NEWS README )
 
-src_prepare() {
-	python_convert_shebangs -r 2 .
-	distutils_src_prepare
+python_prepare_all() {
 	# remove LINUGAS file so we can create our
 	rm "${S}"/po/LINGUAS
 	for x in ${LANGS}; do
 		use "linguas_${x}" && echo "${x}" >> "${S}"/po/LINGUAS
 		! use "linguas_${x}" && rm "${S}"/po/${x}.po
 	done
+
+	distutils-r1_python_prepare_all
 }
-- 
1.8.3.2