summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2014-02-25 12:41:31 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2014-02-25 12:41:31 +0000
commit653cf9bdf81733d96eaf6cd063b3df144ba0c4a6 (patch)
tree5b8bac5620db64fc58a0f519299ac355a917b6b1 /dev-util/osc
parentwe want python[xml] not pyxml. (diff)
downloadgentoo-2-653cf9bdf81733d96eaf6cd063b3df144ba0c4a6.tar.gz
gentoo-2-653cf9bdf81733d96eaf6cd063b3df144ba0c4a6.tar.bz2
gentoo-2-653cf9bdf81733d96eaf6cd063b3df144ba0c4a6.zip
Stabilise 0.143.0 on amd64 and x86. Drop older.
(Portage version: 2.2.7/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.142.2.ebuild63
-rw-r--r--dev-util/osc/osc-0.143.0.ebuild4
3 files changed, 7 insertions, 66 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 19fb785e5348..27d8cbbdc8eb 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.27 2014/02/25 12:40:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.28 2014/02/25 12:41:31 scarabeus Exp $
+
+ 25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.142.2.ebuild,
+ osc-0.143.0.ebuild:
+ Stabilise 0.143.0 on amd64 and x86. Drop older.
25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.143.0.ebuild,
osc-9999.ebuild:
diff --git a/dev-util/osc/osc-0.142.2.ebuild b/dev-util/osc/osc-0.142.2.ebuild
deleted file mode 100644
index 4fb1cd1ede08..000000000000
--- a/dev-util/osc/osc-0.142.2.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.142.2.ebuild,v 1.2 2013/12/04 09:25:36 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.143.0.ebuild b/dev-util/osc/osc-0.143.0.ebuild
index 5bb21f6fb650..a6edacef7c84 100644
--- a/dev-util/osc/osc-0.143.0.ebuild
+++ b/dev-util/osc/osc-0.143.0.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.143.0.ebuild,v 1.2 2014/02/25 12:40:00 scarabeus Exp $
+# $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
@@ -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}]