Fixing paths (bug#446074) and version update

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)

3 files changed, 76 insertions, 7 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index b0529b6704da..347b8a103650 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/osc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.12 2012/12/17 10:00:35 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.13 2013/03/18 10:26:27 miska Exp $
+
+*osc-0.139.1 (18 Mar 2013)
+
+  18 Mar 2013; Michal Hrusecky <miska@gentoo.org> +osc-0.139.1.ebuild,
+  osc-9999.ebuild:
+  Fixing paths (bug#446074) and version update
 
   17 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.136.0.ebuild,
   osc-0.137.0.ebuild:
diff --git a/dev-util/osc/osc-0.139.1.ebuild b/dev-util/osc/osc-0.139.1.ebuild
new file mode 100644
index 000000000000..b51add450304
--- /dev/null
+++ b/dev-util/osc/osc-0.139.1.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.1.ebuild,v 1.1 2013/03/18 10:26:27 miska Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+PYTHON_DEPEND="2:2.6"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit distutils ${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
+	dev-python/pyxml
+	dev-python/elementtree
+	app-arch/rpm[python]
+	dev-python/m2crypto
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_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 4d08e4693f48..611fa276c638 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.7 2012/11/19 13:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.8 2013/03/18 10:26:27 miska Exp $
 
 EAPI=5
 
@@ -25,7 +25,10 @@ HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-[[ "${PV}" == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-python/urlgrabber
@@ -49,7 +52,8 @@ 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/share/suse-build|g' {} +
+	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*
 }