Stabilise on x86 and amd64, remove older. We need to trigger maintenance so fast-track it.

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

4 files changed, 23 insertions, 83 deletions

diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog
index 0277182ed3c1..088686947204 100644
--- a/dev-util/osc/ChangeLog
+++ b/dev-util/osc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2014/10/12 08:46:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.36 2014/10/12 08:47:46 scarabeus Exp $
+
+  12 Oct 2014; Tomáš Chvátal <scarabeus@gentoo.org> -osc-0.146.0.ebuild,
+  osc-0.148.2.ebuild:
+  Stabilise on x86 and amd64, remove older. We need to trigger maintenance so
+  fast-track it.
 
 *osc-0.148.2 (12 Oct 2014)
 
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 2cdedc51b73e..3f87ea9e1973 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -2,27 +2,25 @@
 Hash: SHA256
 
 AUX osc-0.139.2-out-of-tree-build.patch 708 SHA256 59c717f4baf357a9ea076f71a10db66a36232ae0b794a38914ac06bf9bf7cee3 SHA512 5663497e5a2685a48407d4eece16b64c33275808252b29f05ff507274951b0a8d9fc77e0d3f9a2412089d683ac1eb547ebd16ef2491ac55944fcc6f40fc8c166 WHIRLPOOL 29a0783dd30e1fa45b35a17feaf002a335ff3697badb835e83c5669e208fc2df8f4ce37c24574a76c746374b0703ec4108a500335bd6dd68a23c5f6c7d8eb2dd
-DIST osc-0.146.0.tar.gz 354322 SHA256 90d0115e83235855da3ac26bf464e230aec3d620eea1ad46d95d5d5052b897b6 SHA512 a905b01bf4a546ed1ddb06a5a015f17220e018c4651d2456e4f3c77f3bf52fb3bc448623917682cc8bbc7eab6d07d5ee49a77cb62100e651712be8d9be6933eb WHIRLPOOL dd03df2a702596c399668c239abe9d760ee3362c45a674bbdf566d01af6fb7b41d55aafb613319573c0a09507e86fea92acf70c83025760cf7209c837d2b3972
 DIST osc-0.148.2.tar.gz 6818939 SHA256 573d23d84e47316bd2eaed16e37696a1b87b8bc8cb457be5403ecfcb4da44c4c SHA512 4e17c8fb8f78a3f9a279f27e3c52fa1a4d6ee62825e06a5943b144ff39a3c53650d31c1b8033ee78cf6f3d4e85c140b2fc0c7f86b3d134cea59fc8da24e3fd16 WHIRLPOOL 20160e3148f21ff78074f4858928fee20227defe1065c8971c9e1823ab7cb5195edab2ac9da4662667be49ad2dc772c1d260a83eae59166c362f3050b88fd19d
-EBUILD osc-0.146.0.ebuild 1630 SHA256 bba036540b5413331b6dc27cb98edbc9885ea4b7f32efbe0497d164d6ec28f2d SHA512 f319f0c19d33a0d2b9092f7c5c61633aa43fa0ee408d9ae2347ad6dc652de499f9c6ea7c8de09a80681e82c877b8a541ddf3655d9919d3ebcfc9a6b725ee558c WHIRLPOOL 43b12a05d8762b139133ae7983dfe1f408526095c5cc1d3eca66347f3f145d9b7a932ea728e82bb163fccfa22fa55d8090a880b5a609b0cb578173ca0dd762bb
-EBUILD osc-0.148.2.ebuild 1632 SHA256 81bd71c3c8ca3027b8def9dc779de4b59dd4ef643cd1004da5d4b892f29ca500 SHA512 6bca7c87b659ae567faf1123fadd74f3ca3182985acba1c99a599e4eb39f3a362476e105669bc0d7420295ed676a02d9883857a2c0f30cfeff02ae3addf0f543 WHIRLPOOL e39cdfc820e00d5e6084f12f780647b15e99e2fa2bea4ebf8e4f6be3741436f1b0879d08b265825de5f1034ac4d375395effc581cf1a021f0f26495f88ee9b9c
+EBUILD osc-0.148.2.ebuild 1630 SHA256 7e7f21faeda48db8bfe1c35965c1d22d5183a7dc03d95c9eb7ad06e142fc9e15 SHA512 947cf85ded60b6db6d03b227f6806088a70b92a6afec487a62f9229886bf752271ac851a70cec2e3d3afc7c68981513e8a8a68bc63bf53775099ffb9523a3fad WHIRLPOOL d133b383fd058cb39b6083a9d7e729d0c7371d2c690ea00f228fa4cd4a3be667329369d7727bdef5b65763249a76df8bbbe506b81e40856f284317b4686d385b
 EBUILD osc-9999.ebuild 1630 SHA256 66827b45e542871184077b31b5255768e1f6b107236c66482ec73a3d9283686f SHA512 3cae4d613f23825ce17fdbf9b2c947ce8a5ef86013e8311a7b7eb0ec9b66fa8e6b95bac30ce89c4938f8610d8ac0f8532db691b46159d1b41aedb3426a7b1a40 WHIRLPOOL c5414ba44b2373ba79b8fda09db683ce5053274eaf8a90f83d98492db7bd267ba127898824b1a168498a918df7bad94467e1e884e6dc486822c10c220610b47d
