From 1bd0cf3640ff5da4dc6235f5a5ed6d2130f02680 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 9 Sep 2022 09:58:39 +0200 Subject: [PATCH] dev-cpp/amqp-cpp: drop broken multilib, EAPI 8 No reverse dependencies (hence no multilib reverse dependencies) but it wouldn't have worked anyway -- it hardcodes get_libdir. Signed-off-by: Sam James Signed-off-by: David Seifert --- ...-cpp-4.3.10.ebuild => amqp-cpp-4.3.10-r1.ebuild} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename dev-cpp/amqp-cpp/{amqp-cpp-4.3.10.ebuild => amqp-cpp-4.3.10-r1.ebuild} (91%) diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10-r1.ebuild similarity index 91% rename from dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild rename to dev-cpp/amqp-cpp/amqp-cpp-4.3.10-r1.ebuild index cc3e9267be26e..33a052a82f5f5 100644 --- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild +++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-multilib +inherit cmake MY_PN=${PN^^} MY_P=${MY_PN}-${PV} @@ -11,21 +11,19 @@ MY_P=${MY_PN}-${PV} DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker" HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP" SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="" - -S="${WORKDIR}/${MY_P}" src_prepare() { sed \ -e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \ -e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \ -i CMakeLists.txt || die + cmake_src_prepare - default } src_configure() { @@ -33,5 +31,6 @@ src_configure() { -DAMQP-CPP_BUILD_SHARED=ON -DAMQP-CPP_LINUX_TCP=ON ) - cmake-multilib_src_configure + + cmake_src_configure }