gentoo new year resync : 01.01.2021

3 files changed, 70 insertions, 18 deletions

diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 96b479b8bbeb..916bfe6d0e28 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,4 +1,6 @@
 DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
+DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
 EBUILD urjtag-0.10-r1.ebuild 1068 BLAKE2B 5a9566d2fcf63d1cdd3bbabffaf166a3fc76ce1e4d7a0aad82593502c86687e5cac2a7a0ad73f34e37d9124dcd2fc421e5de8ccff404f614ceeaec6b66df31ea SHA512 0cd41fcccf30f89fb310e5a95e86d9fa69538baf5a53658b09fe023b8631c0f203d5f60e9d06cf663416139978bfbd7a907258b1b728ddda01175fd02418fd37
-EBUILD urjtag-9999.ebuild 1223 BLAKE2B 195ca8b38ce615d5d1763cd64f4a44315d168728c05b40e31a2edef557ec9139b213b474352818ded74a026f6061d0a854326a863056a82caa293bd22decae2e SHA512 3477d343994a314955813aa9a3ce6a8f1ef4d569182d3ef6f1424950b68ce9b1192e0bf97f5a6e6d100bd4eec6215239a8ee73ab99cbcfe4bbded5a78ea0be0f
+EBUILD urjtag-2019.12.ebuild 1151 BLAKE2B 1cb35fe5486d0089c73158898afef7945a80c12f3d519bcc0742581fad507b2fe011002841135f361b37b3144e9ad66a24336e7da830908ef106f42ccd9142c2 SHA512 8a09a615645325cc32a1ecf42376133cbbc02d0a9534740b744c25e2c257764299ce060503bd73a566df4d1ebf197fbbb6470b3c56be32017ccdb42e4e5ec043
+EBUILD urjtag-9999.ebuild 1081 BLAKE2B af03442b0e29f3e60b73ab4edbea83f258b916b9abc57e555428d2f9a8f307a151703442bacb2c947e0069d15cc34f1ae0818ddcb1dd9609660cb4ca8dc414c5 SHA512 e8171862ad821fd5157b1653267ebfb41ac2a88e733f1e251cd51700356510526d9d8f33a5200473bcf0114cb8fe805e87820b55ca810eb08882818bf82b2217
 MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce
diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild
new file mode 100644
index 000000000000..2156d991a75d
--- /dev/null
+++ b/dev-embedded/urjtag/urjtag-2019.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
+	inherit git-r3 autotools
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
+HOMEPAGE="http://urjtag.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# TODO: Figure out if anyone wants the Python bindings
+IUSE="ftdi ftd2xx readline usb"
+
+DEPEND="ftdi? ( dev-embedded/libftdi:1= )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	readline? ( sys-libs/readline:= )
+	usb? ( virtual/libusb:1 )"
+RDEPEND="${DEPEND}
+	!dev-embedded/jtag"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]] ; then
+		mkdir -p m4 || die
+		eautopoint
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--disable-python \
+		--disable-static \
+		$(use_with readline) \
+		$(use_with ftdi libftdi) \
+		$(use_with ftd2xx) \
+		$(use_with usb libusb 1.0)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
index 57288a015220..54e0951ff6ce 100644
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ b/dev-embedded/urjtag/urjtag-9999.ebuild
@@ -1,18 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: figure out htf to make python.eclass work
+EAPI=7
 
-EAPI="5"
-
-inherit eutils ltprune multilib
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
 	inherit git-r3 autotools
-	S=${WORKDIR}/${P}/${PN}
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc sparc x86"
+	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
@@ -20,37 +17,36 @@ HOMEPAGE="http://urjtag.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ftd2xx ftdi readline static-libs usb"
+# TODO: Figure out if anyone wants the Python bindings
+IUSE="ftdi readline usb"
 
-DEPEND="ftdi? ( dev-embedded/libftdi:= )
-	ftd2xx? ( dev-embedded/libftd2xx )
+DEPEND="ftdi? ( dev-embedded/libftdi:1 )
 	readline? ( sys-libs/readline:= )
 	usb? ( virtual/libusb:1 )"
 RDEPEND="${DEPEND}
 	!dev-embedded/jtag"
 
 src_prepare() {
+	default
+
 	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4
+		mkdir -p m4 || die
 		eautopoint
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use readline || export vl_cv_lib_readline=no
 
 	econf \
 		--disable-werror \
 		--disable-python \
-		$(use_with readline) \
 		$(use_with ftdi libftdi) \
-		$(use_with ftd2xx) \
-		$(use_enable static-libs static) \
-		$(use_with usb libusb 1.0)
+		$(use_with usb libusb)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }