[patch] diff -u patch of ebuilds

rabbitvcs.patch (text/plain), 3.20 KB, created by Ian Delaney (RETIRED) on 2015-03-29 12:53:54 UTC

--- rabbitvcs-0.16.ebuild	2015-03-07 02:36:35.000000000 +0800
+++ rabbitvcs-0.16-r1.ebuild	2015-03-29 20:40:41.179060339 +0800
@@ -4,11 +4,10 @@
 
 EAPI=5
 
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit eutils gnome2-utils multilib distutils vcs-snapshot
+inherit eutils gnome2-utils multilib distutils-r1 vcs-snapshot
 
 DESCRIPTION="Integrated version control support for your desktop"
 HOMEPAGE="http://rabbitvcs.org"
@@ -17,54 +16,49 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="caja cli diff gedit git nautilus spell thunar"
+IUSE="caja cli diff git nautilus spell thunar"
 
-RDEPEND="dev-python/configobj
-	dev-python/pygobject:2
-	dev-python/pygtk
-	dev-python/pysvn
-	dev-python/simplejson
-	caja? ( dev-python/python-caja
-		dev-python/dbus-python
-		dev-python/gnome-vfs-python )
+RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pysvn[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	caja? ( dev-python/python-caja[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
 	diff? ( dev-util/meld )
-	gedit? ( app-editors/gedit )
-	git? ( dev-python/dulwich )
-	nautilus? ( >=dev-python/nautilus-python-0.7.0
-		dev-python/dbus-python
-		dev-python/gnome-vfs-python )
-	spell? ( dev-python/gtkspell-python )
-	thunar? ( dev-python/thunarx-python
-		dev-python/dbus-python )"
+	git? ( dev-python/dulwich[${PYTHON_USEDEP}] )
+	nautilus? ( >=dev-python/nautilus-python-0.7.0[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
+	spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
+	thunar? ( dev-python/thunarx-python[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}] )"
 
-src_prepare() {
-	python_convert_shebangs -r 2 .
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
 
-	distutils_src_prepare
+python_prepare() {
+	distutils-r1_python_prepare
+	python_fix_shebang .
 
 	# we should not do gtk-update-icon-cache from setup script
 	# we prefer portage for that
 	sed -e 's/"install"/"fakeinstall"/' -i "${S}/setup.py" || die
 }
 
-src_install() {
-	distutils_src_install
 
+python_install() {
+        distutils-r1_python_install
+
+	if use cli ; then
+		python_doscript clients/cli/${PN}
+	fi
 	if use caja ; then
 		insinto /usr/share/caja-python/extensions
 		doins clients/caja/RabbitVCS.py
 	fi
-	if use cli ; then
-		dobin clients/cli/${PN}
-	fi
-	if use gedit ; then
-		insinto /usr/$(get_libdir)/gedit-2/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit2.gedit-plugin
-		insinto /usr/$(get_libdir)/gedit/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit3.plugin
-	fi
 	if use nautilus ; then
 		insinto /usr/$(get_libdir)/nautilus/extensions-2.0/python
 		doins clients/nautilus/RabbitVCS.py
@@ -84,7 +78,6 @@
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	gnome2_icon_cache_update
 
 	elog "You should restart file manager to changes take effect:"
@@ -97,6 +90,5 @@
 }
 
 pkg_postrm() {
-	distutils_pkg_postrm
 	gnome2_icon_cache_update
 }