commit: 7234f66f18fc891b9c74bddb5109b90989074f10 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 18:46:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 18:47:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7234f66f
dev-libs/xmlrpc-c: drop multilib No multilib reverse dependencies. Signed-off-by: Sam James <sam <AT> gentoo.org> ....54.05-r1.ebuild => xmlrpc-c-1.54.05-r2.ebuild} | 46 +++++++++------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild similarity index 69% rename from dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild rename to dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild index c473a0e5f5f2..185a023016a1 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.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 multilib-minimal toolchain-funcs +inherit toolchain-funcs # Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html # 1. Only the "Super Stable" series is released as a tarball @@ -17,18 +17,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0/4.54" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - IUSE="abyss +cgi +curl +cxx +libxml2 threads test" - RESTRICT="!test? ( test )" - REQUIRED_USE="test? ( abyss curl cxx )" RDEPEND=" - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0=[${MULTILIB_USEDEP}] - curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + sys-libs/ncurses:= + sys-libs/readline:= + curl? ( net-misc/curl ) + libxml2? ( dev-libs/libxml2 ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -43,21 +40,17 @@ pkg_setup() { } src_prepare() { + default + sed -i \ -e "/CFLAGS_COMMON/s|-g -O3$||" \ -e "/CXXFLAGS_COMMON/s|-g$||" \ common.mk || die - - default - - # Out-of-source install phase is broken - multilib_copy_sources } -multilib_src_configure() { +src_configure() { tc-export PKG_CONFIG - ECONF_SOURCE="${S}" \ econf \ --disable-libwww-client \ --disable-wininet-client \ @@ -70,19 +63,16 @@ multilib_src_configure() { $(use_enable threads abyss-threads) } -multilib_src_compile() { - default_src_compile +src_compile() { + default + # Tools building is broken in this release - #multilib_is_native_abi && use tools && emake -rC "${S}"/tools + #use tools && emake -rC "${S}"/tools } -multilib_src_test() { - # Needed for tests, bug #836469 - cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die - default_src_test -} +src_install() { + default -#multilib_src_install_all() { -# # Tools building is broken in this release -# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -#} + # Tools building is broken in this release + #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +}
