Stabilise 0.140 on all archs remove older.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 22 insertions, 68 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 721f444b9b94..6cc65afa2db6 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.19 2013/07/24 17:40:50 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.20 2013/09/10 13:03:34 scarabeus Exp $
+
+  10 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.139.1.ebuild,
+  osc-0.140.1.ebuild:
+  Stabilise 0.140 on all archs remove older.
 
 *osc-0.140.1 (24 Jul 2013)
 
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 7cb25434f347..d1881b9794f7 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -2,17 +2,25 @@
 Hash: SHA256
 
 AUX osc-0.139.2-out-of-tree-build.patch 708 SHA256 59c717f4baf357a9ea076f71a10db66a36232ae0b794a38914ac06bf9bf7cee3 SHA512 5663497e5a2685a48407d4eece16b64c33275808252b29f05ff507274951b0a8d9fc77e0d3f9a2412089d683ac1eb547ebd16ef2491ac55944fcc6f40fc8c166 WHIRLPOOL 29a0783dd30e1fa45b35a17feaf002a335ff3697badb835e83c5669e208fc2df8f4ce37c24574a76c746374b0703ec4108a500335bd6dd68a23c5f6c7d8eb2dd
-DIST osc-0.139.1.tar.gz 338316 SHA256 a1f0cb6fe18957ed4edb84ca5adc10a2908828c37de31bcfaa1c747755836fed SHA512 ea3d29d2b9017b9b667da41fe28d5c0950e4720849bab057cad4027c0bb879f833fa3d5d2ba54c477cd6ad5cd164937b44c3e8ccb68c8c0858113f77963c064f WHIRLPOOL 02e98cb9d77b21a9c62e915b3831d149a6c78bd3a519b0038ba7f5f8aa2bd13992985d7c1caf28e1d4a5b8524e6d009ea0f27463bb7f94a96d5da18243888f38
 DIST osc-0.140.1.tar.gz 346074 SHA256 2780b39a5294c2a763899bb0fff7864ed82685e4b5f5afa2ec001fb661051cc5 SHA512 d77dfe35cbbfb5c902f9945fde04a3f405dc30e7036877de081d01c3c335fad17326ad43c0f443cdae99f56281fec8d8bcdb10a86bbff22800b67034eebd73da WHIRLPOOL 08942b76878f50289909b5bc25b14af6e4005b59b31eb802253cd461cd7d485638f364b9bebd9f985f382ffc80eea176a429b2ce935f0b07482bf13a9b0989cf
-EBUILD osc-0.139.1.ebuild 1431 SHA256 b60af133b29ad209bb42b17e211a08295e9902231adb18279e026539bf64239c SHA512 867787153fd57c2c4fbec786b058893387b98937c351f309b31e3d01f4397b673c121b01908e535ce3a540bc874c2d2b00f3c7024a2fd801cdc8f5d3daedf526 WHIRLPOOL c712a2a26c48a0651d83b97e16d62d3018a02a3c3b1422760ca0bbc13e1a5cb8bf55bad7eeca913ae444f4e60ffd6a4939ed49f0223a03643e867bec7a6a8be0
-EBUILD osc-0.140.1.ebuild 1643 SHA256 cc8df09a2d435c8d93c0eb184027bf1bba8b2d69eb798b40326b3724947b4a1c SHA512 4ef997c964c6fca3a39da0ef8307812375eac65687185c92fc086c1a65b7f1aff475d7ae4a42b5924221dc21cd5917655280102ab7de877698ded62650dec63d WHIRLPOOL 29082aabf88192882f217d0ecffc635b0cf742de1f0bf9f54d40df97171499d1f11e96d21a44b59b0bdf351cf581bfb9247507ca10c0541a409ab31c88f5ff57
+EBUILD osc-0.140.1.ebuild 1645 SHA256 a0f16be25b46a26877c711bdab6301b215a6326fe66693b25ae0f26ecf3511a5 SHA512 9361897c071d4eefdbd9419a5b1cf53b5e2a52504222d68edf5dcfeee65d720abcaf9f7e32db0ef6ca5d2e11456a651355a0d19f405a80b3c09e01753f5ea198 WHIRLPOOL a9bd0cf1d0de816a59bd554de4eb0c1d616b56a32d66e6d537e9bd9b3ac482ed92fa00c31670417a85c943291ec500ddbf10ec17bd0eb3c75c5db5a3a1447877
 EBUILD osc-9999.ebuild 1641 SHA256 c14f68ad2073963262398f58a834529fc76ac8753ade25214ed1cf20b9de6e2a SHA512 ea71eec288b27b9d0967090f5339083dfb448606829ae3fed286138a47621c4c88d5ceac0db1c540d6ea81ccb9527c76dffaedb45fff054b5a084763ccbd8c7b WHIRLPOOL a66a99b32aadf1f534643ad0d72d6d186215e8a20b85148e30602d0a05517688061537147bf881f450db96f54ba82e6bfc9fb107ffc32881d39404e4301d6313
