gentoo resync : 18.03.2018

3 files changed, 1 insertions, 69 deletions

diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 66d8a42d83b8..1b1b904784e0 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1,9 +1,7 @@
 AUX osc-0.139.2-out-of-tree-build.patch 708 BLAKE2B 88cece6103f3f6690ba2897127ff75e63e2395727dd991c359b14b180b44cbd43ad4cf18730b8c1b286ccedd0f4f191c7925bd515a5de43685c2d89ab341237e SHA512 5663497e5a2685a48407d4eece16b64c33275808252b29f05ff507274951b0a8d9fc77e0d3f9a2412089d683ac1eb547ebd16ef2491ac55944fcc6f40fc8c166
-DIST osc-0.148.2.tar.gz 6818939 BLAKE2B ab96a5da3375610c96c34ccb8ee116d57c9496d47d623694aefead1f7560510b7588796a201395500dfe7d1f06bfce4a1c4c46532b011f436c14c63d4cf8fd51 SHA512 4e17c8fb8f78a3f9a279f27e3c52fa1a4d6ee62825e06a5943b144ff39a3c53650d31c1b8033ee78cf6f3d4e85c140b2fc0c7f86b3d134cea59fc8da24e3fd16
 DIST osc-0.152.0.tar.gz 331512 BLAKE2B 19605f2cba7befca160ed213ab13ddd337726602adf01b72e857133ecd97b221dad5b6fb48f6c4be1af4987d5da5e837ef1edeed13299df68f0d60d0a0506611 SHA512 273bad36565d4f90b1a1f9af965367728559e5d0d8060689b1086f1df12fd3ef575900064973888cba1c06fb2d7c0e998161d65c04581a040750ef34281f035a
 DIST osc-0.154.0.tar.gz 341789 BLAKE2B 69fdaea439c7d82efba7568c318f076b5b267ea4ffb319ca95c81b85305aa4daba43f53d6b9979c6d76c0b0c0bef124e25d3fa4cdb2ac74a044c12b7bd3ea06b SHA512 1240bc9cc9079115342fc0bff1e522ca8fbff0a22b15fc2bfa90817241fd42e2350dd9344e5d6e3e0b5842be3f010398d108c7f9c7d474bde5c2300f7bf6bfb7
-EBUILD osc-0.148.2.ebuild 1518 BLAKE2B ddfeabd0ea75849e4f4a93351c5fb66284df289b66a6152aa776738249b699f0c72a54ed3c786e2e016021df56af936df45d5ffb20dd5db2233f4f05d37bb58e SHA512 1ee27f8833e560aa25d3e1f747c45a32d0cd33100b7cbceef29e632abc30a01f6c3b5107804d15de474d090e0cc6edf20b63e722bc6ffd3f0173a103b3fde64f
 EBUILD osc-0.152.0.ebuild 1520 BLAKE2B ca46aeaa8904653bd3cf496bce9ba0147bb8a000ed39d9fee9fd75a791b48885996ff7cf73bd027b8d601b40d514f61539af0b0d1e0b70821d359f760f6d544b SHA512 d9147c1a3c9269a46095e72cd2bfb7d09b1a8bbcd51ee76ea2f7134cf154509cf92d1440fecb42c0b91a99fa2502fecf7d32eea2ed0f391a983284ee2799f1ea
 EBUILD osc-0.154.0.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
 EBUILD osc-9999.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
-MISC metadata.xml 498 BLAKE2B fcd22c8910662bbbcad53af88bbfdbb1a02eb09f1eb1ac7d0630c148833cc5cc8d847bba11334e13b7b1a63e91c27c431dda7efcee261d1975f3352e16dee255 SHA512 670b8bad9b8be7908537e369e9b6de78b21672f88f8e47025c4b1f8e054834a62e563f2b1dd063bc8bd1c40cea88541440170d4275e4ef2391542a4e499fffdb
+MISC metadata.xml 405 BLAKE2B 45335bfe58f22878457bf3bc2f4ac87be41f72b04c308e9032def5064bdfbd8ea3110694deb7357e053ba770a9a7c5dc7dfcac1acac427290383dd2a81fd0254 SHA512 69c9e248a7d927ca17816ac1f6679427c576b860ecfeb2407326393044ef4344197b04b6b2301ffa01ed2c738592dd904b09837e30972b15abc2c947298e6698
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 3e0165c6d2fe..24f0a4d2bee3 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
 </longdescription>
diff --git a/dev-util/osc/osc-0.148.2.ebuild b/dev-util/osc/osc-0.148.2.ebuild
deleted file mode 100644
index ff92ebd5d75d..000000000000
--- a/dev-util/osc/osc-0.148.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/osc.git"
-
-PYTHON_COMPAT=( python2_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="https://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*
-}