gentoo resync : 15.01.2020

3 files changed, 4 insertions, 61 deletions

diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 8ce9e5e6ac0d..a11c5bb80dcc 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,3 @@
 DIST rabbitmq-c-0.10.0.tar.gz 145361 BLAKE2B 99b53d5178fa407225d2060584239af83377027fb6a209002d11ed54be4b49bab70ae55c86ab971394ab745a632ece6f070f9c10a9bdd330de4778edbd8e1ea8 SHA512 52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c
-DIST rabbitmq-c-v0.9.0.zip 227245 BLAKE2B ea37e0a9734bc7a8923cab880a9e150f055bab83bb79eb793882a1d435e6e435fbf4610034235f858d0e4d20978287b9432b312c8c3eea5e588655dc2f831554 SHA512 0cac0e26b4caca3de22b468200a20c38c8ace1a824442faa0855d93922b0c3a649fc2067366f6694eca0be635187ca9a9cfe47643472f4abb3d67028768f49fb
-EBUILD rabbitmq-c-0.10.0.ebuild 1355 BLAKE2B e47b8654955d3d3ece16d1cd591fa677a2a7dbaa80b8f25ab6398889a38b32ddc38220aea7339c51a2e6eefc218c22b658d8954070bf1d869f03591d802753cb SHA512 598eae2c2cd2b3f436383c46fe4d4a9e992ad7f7f0708e4cff85de7e456769de7295b4c3734f3948eb95bf63bc3667e4eea94ce3aa2cb2cfae69546973e67211
-EBUILD rabbitmq-c-0.9.0.ebuild 1355 BLAKE2B 370570b5ac07ff56dd09cdfe3480beabf32de947b99c612ba70056a07a5f550f24078a1b7c88733ffb705f0fd2bbd80615745e4f1f59544547f91b9d52ebe780 SHA512 5ea896020c5b33bd845876c34488cd30f678e2f6a16179c4f2095e3b2120c28d09d1c34a2a08fe2c9808ad01bd07d51ad6ac95641710b670392cd7546c8df20a
+EBUILD rabbitmq-c-0.10.0.ebuild 1342 BLAKE2B 04a79580d7f8145966dae8d5059ed32ea8552dcba3cf8c41eb814ba63b7bc507085279aa00bcd713eeae5c04f21c232d0542900965c44b6adc1baff0c33994b0 SHA512 5e74eb7f3dfc123d13f6c082df23952184da091bf64110613704a97c5f268b80542c15d78911d01511cbe5ec3f70d7796253e3fd5b303d5c93685f825ed8ce8e
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
index 91110cbd2aee..7ca183a40a57 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="RabbitMQ C client"
 HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
@@ -44,7 +44,7 @@ src_configure() {
 		-DBUILD_TOOLS_DOCS=$(usex tools)
 		-DENABLE_SSL_SUPPORT=$(usex ssl)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
deleted file mode 100644
index 6969404a06ed..000000000000
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake-utils
-
-DESCRIPTION="RabbitMQ C client"
-HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
-else
-	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/4"
-IUSE="doc libressl test +ssl static-libs tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="ssl? (
-		libressl? ( dev-libs/libressl:= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	tools? ( dev-libs/popt )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )
-	tools? ( app-text/xmlto )"
-DOCS=( AUTHORS README.md THANKS TODO )
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_API_DOCS=$(usex doc)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_TOOLS=$(usex tools)
-		-DBUILD_TOOLS_DOCS=$(usex tools)
-		-DENABLE_SSL_SUPPORT=$(usex ssl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Skip "basic" test which requires running local rabbitmq-server instance,
-	# see https://github.com/alanxz/rabbitmq-c/issues/530
-	ctest -v -E basic || die
-}