-MISC ChangeLog 5779 SHA256 c9eed990baf729acfe9eeace0af557a08f1a03088b1ecfa71583399ff8a093c9 SHA512 e11d354566ea541e7d6a617b065b5ef268bbfbff34a2f99912d499401ea3be911a8cd59a1b5376d259e40d1cbc969ece98cb6773fcb6135fe8944b704cd734e4 WHIRLPOOL 9ca44f4d97905464f7a0d9f415250135466e3774e6209cfd1ee4ae28982d38644285618c2bea8af3ca091d332dfef0d9764c654cab5ee4433efec30b41591863
+MISC ChangeLog 5973 SHA256 bc2761aa04d9cb25279ecfdda033d7a0f69a5ee035084a7c234a652afecd9a65 SHA512 39ec8a7c24a801c2f89c1cb0b3028d74611c9a3751248ac64da53d088e95e76db569cf9202b823d4fc4b8c71ad69a004616ab7932410c9c77bd65845fa55c08d WHIRLPOOL 167fa17ac105855414cd740bc16afac4f5f8a7050e82d1b25c2f8d42979c10c4b58e20f1971b0256f3a4ad2c1b906941e88c5ab2b5a39e833d705f7a9625bbf8
 MISC metadata.xml 424 SHA256 4bf5a94b109655c334bb88c7902710dd20bb839cc7703b151cb0f4e81e16214b SHA512 fea1d6531a95d555bc7a18acb5cdfffc032f7d60fdf0eeff82d081567de202896c493cd34948b3872d0434c87bcaee1954dabd2029228578ae1d77f799e433c0 WHIRLPOOL 9c70abf73332bd9665013a3495e60a9f240d28e67ad88636ea7b2bda0a235ad664cad1848151edbb55a4c92a0b128d5eba1e665c347d56adbb3f77e941950d5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOj/9AAoJEOSiRoyO7jvo3yUP+wR1LrMQqRhgU037D9Qaxs49
-xI9I8+ttyJ0hh95yZSjrXqfDByqY0wzWObAuQQGgO0dkQGAvp/iv9pSo3mPKMF0+
-qMVm64JBqL7b5tUdfMSw7SKg4MIrhQC2GmNbvaBsJUGQa0BlxhznWh8ctTmNkjSI
-PDhPDV+bNm3uv0n9QefYoulIqGcXHwSzbyEeVczzg+KMVqLt+irSRrrFkPfqdL0m
-QdvnF8VKcmW8Q6iMtnYLGF+qtyqBgLrFu5Q+ir5AfGQL5cWUc0ZVVYS2CUH7iRZQ
-1qSl2MOpOcQQeYy2zyaaRteZ6FR7Ee8kvd4Udo30n2wZYz3Ax39TChGgwgvgVdof
-qw7cef6BAjNzwOC07MAgNYMJnxxBCCIY0mEHGNRiW+3vfeEV/pNKGHwgtJxoI/3x
-qk6COGMjNMmEjlE/q4JgsIWtLMiIyMzgmRuEy7r8HuU0Ngt8efjxgJgfx+aMO79A
-tlFqnOqJkuv+w5Vx8VJtOPl0EJdY2Ukd3ZGzuAXTzp3bn7uq70QOGhJXiCo+RXWP
-2Ul7vh3g5uBFJVx9wEN+LMj1/nMw96JiFmYz70LKglRQn1u9w0JK/7+Q2Dt7h1YH
-XG4/UOl/s8xkjGyPB47JV+E3GMmrpzYFiH2x5AAtfAcp8DLJ3k2gxL+hapQhUUSs
-y2DqUngEaLmzqbQuLSHM
-=q6gl
+iQIcBAEBCAAGBQJUOkAzAAoJEOSiRoyO7jvozCgP/izacjYmCWpGc+YSC+52oOm4
+lvTBJyhvTmDDQW8Ztz5YDafaa9e2Ufnf4FPeryj3Lrf8WlG9pVlrmhzLmWEvmuoi
+6rq38lDOaiJIG/0Kq/XniHHdSOLYRIHyCGLcgAZiNJxCLeFGam1Fh9ID6T6RO81L
+EPTbCdW31Xbnevfs6fG4DBRjpV7nyCxtRG0SYWEHtprVOVLRMByFPjErdNC5QBdC
+Nyb4fAY45D4Ogd8XHOX6WrZu0FRJgObMtcHoWlA657tT6mXm7llLFl6jjfjiAV1B
+RPsv5kXjFprltXvw1K0CPh0hfkp9CND9YWkLNLUddSKwBrQswqdfCUI/YDeiLd0N
+MAMljyNCdUsAfNTui1YvVHaJqSg/4jz7ZDrLeZTmUTqWERpvP8i0bVyeWuvj3ZQA
+hu84nIN/lnqDG9DotzO7H/bh3/DmpD0c0AeaIVawlL3Y6fcf/0ydebbJ5qhSzmcZ
+5qnQdizXK8c3bh+uyck11gkF4WZTYrvTTmUPFV40v5+jiDk5AjaDqIQnVvlfYZxd
+QsWIRQ+0R5Qg8Y3J2P7bWS7XB/HkRKBUHJlIlHT74uzrtEbOTo49oYLzy6VjVU35
+/JQJnuAO+5bnJ0MPZmcLiZJTlguyKEUbOty6MPyT2GXODCGePLlH7/TdPhRqxRTs
+kZfBAYG7OGI7fJBdHlQm
+=4/5u
 -----END PGP SIGNATURE-----
diff --git a/dev-util/osc/osc-0.146.0.ebuild b/dev-util/osc/osc-0.146.0.ebuild
deleted file mode 100644
index 7561fb62964a..000000000000
--- a/dev-util/osc/osc-0.146.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.146.0.ebuild,v 1.2 2014/09/05 07:13:08 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.148.2.ebuild b/dev-util/osc/osc-0.148.2.ebuild
index 9587c26b7428..187c5c365ab3 100644
--- a/dev-util/osc/osc-0.148.2.ebuild
+++ b/dev-util/osc/osc-0.148.2.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.148.2.ebuild,v 1.1 2014/10/12 08:46:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.148.2.ebuild,v 1.2 2014/10/12 08:47:46 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}]