gentoo resync : 22.01.2021

3 files changed, 30 insertions, 3 deletions

diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index 437c8e03a77a..0a69ac86c84b 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1,3 +1,5 @@
 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
-EBUILD freexl-1.0.5.ebuild 533 BLAKE2B 9ae371f5150b06bcb5c7fb1fb03386de20ae859f81d2cc7c0a6e1320a285a420e61bb7c58cd23bc0659dc090ebf2afd72f26b7720ec54a66a21c7b2ee0659bbf SHA512 f4ea7aa381e99476691ebb5385a93f6adf92905f8239e4c1289ff9d0ce1d375185eae8c43317f4086e84f349741c84a136c69f50c02d29a0c41a0ed3b945f3c5
+DIST freexl-1.0.6.tar.gz 941179 BLAKE2B e0b04e66c56d3a2805eed3f86442269843a2ccf7133669b9506a1812562396f2b5bbc04e29c9f829d9df6e627fa31b87fccc5407275ffb205ff498bd47bc4b89 SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
+EBUILD freexl-1.0.5.ebuild 557 BLAKE2B 3d5a55d682d5571d0d499f8adbadc082049a09febd5b8c75d56029cfa0442355c3515de9cc5faa8f05dab612c0c201857be76cfe486dbc18f7ad75d654d53591 SHA512 796a1b5a51abb07e46d52427f470c44d89affec59c1d7473f65d30abf844f1edb18038cf7e5842bb9b5ecd50102c9ac97678ea707086e054251c9045a1ffa98e
+EBUILD freexl-1.0.6.ebuild 563 BLAKE2B a8c4bf2add3bac02f35624b9bee8c62df012243e8c4bddf84d0d066627e671e8f5f1466c697d517e855f612b11dec4f011f92bbf8ecc5185b3b8bdff41d0f8b3 SHA512 eaffee37be563b4f798a55378e2e64bff139018a71e5c98dfc0ad09ed84d496170002f034f5ea6a44bf28f48d3a398cb5d9e3924554b4ca4fd4f6a122cbc6218
 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild
index 86e702667c81..7726ea2dcb1f 100644
--- a/dev-libs/freexl/freexl-1.0.5.ebuild
+++ b/dev-libs/freexl/freexl-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Simple XLS data extraction library"
 HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
 SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
-LICENSE="MPL-1.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 
diff --git a/dev-libs/freexl/freexl-1.0.6.ebuild b/dev-libs/freexl/freexl-1.0.6.ebuild
new file mode 100644
index 000000000000..0677e5dfba87
--- /dev/null
+++ b/dev-libs/freexl/freexl-1.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple XLS data extraction library"
+HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}