gentoo auto-resync : 28:10:2022 - 22:00:04

4 files changed, 19 insertions, 199 deletions

diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index f35155826c44..7d68fc0ed74a 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -3,7 +3,5 @@ AUX xmlrpc-c-1.51.06-pkg-config-openssl.patch 1244 BLAKE2B be5e48daa409cb67ae5f7
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
 EBUILD xmlrpc-c-1.51.06-r2.ebuild 2220 BLAKE2B 0da9ca0b686fb0e01bb9eb9310ee15de032cd2d21114525132125af4dadd4e1256e5bae0701dd422100303f96ddf5e2806b9acdd4021c180097260450e6af11c SHA512 36b12377551f37c6bf8411f4ef5899bb52550135e6c8b963016efc9ab0f07bd3fbd414bb3a16045ee63d872d53efc353d92ff304e9d678d1c9b3a93f8c341baa
-EBUILD xmlrpc-c-1.51.06-r3.ebuild 2416 BLAKE2B 05ad0438a4a14830aa461fe146ad32d951f0df3681ef9517fd584a4ae3f5af360cc22e7c5748d46aaa96595ec62594640a1b1ef1a7fcdfafe1941eb189a7b9d9 SHA512 a8f9edfd8d5533f9f5c954b0fa03dcc09b30ce9cebe64d37fe71db13c5c13a640aeea165349a876e18c4bdbef8b40604d126b75456f4ebba73a3461270ab7e7e
-EBUILD xmlrpc-c-1.54.05-r1.ebuild 2423 BLAKE2B 828387b760176093e38f1b1827c43ada80e2f5b5fa2b3d69d44e0238a4b828e43a70e98b28f63e8fcccfcdcd8e5af5cf59c20af69f062b103ac462123a037a25 SHA512 6ccbb74044cb3a1cc8da1f9e14c6050ef431b957ab5d9dc910c7acbf47e3b6c9c42d29b2d39175cdf35d50d7cf8a66f584906fdfbe29c570dfde1238ce87dd72
-EBUILD xmlrpc-c-1.54.05.ebuild 2233 BLAKE2B e7fae962a0dbabc1f40f1286a0873695c3dfe500326404d3058979cdefdde7943629c3b4e5bb2fd38741d5ab5d77b850756dc669ed0241e52869a7416ded05e9 SHA512 8c7e928a659357fb2c5fcfeef55fe7e30fbe857c625d84e07222713c9ef497c16af16c9ce08425115b1d2c109ae0cb2c28bb25003a3a633aebdc63a18a711022
+EBUILD xmlrpc-c-1.54.05-r2.ebuild 2019 BLAKE2B d11dc16b23051a481b9f330eeb0914b2c8d35dce98391b982f70946d113ee5a08f57be88691212cdc177d7a874e2a04764c2fed5d503045ad656e7117e397606 SHA512 82e5dcea08828ca2158cc59707bff1730eb14cd637bccc585d34290d90d2ad35b4458ce74df67c9c783a58c0828439d932d0c4325c21e08dcf0a6a8ac5e52819
 MISC metadata.xml 628 BLAKE2B 3d59eebbcf6eddfba969215a990fd59daa58b78dc305f05d10ba9f77f3ce5d5edbed0599644b40574beacb3c1e084af745bc2d75f0cb660968f4e3bf963c4f00 SHA512 fd572b06cc3359372e5b048d721b33d6bb614ab631fec95628af36217f94434fc9f279d83ec0de8828cd72265158b1a88f58418f94fb2e3d3e82de117c7bea71
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
deleted file mode 100644
index 2f376e845193..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal 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
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweight RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/4.51"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
-	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
-)
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	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() {
-	tc-export PKG_CONFIG
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-multilib_src_compile() {
-	default_src_compile
-	# Tools building is broken in this release
-	#multilib_is_native_abi && 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
-}
-
-#multilib_src_install_all() {
-#	# Tools building is broken in this release
-#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-#}
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
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
+}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
deleted file mode 100644
index b09f6997a32b..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweight RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-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}] )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	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() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-multilib_src_compile() {
-	default_src_compile
-	# Tools building is broken in this release
-	#multilib_is_native_abi && 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
-}
-
-#multilib_src_install_all() {
-#	# Tools building is broken in this release
-#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-#}