gentoo resync : 08.01.2021

5 files changed, 6 insertions, 122 deletions

diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 84604624f732..fb52912d0e9c 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,8 +1,3 @@
-AUX libconfig-1.5-out-of-source-build.patch 344 BLAKE2B 6612bc819dcba54f45899b01bfd649b34d0019d625d2f63eb0252fcc83e1e103f80463ecb24e84cb01886088bdb14dc45849be3759f4be59c09c980b81bcd40f SHA512 601909cbc50afe2ee2bf72648685af3b828effa16e5c86e0efa2820314de5cfabf9867b40b205e4d32280bbea6547d1e418cff7e7733940abdd7aa49f3764bdb
-DIST libconfig-1.5.tar.gz 644432 BLAKE2B 9eaec8aca0692f30d6b51221a5d1bc624540da74f599292b1a161054dec8188b2ad2ee100a97c1e19f7b4763614206a5bf6ad03f6f7bbd33b40d57c51646e520 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd
-DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0802ccb544866df4b7d9b69538ca1e2eab8642867b0ee7c56e26027d8fb326e470a5c9bdcbc37534fe23092be15e0 SHA512 b58b468e9e2d5175fbde1ad9765c6604dc9b3f3944613a88404a45d0d232e7d79a47321bf3c06b97cb46a2104b4313fad5c7f8944149f550b7af51ad523e775e
 DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
-EBUILD libconfig-1.5.ebuild 1149 BLAKE2B 861f459cd4e24bd963bab3f40fc4cfe2dde2d6f12dfaa1126499104930116f3f137fc4b7660b3e501c8ca7c33ae1b0fd4c8ce4be0ead5e6ee742d882d89e92c3 SHA512 fb12451fbe810025ed30a7521ae7608ef231db463a786bd8a4068a9816bf650a3378702bb0df86006e630d8267212f03f712b80ae2dc355161ad3b162c491ac2
-EBUILD libconfig-1.7.1.ebuild 1081 BLAKE2B 0159ec03bd1eda0dfb8c0879a0e0c7faf8c271d6c9f5e97f43faa5f61933b62c9de5e8c856f7484a2715ea7fc1d5bebb3d217c8dcaa63261f298fdf00b781e9f SHA512 b0d628091682d9035255b9bd0b41f1f4d41950b8c1e21ce16d052108590cc0e03e765169d5839d1725b9fe410233ae848d5b336c95c32e78a1cc0907c30b6881
-EBUILD libconfig-1.7.2.ebuild 1035 BLAKE2B b90d31d4cd56c3e2d7cf5b234da5ca389ef3b5f62f9d55526614474afc9fab47a41ff5c07c912f56d9b996ce55f7941f32ff18f4b76e36a7ff01d5922a060e3a SHA512 c0b0161cc4de4982e461d36e74ca379291df3b1ea4d6f1726a4f4d7eca3e19fdf842140ff56d9094f8a3e759e96c337d8732f205f8875ddf8cbcf36ff5225ba1
+EBUILD libconfig-1.7.2.ebuild 1042 BLAKE2B c9971d644495d599fdc643ed4e83afa54a2ea4117c52a6cd65d176f66527c349497f4bc9afa93cc2d0b625a6a5144e974a731718599368148b6a447298df0f54 SHA512 087736cf92131faec604c009cddeb7e6375e7f93012d4c524d5c91d2092b3b20389052a564b628a4b6885ef70460e10baa480056146b15871ce6c6072df55dae
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
deleted file mode 100644
index d109b60d4363..000000000000
--- a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -3,7 +3,7 @@
- 
- libconfig_tests_SOURCES = tests.c
- 
--libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib
-+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
- 
- libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
- 	-L$(top_builddir)/lib/.libs -lconfig
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild
deleted file mode 100644
index b707232a0aff..000000000000
--- a/dev-libs/libconfig/libconfig-1.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-multilib ltprune
-
-DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
-HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html"
-SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~x86-linux"
-IUSE="+cxx examples static-libs"
-
-DEPEND="
-	sys-devel/libtool
-	sys-devel/bison"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5-out-of-source-build.patch" )
-
-src_prepare() {
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cxx)
-		--disable-examples
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_test() {
-	# It responds to check but that does not work as intended
-	emake test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-
-	if use examples; then
-		find examples -name "Makefile.*" -delete || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libconfig/libconfig-1.7.1.ebuild b/dev-libs/libconfig/libconfig-1.7.1.ebuild
deleted file mode 100644
index 630dd6e6e085..000000000000
--- a/dev-libs/libconfig/libconfig-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune multilib-minimal
-
-DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
-HOMEPAGE="
-	http://www.hyperrealm.com/libconfig/libconfig.html
-	https://github.com/hyperrealm/libconfig
-"
-SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-IUSE="+cxx static-libs"
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/sleep 3/d' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		--disable-examples
-}
-
-multilib_src_test() {
-	# It responds to check but that does not work as intended
-	emake test
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index 374b0c9892b7..cbbe4ac59f02 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils ltprune multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
 HOMEPAGE="
@@ -46,5 +47,5 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }