diff options
| author |   Michal Hrušecký <miska@gentoo.org> | 2013-03-18 10:29:48 +0000 |
|---|---|---|
| committer | Michal Hrušecký <miska@gentoo.org> | 2013-03-18 10:29:48 +0000 |
| commit | e704ea0cd7be2d3109238306934dfdad058d51db (patch) | |
| tree | da7078e541b4688a19e1d7afc76cf5243fad887c /dev-util/osc | |
| parent | Fixing paths (bug#446074) and version update (diff) | |
| download | gentoo-2-e704ea0cd7be2d3109238306934dfdad058d51db.tar.gz gentoo-2-e704ea0cd7be2d3109238306934dfdad058d51db.tar.bz2 gentoo-2-e704ea0cd7be2d3109238306934dfdad058d51db.zip | |
Fast stabilization to prevent broken stable
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)
Diffstat (limited to 'dev-util/osc')
| -rw-r--r-- | dev-util/osc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/osc/osc-0.137.0.ebuild | 58 | ||||
| -rw-r--r-- | dev-util/osc/osc-0.139.1.ebuild | 4 |
3 files changed, 7 insertions, 61 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog index 347b8a103650..9cd759d74ea8 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.13 2013/03/18 10:26:27 miska Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.14 2013/03/18 10:29:48 miska Exp $ + + 18 Mar 2013; Michal Hrusecky <miska@gentoo.org> -osc-0.137.0.ebuild, + osc-0.139.1.ebuild: + Fast stabilization to prevent broken stable *osc-0.139.1 (18 Mar 2013) diff --git a/dev-util/osc/osc-0.137.0.ebuild b/dev-util/osc/osc-0.137.0.ebuild deleted file mode 100644 index e7cdbbe64af7..000000000000 --- a/dev-util/osc/osc-0.137.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.137.0.ebuild,v 1.2 2012/12/17 10:00:35 scarabeus 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/share/suse-build|g' {} + - rm -f "${ED}"/usr/share/doc/${PN}*/TODO* -} diff --git a/dev-util/osc/osc-0.139.1.ebuild b/dev-util/osc/osc-0.139.1.ebuild index b51add450304..81786f57a332 100644 --- a/dev-util/osc/osc-0.139.1.ebuild +++ b/dev-util/osc/osc-0.139.1.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.139.1.ebuild,v 1.1 2013/03/18 10:26:27 miska Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.2 2013/03/18 10:29:48 miska Exp $ EAPI=5 @@ -28,7 +28,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 |