-MISC ChangeLog 3230 SHA256 0cc3d6891bdde354bafd4a4104dcf296d30a68dc9492d5e8ad753c31fefa0301 SHA512 b446dc9922d142c758346e6c3b5a181ee018e3963a95f8206e0e0a3788b31d58d7528d3dd9fc740f0896e4302eb189d5219a33ebaec5f91b8dbd974ddb5f6db8 WHIRLPOOL ab5ced8b41214597e151a4b07a4a3429334f5962cb066fba7355c7876c5c56aaa8ad7aa141a5787137f4ab6eb8570d92fb366410476d24da7d2b1adbbcb36d2b
+MISC ChangeLog 3378 SHA256 f5e286e86dfb75bf490ebf729a9c9f1d5a866d2885d6545a5e417fc1d9fede0d SHA512 199731d3f40dc433b1ead1efd68c502d248aa8cb6b491fc0ebc7950f9c565456c4957ab5281ab7d866611fbf05daecd6533ddfa3fb51ec259d127acf5b45a530 WHIRLPOOL c4f63dc2284a161ed299299f4d461c92b2837f20abeb6b93cb23b9ea67dcddab0025f8b9a1a93b9ff7cae727708186cfe1c95aabfe21c71583de141cde3448c0
 MISC metadata.xml 424 SHA256 4bf5a94b109655c334bb88c7902710dd20bb839cc7703b151cb0f4e81e16214b SHA512 fea1d6531a95d555bc7a18acb5cdfffc032f7d60fdf0eeff82d081567de202896c493cd34948b3872d0434c87bcaee1954dabd2029228578ae1d77f799e433c0 WHIRLPOOL 9c70abf73332bd9665013a3495e60a9f240d28e67ad88636ea7b2bda0a235ad664cad1848151edbb55a4c92a0b128d5eba1e665c347d56adbb3f77e941950d5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHwEacACgkQpFCI79Oct8Ut2gD/S0cmTWwZwo0IwxaMdYKvbNRO
-V5ZKkNXwgy5Gn0/AaUsA/0UvKx59xaJHeAm42csSWcb8GLRWpajDWGPcpwIGBBxi
-=jAPv
+iQIcBAEBCAAGBQJSLxjBAAoJEOSiRoyO7jvoMyUP/jzDKYISF0EcGFDMEAfQlZFS
+DuNbDU+nm+YF9DnmvzsUnrSVbOh4F15yaPDxYnL6bEDkFl8LFXu1xKITSfZ5i+5F
+Yhk2iLUTZABEkJnWi4WBjCgZ63vuYddlNi/a64q5owqSLVoy+qaP6gytRP4rgawN
+ZP4joMkkAWBa6nWUEwvi5dkl8V4bvcRoknhV5LfAFywOXijd0NK7hXOjK/6sjsZH
+xnqtWKLeaoKPWZT9fHVDnrmfYVmi7ifSetZjWoDwyrAaZyjvaPocg9YVSk89NZR0
+FTQqOlX92Ov8xkttE7r74QBtuG0IDjUBN5UXQ+e/6GA9VY/bHXWVcoUSGb0Zi9qi
+ar60o7O8WdIoS9l0rwK3RGb2jN9fEJTQr3VilvgvgS5ih/9wGWQ/H1H08yPHUPZ/
+BajkBlBWQhJI+k3/5l2l4NxZOH8WJn8p0XfTktxJwls1kpXaBiH4Cg1HQGQKEIFp
++nKnCbr+GhpzXVyxvR4Q8j3eKOKTxrox8/BZ2sR4YxB5gASjOxWySeEJO+9rXETA
+te19q9WKFfvjQPwxY+3E8gsIAkoWawn90CXPhECf8SCIsqAq2iIBixtI3WkkmxYj
+gp0b3VolvHe7j298gb7IcOLYlRl+hQ/PSTJBeCyBqjkKgV7xxO1ZZBTtGHaqC9eG
+w9WQx51i4+BQseDrqzqv
+=5dCd
 -----END PGP SIGNATURE-----
diff --git a/dev-util/osc/osc-0.139.1.ebuild b/dev-util/osc/osc-0.139.1.ebuild
deleted file mode 100644
index d79f3dd5f0ef..000000000000
--- a/dev-util/osc/osc-0.139.1.ebuild
+++ /dev/null
@@ -1,58 +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.139.1.ebuild,v 1.4 2013/05/27 16:23:57 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
-	app-arch/rpm[python]
-	dev-python/m2crypto
-"
-PDEPEND="${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-0.140.1.ebuild b/dev-util/osc/osc-0.140.1.ebuild
index 0fb86f6e0476..53484eb8606e 100644
--- a/dev-util/osc/osc-0.140.1.ebuild
+++ b/dev-util/osc/osc-0.140.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.140.1.ebuild,v 1.1 2013/07/24 17:40:50 miska Exp $
+# $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
 
@@ -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}]