summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2014-04-21 07:29:13 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2014-04-21 07:29:13 +0000
commit75d1a48752c178857e38cd7c14b93f14a98fcb23 (patch)
tree53cf2608f1b72a92d45e1f4ce6a7e632fd3caf82 /dev-util/osc
parent...and make multilib_build_binaries stand-alone. (diff)
downloadgentoo-2-75d1a48752c178857e38cd7c14b93f14a98fcb23.tar.gz
gentoo-2-75d1a48752c178857e38cd7c14b93f14a98fcb23.tar.bz2
gentoo-2-75d1a48752c178857e38cd7c14b93f14a98fcb23.zip
Stabilise on amd64 and x86. Drop older.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-util/osc')
-rw-r--r--dev-util/osc/ChangeLog6
-rw-r--r--dev-util/osc/osc-0.143.0.ebuild63
-rw-r--r--dev-util/osc/osc-0.144.1.ebuild4
3 files changed, 7 insertions, 66 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 02c56a296074..e286cdb7b0a6 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/osc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.30 2014/03/05 13:50:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.31 2014/04/21 07:29:13 scarabeus Exp $
+
+ 21 Apr 2014; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.143.0.ebuild,
+ osc-0.144.1.ebuild:
+ Stabilise on amd64 and x86. Drop older.
*osc-0.144.1 (05 Mar 2014)
diff --git a/dev-util/osc/osc-0.143.0.ebuild b/dev-util/osc/osc-0.143.0.ebuild
deleted file mode 100644
index a6edacef7c84..000000000000
--- a/dev-util/osc/osc-0.143.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.143.0.ebuild,v 1.3 2014/02/25 12:41:31 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="xml"
-
-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}]
- 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.144.1.ebuild b/dev-util/osc/osc-0.144.1.ebuild
index 277ccb1e1f9b..29640383ca40 100644
--- a/dev-util/osc/osc-0.144.1.ebuild
+++ b/dev-util/osc/osc-0.144.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.144.1.ebuild,v 1.1 2014/03/05 13:50:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.144.1.ebuild,v 1.2 2014/04/21 07:29:13 scarabeus Exp $
EAPI=5
@@ -31,7 +31,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}]