[gentoo-commits] gentoo-x86 commit in dev-util/osc: ChangeLog osc-0.139.2.ebuild osc-9999.ebuild osc-0.139.1.ebuild

[Michal HruAeckA (miska)]

miska       13/05/27 16:23:57

  Modified:             ChangeLog osc-9999.ebuild osc-0.139.1.ebuild
  Added:                osc-0.139.2.ebuild
  Log:
  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)

Revision  Changes    Path
1.16                 dev-util/osc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	4 May 2013 21:28:50 -0000	1.15
+++ ChangeLog	27 May 2013 16:23:57 -0000	1.16
@@ -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@g.o> 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@g.o> osc-0.139.1.ebuild,
   osc-9999.ebuild:



1.10                 dev-util/osc/osc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-9999.ebuild?r1=1.9&r2=1.10

Index: osc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- osc-9999.ebuild	4 May 2013 21:28:50 -0000	1.9
+++ osc-9999.ebuild	27 May 2013 16:23:57 -0000	1.10
@@ -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 @@
 	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 @@
 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/



1.4                  dev-util/osc/osc-0.139.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild?r1=1.3&r2=1.4

Index: osc-0.139.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osc-0.139.1.ebuild	4 May 2013 21:28:50 -0000	1.3
+++ osc-0.139.1.ebuild	27 May 2013 16:23:57 -0000	1.4
@@ -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 @@
 	app-arch/rpm[python]
 	dev-python/m2crypto
 "
-RDEPEND="${DEPEND}
+PDEPEND="${DEPEND}
 	app-admin/sudo
 	dev-util/obs-service-meta
 "



1.1                  dev-util/osc/osc-0.139.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-0.139.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/osc/osc-0.139.2.ebuild?rev=1.1&content-type=text/plain

Index: osc-0.139.2.ebuild
===================================================================
# 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*
}