updated to version 0.139.2

* migrated to distutils-r1 (little patch needed)
broke dependency circle (RDEPEND->PDEPEND)

(Portage version: 2.1.12/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 104 insertions, 15 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 6ad5e23eb370..ffb32fac4e29 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/osc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.15 2013/05/04 21:28:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.16 2013/05/27 16:23:57 miska Exp $
+
+*osc-0.139.2 (27 May 2013)
+
+  27 May 2013; Michal Hrusecky <miska@gentoo.org> osc-0.139.1.ebuild,
+  +osc-0.139.2.ebuild, osc-9999.ebuild,
+  +files/osc-0.139.2-out-of-tree-build.patch:
+  updated to version 0.139.2
+  * migrated to distutils-r1 (little patch needed)
+  broke dependency circle (RDEPEND->PDEPEND)
 
   04 May 2013; Mike Gilbert <floppym@gentoo.org> osc-0.139.1.ebuild,
   osc-9999.ebuild:
diff --git a/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch b/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
new file mode 100644
index 000000000000..d0adfe53f615
--- /dev/null
+++ b/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
@@ -0,0 +1,20 @@
+--- setup.py.orig	2013-05-27 13:51:06.143039789 +0000
++++ setup.py	2013-05-27 13:53:27.814034661 +0000
+@@ -25,7 +25,7 @@
+         """
+         """
+         import gzip
+-        man_path = os.path.join('build', 'osc.1.gz')
++        man_path = 'osc.1.gz'
+         distutils.log.info('generating %s' % man_path)
+         outfile = gzip.open(man_path, 'w')
+         osccli = commandline.Osc(stdout=outfile)
+@@ -48,7 +48,7 @@
+ 
+ data_files = []
+ if sys.platform[:3] != 'win':
+-    data_files.append((os.path.join('share', 'man', 'man1'), [os.path.join('build', 'osc.1.gz')]))
++    data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1.gz']))
+ 
+ setup(name='osc',
+       version = osc.core.__version__,
diff --git a/dev-util/osc/osc-0.139.1.ebuild b/dev-util/osc/osc-0.139.1.ebuild
index 960711f07b8f..d79f3dd5f0ef 100644
--- a/dev-util/osc/osc-0.139.1.ebuild
+++ b/dev-util/osc/osc-0.139.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.3 2013/05/04 21:28:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.4 2013/05/27 16:23:57 miska Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ DEPEND="
 	app-arch/rpm[python]
 	dev-python/m2crypto
 "
-RDEPEND="${DEPEND}
+PDEPEND="${DEPEND}
 	app-admin/sudo
 	dev-util/obs-service-meta
 "
diff --git a/dev-util/osc/osc-0.139.2.ebuild b/dev-util/osc/osc-0.139.2.ebuild
new file mode 100644
index 000000000000..b0a987d23a2b
--- /dev/null
+++ b/dev-util/osc/osc-0.139.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.2.ebuild,v 1.1 2013/05/27 16:23:57 miska Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit distutils-r1 ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	app-arch/rpm[python,${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]
+"
+PDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-out-of-tree-build.patch
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
+	cd "${ED}"/usr/
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
+	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+}
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index d72f462aacce..43c8d7c20efa 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.9 2013/05/04 21:28:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.10 2013/05/27 16:23:57 miska Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
-PYTHON_DEPEND="2:2.6"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EXTRA_ECLASS="git-2"
@@ -14,7 +15,7 @@ else
 	EXTRA_ECLASS="obs-download"
 fi
 
-inherit distutils ${EXTRA_ECLASS}
+inherit distutils-r1 ${EXTRA_ECLASS}
 unset EXTRA_ECLASS
 
 DESCRIPTION="Command line tool for Open Build Service"
@@ -31,23 +32,23 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-python/urlgrabber
-	dev-python/pyxml
-	app-arch/rpm[python]
-	dev-python/m2crypto
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	app-arch/rpm[python,${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}
+PDEPEND="${DEPEND}
 	app-admin/sudo
 	dev-util/obs-service-meta
 "
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-out-of-tree-build.patch
+	distutils-r1_src_prepare
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 	dosym osc-wrapper.py /usr/bin/osc
 	keepdir /usr/lib/osc/source_validators
 	cd "${ED}"/usr/