gentoo resync : 25.11.2020

3 files changed, 44 insertions, 32 deletions

diff --git a/sci-libs/xylib/Manifest b/sci-libs/xylib/Manifest
index a97920ba232f..fd4360d8f702 100644
--- a/sci-libs/xylib/Manifest
+++ b/sci-libs/xylib/Manifest
@@ -1,3 +1,3 @@
-DIST xylib-1.2.tar.bz2 297167 BLAKE2B f30a397aea282626b2e5ea93053571ed6d617b4fdeff468751fed9c9f538595854c948d0f50656ce22dbadfe4ff99a59dc4a5fb70686e78c084bbe1db1c9c11a SHA512 16eaa4b37014914c75ca3d0188aaf236c342887c03e233a9bb770412b3bb16da6779ab82c8acd66677d98ada75537c77d1abad723defd33dbe6eda78c6c88b91
-EBUILD xylib-1.2.ebuild 622 BLAKE2B 1e167618f51dda4495240bc40a5ff438d0ac304044f2d4a0a50c933a300c8c8014f101426d9d7a66572f74d6e9aad7a7c352526cea6ad1d509bfdabd5a12a3a2 SHA512 ae4691ce2ece1d209d4769f454b060c1287b47a3510ec9c40b8556786f0fc784b20427d15eac77e69ab58f80193b360f8349c0d31b647d09e6297c99ecd4fc8c
+DIST xylib-1.6.tar.bz2 370765 BLAKE2B 76eb968f06a6a015ed7a29a493d888642767cda103733498b8706c973498aa4ac8576716b06f6eae8d95a1f625e9cd91ab02cfd53146d976e32fc9295f3c502f SHA512 9861cbf03f8b921a93a2d32a529ff94d77723e2510cd61096b4b85f91af4be6330ed82e8da94bc45dbca7f9814077360d1dae204315b28c2b6d85e3d2c7f6696
+EBUILD xylib-1.6.ebuild 807 BLAKE2B e15510175a2dd0013cadda8239039b4ac9a791265142f47f4be44b6538c0499256b5101ea96563cc1c2458a1ca3548b808909f213233bdac1c82df1f9618c574 SHA512 4c09b69be3205c1924a8cef18f4a5ca8fe5cfd73c2e83eb5d795f1c1b36117b2a50e5de8d64de73ccfdc31f7bb544906d645bc816b3669637432725c0d738950
 MISC metadata.xml 560 BLAKE2B 15a5a2f32f2c2285215daa40e7c5cb9cbff5c0f470c52e566812948cecd6cccdfa4a9eaee4a10ccbc46503c1a8ab2df557b88b37912def66bb79fe0cdbe5b8b7 SHA512 5bbf4b430ae8770e8d6ce2e084e093689acbbb36bb9aef5e0a6b21586870ee5fb0c4953588052aa053eb5d3418a84f18d0c6b7940282c9678a803bc1ae9ba8f3
diff --git a/sci-libs/xylib/xylib-1.2.ebuild b/sci-libs/xylib/xylib-1.2.ebuild
deleted file mode 100644
index ed9ee753d6c8..000000000000
--- a/sci-libs/xylib/xylib-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Experimental x-y data reading library"
-HOMEPAGE="http://www.unipress.waw.pl/fityk/xylib/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 static-libs zlib"
-
-RDEPEND="
-	dev-libs/boost
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2 bzlib)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/xylib/xylib-1.6.ebuild b/sci-libs/xylib/xylib-1.6.ebuild
new file mode 100644
index 000000000000..49e226d26949
--- /dev/null
+++ b/sci-libs/xylib/xylib-1.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+
+inherit wxwidgets
+
+DESCRIPTION="Experimental x-y data reading library"
+HOMEPAGE="https://github.com/wojdyr/xylib"
+SRC_URI="https://github.com/wojdyr/xylib/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gui zlib"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	gui? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	zlib? ( sys-libs/zlib )"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	econf \
+		--disable-static \
+		$(use_with bzip2 bzlib) \
+		$(use_with gui) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}