Stabilise on amd64 and x86 per previous commit.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 7 insertions, 66 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index d6c1efe8e435..3840479968ee 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2013/11/02 09:09:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.22 2013/11/02 09:10:43 scarabeus Exp $
+
+  02 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.140.1.ebuild,
+  osc-0.141.0.ebuild, osc-9999.ebuild:
+  Stabilise on amd64 and x86 per previous commit.
 
 *osc-0.141.0 (02 Nov 2013)
 
diff --git a/dev-util/osc/osc-0.140.1.ebuild b/dev-util/osc/osc-0.140.1.ebuild
deleted file mode 100644
index 53484eb8606e..000000000000
--- a/dev-util/osc/osc-0.140.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.140.1.ebuild,v 1.2 2013/09/10 13:03:34 scarabeus 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
-
-DISTUTILS_SINGLE_IMPL=1
-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}]
-	${PYTHON_DEPS}
-"
-PDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-util/obs-service-meta
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.139.2-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-0.141.0.ebuild b/dev-util/osc/osc-0.141.0.ebuild
index a6e6aed19063..76af93aecddc 100644
--- a/dev-util/osc/osc-0.141.0.ebuild
+++ b/dev-util/osc/osc-0.141.0.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.141.0.ebuild,v 1.1 2013/11/02 09:09:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.141.0.ebuild,v 1.2 2013/11/02 09:10:43 scarabeus Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ IUSE=""
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/urlgrabber[${PYTHON_USEDEP}]