diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 9f5df19..b73effa 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -4,5 +4,6 @@ DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d
 DIST sdcc-src-3.6.0.tar.bz2 17993788 BLAKE2B 2a03e5f8d270206812c9f66334bf1c20dd8c5824e16db1bf0b0e31c6b8d0d7d6f582d942f61e00320442ed4f48577fc404e1917fc5b2733bba86de246d3e9743 SHA512 fd05cf13f7acf0b71a35a99f99dc6ef8abcb4f41fbe1ab0cf25348842b57317217410b4a521ea1a70db93d8e7e4e6dac272ec14d893cdbcfa584ee963f42ad2f
 DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
 EBUILD sdcc-3.6.0.ebuild 3306 BLAKE2B 625516717c5a0347d31cc8abf2e23287d922f15e68a994e3e768ccb4b1324e9c4aa8a90fc9ba0a89e65637a5668e45ab33af8072136e92f6b0ebe027183bc352 SHA512 f770eda02c29b97b536114ee672c8d8cf47c286bd6f5c5f1bb05cda61d57afda8724938228696e04e352e472ebf661857d9ad714b31c9c8c997f37f0fefa8564
+EBUILD sdcc-4.0.0-r1.ebuild 3521 BLAKE2B 48ad40b6ffc3271110075e3ba18c468335d24eed4c15c7580f257fd6261890529a95e5291b205be3ce2480436371bcb00141a7e99bccdbecc2ef7a39d6f65d20 SHA512 4a84125b1c5193eb618b76bd7ca6c948f6204dba654c1209513214bf9a01698c49b6163f8433150b2c149529484300d157baa8adfa681f1aee801f3c514fed3e
 EBUILD sdcc-4.0.0.ebuild 3467 BLAKE2B f91878482f72eb29c13fbd59ff1689254612dca9d249323e44264ef1d4b332fa7801da0207ebd7f54bf40c454023a696cf0c31720a043456d9ab5f31b81013b0 SHA512 21222a73d804a3f56c36845ae4ea0dad4319df6550c0081c82d740b8aeaeb16fe03451fbe27ce5a97b63e4854fee299b3876b9fcd08fb5872ed0a02476eade30
 MISC metadata.xml 2212 BLAKE2B 23e83037b2a6e932760e7f0eafdd34230c035dd5a5833335db0ea9c4c1e04e62e69a920e2c2f3492d45ddc014c76450ad05b4d7794d66cca261e294ac20555a0 SHA512 4af2667ae3006548904e9e13894a49c277744d6876e0a99c99e8ea2e89c9e3fc277cf851ae0856b3c3b64f41ef7fd7c255f1bb4f9f42de8917aad7c59e25a0f0
diff --git a/dev-embedded/sdcc/sdcc-4.0.0-r1.ebuild b/dev-embedded/sdcc/sdcc-4.0.0-r1.ebuild
new file mode 100644
index 0000000..87711be
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-4.0.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
+	inherit subversion
+else
+	SRC_URI="
+		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Small device C compiler (for various microprocessors)"
+HOMEPAGE="http://sdcc.sourceforge.net/"
+
+LICENSE="
+	GPL-2 ZLIB
+	non-free? ( MicroChip-SDCC )
+	packihx? ( public-domain )
+"
+SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
+SDCC_PORTS="
+	avr
+	mcs51
+	z80 z180
+	r2k r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
+"
+IUSE="
+	${SDCC_PORTS}
+	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+"
+
+for port in ${SDCC_PORTS}; do
+REQUIRED_USE="${REQUIRED_USE}
+	${port}? ( sdbinutils )
+"
+done
+REQUIRED_USE="${REQUIRED_USE}
+	|| ( ${SDCC_PORTS} )
+"
+
+RESTRICT="strip"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/ncurses:=
+	sys-libs/readline:0=
+	>=dev-embedded/gputils-0.13.7
+	boehm-gc? ( dev-libs/boehm-gc:= )
+	!dev-embedded/sdcc-svn
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+)
+
+src_prepare() {
+	# Fix conflicting variable names between Gentoo and sdcc
+	find \
+		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
+		-exec sed -r -i \
+			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
+			{} + || die
+
+	# Make sure timestamps don't get messed up.
+	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
+
+	default
+	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
+}
+
+src_configure() {
+	# sdbinutils subdir doesn't pass down --docdir properly, so need to
+	# expand $(datarootdir) ourselves.
+	unset ARCH
+	econf \
+		ac_cv_prog_AR="$(tc-getAR)" \
+		ac_cv_prog_AS="$(tc-getAS)" \
+		ac_cv_prog_STRIP=true \
+		$(use_enable boehm-gc libgc) \
+		$(use_enable device-lib) \
+		$(use_enable non-free) \
+		$(use_enable packihx) \
+		$(use_enable sdbinutils) \
+		$(use_enable sdcdb) \
+		$(use_enable sdcpp) \
+		$(use_enable ucsim) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
+		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
+		--disable-doc \
+		--without-ccache
+}
+
+src_compile() {
+	unset ARCH
+	default
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt
+	find "${D}" -name .deps -exec rm -rf {} + || die
+
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
+	fi
+
+	# a bunch of archives (*.a) are built & installed by gputils
+	# for PIC processors, but they do not work with standard `ar`
+	# & `scanelf` utils and they're not for the host.
+	dostrip /usr/bin
+}
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
new file mode 100644
index 0000000..0d9d1a0
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -0,0 +1,6 @@
+AUX oracle-jdk-bin-1.7.env 833 SHA256 cef5b8196f18b4c7bd195fbe5084dde6e38b693accfc68859f48cb1460bee4fb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 WHIRLPOOL 0fa41d4b45e7b85628feffb55a8ca5ccb99c8a3e8d59907e42947135ac5cbc39564e609be7901e321ec5a0de8f0b6705e02333a771fa738434774cd198c32770
+DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST javafx_samples-2_2_80-linux.zip 21218149 SHA256 bd632d2c0f36be8bfc798ee6b78b328ff12d9b6ccea5e077dffc7a06f7933819 SHA512 00ec77bfbc7c9a9b1a61acb360b8278febd07bd16fc407a0b52ca0b694d35c79c0fb92d11caf131a8ee16238275962f6bc2e1f8471740ee0045b96bd14e957ba WHIRLPOOL b3f5032b1496b1bb8776e79566ed6a3da1dec3ab2b6d66d3cf67901bbaab5e746a1f3967af271c7b5a90b4522b6763ad7a5f172dfcf588184c5392a1a8a5a785
+DIST jdk-7u80-linux-x64-demos.tar.gz 20882163 SHA256 09c55d37508ff6c4b9ebac34e8d5fb65d7ace5cf45d5074726b413e8aa30dfa1 SHA512 2c24799ca0f14d74053e504cee0a9160472fd7e26e1d86d4eb72b190ec934b041bd72b5ce77f44bdca4b7fe8d8104515572491145f2f14e6d295be0bb010b2ef WHIRLPOOL e9f0312261049a5610ffbc64417f41025f36fc0ffec0f40dbcdfd391a3152f1c05ef80d584671d46fe26f86846825ea66e91090159e79a5192f11c695396e8ef
+DIST jdk-7u80-linux-x64.tar.gz 153530841 SHA256 bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623 SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9 WHIRLPOOL fac71585db57851245891919daca1f043c1a8c002c193426ea7e30b482129e65adee336c2421e4aa1241b8fd7cc69b8a1918cd0c44315bf4aec715e86d116384
+EBUILD oracle-jdk-bin-1.7.0.80.ebuild 9278 SHA256 48f4f3eca3844ead84250ca1c2443c1119ac8538a46498e31efc1b3d9a24c0b5 SHA512 ce89ce509a7becac2b669d6d8cfcf61845581cc0816620c081c41b4e2ede6f7a413647f62fe6316378c9d009daf9a34a67a271b44140cc19088739e12c399355 WHIRLPOOL 1a813c7f28c6720b6d6fcb5f14ede2512af8f4927f3aaaaea5234f89bc7ee9af9e95c0462ae7af5857ca261fa0323313ca6ae9cc4e5417d570333ed9e57b6dd7
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
new file mode 100644
index 0000000..508a5c6
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
+MANPATH="${EPREFIX}/opt/${P}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
new file mode 100644
index 0000000..8cddf6e
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils java-vm-2 prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html#jdk-${MY_PV}-oth-JPR"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 )
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 )
+FX_VERSION="2_2_$(get_version_component_range 4)"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+
+FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
+
+DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ("
+	SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.7"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+	X? ( !aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	) )
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )
+	selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip )
+	examples? ( kernel_linux? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}"/jdk${S_PV}
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}"; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]]; then
+		if [[ -z ${_check_tarballs_available_once} ]]; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	# Special case for ARM soft VS hard float.
+	if use arm ; then
+		if [[ ${CHOST} == *-hardfloat-* ]] ; then
+			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+		else
+			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+		fi
+		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
+		use jce && unpack ${JCE_FILE}
+	elif use x86-macos || use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
+		mv Contents/Home "${S}"
+		popd > /dev/null
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		cp -pPR	demo sample "${ddest}" || die
+		if use kernel_linux; then
+			cp -pPR	"${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+				"${ddest}"/javafx-samples || die
+		fi
+	fi
+
+	if use jce; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp -p src.zip "${ddest}" || die
+	fi
+
+	if use !arm && use !x86-macos && use !x64-macos ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x86-macos || use x64-macos ; then
+		# fix misc install_name issues
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+				libJObjC libdecora-sse libglass libjavafx-{font,iio} \
+				libjfxmedia libjfxwebkit libprism-es2 ;
+		do
+			lib=${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index abd4652..00e940d 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,4 +1,4 @@
 AUX pigpio-44-MakeRemote.patch 813 BLAKE2B 65730fabed5016f9c93193417e90683292171ab7b6cac46bd9eeb4ef550115bfd8de3f549d4aa06e09cf942eb887ddda59901806e914b2ed3d6523c353d7b2e7 SHA512 fcc6c3a27f889b688928c3c65683c91b449eff3de692fed33f1465f97ff7c30844a5927dfef96225034831a4a3512f245292ce1efe5fac6c3f7f2472a7987cd8
 AUX pigpio-9999-Makefile.patch 1962 BLAKE2B 73833ae5cfaeeaed28bf62073b11f6c0b88d1487f02c1010b9459926aaa911bd785a4517738f2441afebc22331469c7878460bf27b3ea5b900b8a4ecbba98dd6 SHA512 a181163ca0848766f1eee96cc3408d0f227f0281f8f1efb0d7530dbed2b5b42b94ce76e3b9bcfccb2c85e6c3bfc6f2048403a9ccaee45a0653ef52608a1234f3
-EBUILD pigpio-9999.ebuild 1532 BLAKE2B ef653624fb92209d667616918c8644bba34e45c52bc74ebcebf91a27462192124e394b7bb2ad902dbcefc7ad0dd1df2af9e530fac3e35087757cb4b4efac6667 SHA512 df7c1416458eabf431ca70f26eb1b951505ccd1b880b2873b1045f16b1012bf909aed63e3274b87544edbccc5ab2690bdd640ff999889c392cdfff879dcdce03
+EBUILD pigpio-9999.ebuild 1554 BLAKE2B 61fb24b6716fed03d1afb97f3d27c2340c22e3116da92bf70b187d3a15393fdbe686ca93f38e825cef74018f24d75f2c9200a63fb4de4f7f78e47b8707e22b04 SHA512 aba376d38f2f54fe50a1fa2b3bd4cab00e3001a6a9ce9aa3c5540f8eb412c91c2cf3c48889e96c1e2e2a576357558deb9d7001ca395ea6b8207e80cc11791941
 MISC metadata.xml 297 BLAKE2B b97ca67fe97dad72b5e8a79755f3888c8c48bd22a0766607b4b09859dcae7cebedcb33e02c5231025ac8e45506c195750e6eb8cfbbb5908ed94979c1ef194b4f SHA512 9284ce2486abe9a813147f1fc1d395fffd5f20f652281077ff39c823eb10a317fe5dd14413e39f3a6d25b8814535482105fcba8ba6af0988a2141e403d3b3d8b
diff --git a/dev-libs/pigpio/pigpio-9999.ebuild b/dev-libs/pigpio/pigpio-9999.ebuild
index 376bd62..315a959 100644
--- a/dev-libs/pigpio/pigpio-9999.ebuild
+++ b/dev-libs/pigpio/pigpio-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 inherit eutils git-r3 toolchain-funcs distutils-r1
 
 DESCRIPTION="C library for the Raspberry allowing control of general purpose input outputs"
diff --git a/dev-python/euclid3/Manifest b/dev-python/euclid3/Manifest
new file mode 100644
index 0000000..f98f438
--- /dev/null
+++ b/dev-python/euclid3/Manifest
@@ -0,0 +1,2 @@
+DIST euclid3-0.01.tar.gz 13201 BLAKE2B ffa8d368f58cae91969230eaf4fa5324cda2c45ff69c98d73b1fdfbdb67e38846090fac4cdd128439583a7f36190c2d474c7f647823ac79440218bf02a73070f SHA512 c4e5e2770ab4ede08904fc3b76e50d6812944ed226c9db52f2da8d100370e20ea6031ca554ae44d72d53e96727d163bd3cc8da7bf175539de10749da77877b0b
+EBUILD euclid3-0.01.ebuild 452 BLAKE2B 35cee20ec1ac40e405ef3a1695d0cd1c2f007e950d1c860573dfd2af3ff66aa8a1635e9fdbc129125e5c0c1e005ac9c90664e4990e7cef76c5cfb9c6b815ec15 SHA512 b78c9c311b0b70cb7d678e8b06b4ed2926b390165c4b4e6a383aa5ed87d1985a992a7f7b787257cfc932543a926d4bf5508ceb6669c688199f03c08556826851
diff --git a/dev-python/euclid3/euclid3-0.01.ebuild b/dev-python/euclid3/euclid3-0.01.ebuild
new file mode 100644
index 0000000..aac86f2
--- /dev/null
+++ b/dev-python/euclid3/euclid3-0.01.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="2D and 3D maths module for Python"
+HOMEPAGE="http://partiallydisassembled.net/euclid.html"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-python/kikit/Manifest b/dev-python/kikit/Manifest
new file mode 100644
index 0000000..3c9fb8b
--- /dev/null
+++ b/dev-python/kikit/Manifest
@@ -0,0 +1 @@
+EBUILD kikit-9999.ebuild 1011 BLAKE2B 8c0bedf60e3790b36eb0f7ccdc7a8668e377de18e64d89e388ca9254f0c8891b2137a0111f8938fbed7e8f57e0d8a360b10bcbe98b5187cc30f69cfdb7d1637f SHA512 41030b392b83ff8cc9b4011aba536d1732ae5d67a156b6861769d7e67903b81be67485fc6c0bb84eda421a53f511a59c12a166e2879a518727b4189fb309c777
diff --git a/dev-python/kikit/kikit-9999.ebuild b/dev-python/kikit/kikit-9999.ebuild
new file mode 100644
index 0000000..8bc4ab7
--- /dev/null
+++ b/dev-python/kikit/kikit-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+MY_PN="KiKit"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="KiKit is a Python library and CLI tool to automate several tasks in a standard KiCAD workflow"
+HOMEPAGE="https://github.com/yaqwsx/KiKit"
+if [[ ${PV} == "9999" ]] ; then
+        EGIT_REPO_URI="https://github.com/yaqwsx/KiKit.git"
+        KEYWORDS=""
+        inherit git-r3
+else
+        KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/markdown2[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pybars3[${PYTHON_USEDEP}]
+	dev-python/solidpython[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pybars3/Manifest b/dev-python/pybars3/Manifest
new file mode 100644
index 0000000..3a1e070
--- /dev/null
+++ b/dev-python/pybars3/Manifest
@@ -0,0 +1,2 @@
+DIST pybars3-0.9.7.tar.gz 29203 BLAKE2B 7255a9bf7c2d0e56d90bef95a007a0d6ae9d4bc25dbdfef0a76d7dc3927da01d2ec7e4f597f53e62fd1c540e72718778cb0a5882b20e054b2fbfa9dfc927c82c SHA512 7aff86c0703e3827909f3603d7f35026ee39ce74d9c5ff1beb18a71b0a839c3aa407402f8d9c1aca9eb69af33750db0477881826e72135fc26a7274b0f1f538b
+EBUILD pybars3-0.9.7.ebuild 499 BLAKE2B a5da6501aefbe9240a46bcecab590e90255929ce6cf8e91b0cf4900b53011fbc253ef35b100f59f62697564c3c8dbf2e962a0969e34caf21e929b8f1c5d763a8 SHA512 18f67a569587543b28cee91fb179f3a09abd05b83a1dfc74e6f9a374eabd5049f2459d6dfee04bd19569e0504fdd849bbb54fc3e8bef69f77a52b72b44c3cae0
diff --git a/dev-python/pybars3/pybars3-0.9.7.ebuild b/dev-python/pybars3/pybars3-0.9.7.ebuild
new file mode 100644
index 0000000..eec48ff
--- /dev/null
+++ b/dev-python/pybars3/pybars3-0.9.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Handlebars.js templating for Python"
+HOMEPAGE="https://github.com/wbond/pybars3#readme"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pymeta3-0.5.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pymeta3/Manifest b/dev-python/pymeta3/Manifest
new file mode 100644
index 0000000..77ef27c
--- /dev/null
+++ b/dev-python/pymeta3/Manifest
@@ -0,0 +1,2 @@
+DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575
+EBUILD pymeta3-0.5.1.ebuild 547 BLAKE2B bf2fd91c2f4683c538007a50b039f144baf149ab683cefd32b145122e5aa90732395103c2181b0451c0767cca6874ea362d941d9fe0eae8636c4be367ed463f2 SHA512 f2635bc56d3cac2487d727246957b659b885bd3c5320346937c918c5532a46fb179da0f153405191e38df7097d8227c863047b7e1923fff26355296207d07ef3
diff --git a/dev-python/pymeta3/pymeta3-0.5.1.ebuild b/dev-python/pymeta3/pymeta3-0.5.1.ebuild
new file mode 100644
index 0000000..e293019
--- /dev/null
+++ b/dev-python/pymeta3/pymeta3-0.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_PN="PyMeta3"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="Pattern-matching language based on OMeta for Python"
+HOMEPAGE="https://github.com/wbond/pymeta3"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/solidpython/Manifest b/dev-python/solidpython/Manifest
new file mode 100644
index 0000000..21f8d7c
--- /dev/null
+++ b/dev-python/solidpython/Manifest
@@ -0,0 +1,2 @@
+DIST solidpython-1.0.2.tar.gz 67607 BLAKE2B 273bcf188d141d91d83be440e78346aa9b3f955ba8134e6a11d5707829218bbb27ffcdf4e8e86a093249908df4a16ac0d878fe6ed31790b5772340533e48796d SHA512 eeb7c68e54055fcfd5b53cf9c2745ea4dac602dbce158c8c7559dde21372c87cacbcac9c203cf0b577bd292a59304d48e8a4c7afcf9afdd9cc6c6cf0286e1d09
+EBUILD solidpython-1.0.2.ebuild 820 BLAKE2B 52d2cc249ec55e08bb2b6a12b182ef6e3133c35c650b717ecb4d6879d420dd72d62cbe632946b3e6a0807a75833861e9a8d99895777c367d6b3a71c40fdbe9f9 SHA512 7f840aa914e2d5b3aadcab493fc1097cf4ad20437c13c40e1e57de9ae55cb58e6966ba97d9cae800df7e1d18b4fc9cde75c500e13e34b6cff0db3af936991e5d
diff --git a/dev-python/solidpython/solidpython-1.0.2.ebuild b/dev-python/solidpython/solidpython-1.0.2.ebuild
new file mode 100644
index 0000000..439192a
--- /dev/null
+++ b/dev-python/solidpython/solidpython-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="OpenSCAD for Python"
+HOMEPAGE="https://github.com/SolidCode/SolidPython"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/euclid3-0.01[${PYTHON_USEDEP}]
+	>=dev-python/pypng-0.0.19[${PYTHON_USEDEP}]
+	~dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/regex-2019.4[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Sanitize dependency versions
+	sed -e "s/,<0.2.0//" \
+		-e "s/,<0.0.20//" \
+		-e "s/,<2020.0//" \
+		-i "${S}"/setup.py || die "sed failed"
+
+	default
+}
diff --git a/media-video/avinfo/Manifest b/media-video/avinfo/Manifest
new file mode 100644
index 0000000..6b67b05
--- /dev/null
+++ b/media-video/avinfo/Manifest
@@ -0,0 +1,3 @@
+DIST avinfo-1.0.a15unix-patch1.tar.gz 5665 SHA256 b239c7a414dc92e4a6d3881801e981e71f66242d0e38ffae774a3a0f8c8bdf81 SHA512 9219d7b4a92cc776979b9332cfb286781e4cfada5280bb145377a4d51078895368392fef7c4ff24dc714101617f4aaa0916fd5c19897919af0dfa78f3765a457 WHIRLPOOL 01dbc6622363f427bf4d0139d1f5c7131b6c3310007a36cdbfcf5c3911e9caffe7b4cc61d840472d61b6bdb1a336a6d59c784f99dde200b7a2864f7f80d01e3d
+DIST avinfo-1.0.a15unix.tar.gz 105743 SHA256 3e3404a76e6057c1703e0c49b63910a8ffcb5ea15ae7b2d0a7d2ede4b4c19887 SHA512 984bb2e8916c1469206163ef9fa37f89d71a842a94a1ebf5a92ded410de4aacaf83d77d790f70624431d5c60305951a3cfbdea075fc2705bbd28250f9f9ade2e WHIRLPOOL 5f93c9b120b037014aef8d6e0268e76fed0197a6d4db2c6f30ec128ad9e4272e037e906dc2335f4951a6b6db2c87860c951753726488193dfacb74ca7274e553
+EBUILD avinfo-1.0_alpha15_p1.ebuild 950 SHA256 457dce5108daaa42c7e26bef3f41b5eae0da409ae14f8cdabb6aefdc76de8f26 SHA512 81c938eb64c3eb7012cf7d0713b99a5fb46ba2d8565d420934d0b36c5a8135085cba54f8c89fd5650eff9f3731461baf34e63240bac250ed7da1e7234c82a9e8 WHIRLPOOL de34fabd03981274a5d8a9b95a5f4b06bcb41b71b68872ae02961c65d0593b59c33504e4fac9ed229a2b248280c3e408afbb70c8428748da76bb72ad9b6647d2
diff --git a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild b/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild
new file mode 100644
index 0000000..b9450fb
--- /dev/null
+++ b/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild,v 1.2 2011/11/20 21:32:44 radhermit Exp $
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-1.0.a15unix
+
+DESCRIPTION="Utility for displaying AVI information"
+HOMEPAGE="http://shounen.ru/soft/avinfo/english.shtml"
+SRC_URI="http://shounen.ru/soft/${PN}/${MY_P}.tar.gz
+	http://shounen.ru/soft/${PN}/${MY_P}-patch1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-1.0.a15
+
+src_prepare() {
+	default
+	epatch "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff
+	sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/avinfo
+	doman src/avinfo.1
+	dodoc CHANGELOG README "${WORKDIR}"/${MY_P}-patch1/FIXES
+	dodoc doc/*
+}
diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index 9662176..22f05b5 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -29,5 +29,5 @@ EBUILD flexget-2.21.21.ebuild 5970 BLAKE2B ae8f4d2b7fd78b798b3beb8f5ebba303264f8
 EBUILD flexget-2.9.18.ebuild 2725 BLAKE2B 2a80b56f4cf1c5d92a1648919f2daac5818a36908ac3130df5ab482bb65fbf0f3675ae8ff6d1d15025e0acc616314160357972d3d9c6aabf578954e20997d649 SHA512 6a1282b64862b61f15586278462fd29da45a2472dbd5a1740b1ef13eb486210fd42de625d6ed200c804349a4684ee4db4e3a6f2347be3e9d85ffea806e6d9bfd
 EBUILD flexget-3.1.10.ebuild 6484 BLAKE2B 785094de081c42490a8cca366cd410af70a843fe0eb37fea991dd85a986e87727e5de92cc49320c8b7e83f1b12e5f9c3ee449fdb07115f1a1290474db6cdf641 SHA512 fbf2574b26305f594c005bc819243f9d5f9b640e5b396e2228f4d321a0b683437876f23b26fd943e137987f8ad6a50c4fc52247875de3c5c368d73e611393a38
 EBUILD flexget-3.1.48.ebuild 6838 BLAKE2B 5398abd9a8360bb989e0229dc948135f525ca9dfe2e08c2ba9a7ed35762f18005150a0a8843282f69d7e77692c8a495560cde49e806620208dcb7e430ca19fab SHA512 7c7d1b129421daa9c97755d015540a9eafba2582aa14072816c9e2008b5f2a3270e6ea758ae732962c24b060e3be8726e76ac45c8d01612fdac7456de3a9a9d6
-EBUILD flexget-3.1.70.ebuild 7000 BLAKE2B c3f21fbc54e41fe119e6f29ee271615df714722f7e70dfa474467e0c92b72c1524ff3a2aeac87dbf79b4b98bdb7a5e957267185dba1570d26a758f23dbed76e1 SHA512 c33f75e3f9f1c924df071b2d06e3dfa9cec88f99a5f017c8c128505d4fde597b45141f49cc7696cac06dfe8ba2b07112f3d8902028dcb6f82ac43304e8d9470c
+EBUILD flexget-3.1.70.ebuild 7001 BLAKE2B c4cbed0fcacec819b538f2b0df20670c3935fa435f438fa5c268793309b6d6e1460c3fb40ed62d812b2f61852582eed7676497676ce2a223ca21ae8ef7eac514 SHA512 b8ab6c164cbf2e963817c4eb6a92386e666c7998f49e6c40412f250cd730e59b81d1540091de9ad3cc57aef065995dbbacfa27f6aca3d83349a019dfbc9c54ec
 MISC ChangeLog 559 BLAKE2B 43030b5c73d9efa71c0cd9b8e60d1d75908debd818fb880a3740b2f74764fccfd9e1e014453a3fe851addce9f57a701c53894279ef1801622d9e8b71900b62df SHA512 85e73780c6b8c9abfd16f66e9183c9d7a8a2bc06fdd6311d05572b316a3975dafbd29bfe6f872862b0d6d41e79fde99717df2dedac2be5eee76af58a2d387667
diff --git a/net-misc/flexget/flexget-3.1.70.ebuild b/net-misc/flexget/flexget-3.1.70.ebuild
index aead3e0..76b6a15 100644
--- a/net-misc/flexget/flexget-3.1.70.ebuild
+++ b/net-misc/flexget/flexget-3.1.70.ebuild
@@ -73,11 +73,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	~dev-python/rpyc-4.1.4[${PYTHON_USEDEP}]
 	~dev-python/six-1.15.0[${PYTHON_USEDEP}]
 	=dev-python/soupsieve-1.9.5[${PYTHON_USEDEP}]
-	=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-1.3.17[${PYTHON_USEDEP}]
 	~dev-python/tempora-1.14.1[${PYTHON_USEDEP}]
 	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
 	~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	~dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
 	~dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
 	~dev-python/werkzeug-0.16.1[${PYTHON_USEDEP}]
 	=dev-python/zc-lockfile-2.0[${PYTHON_USEDEP}]
@@ -140,7 +140,7 @@ src_prepare() {
 	sed -i -e "s/^requests==2.21.0/requests==2.24.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^rpyc==4.0.1/rpyc==4.1.4/" ${S}/requirements.txt || die
 	sed -i -e "s/^six==1.13.0/six==1.15.0/" ${S}/requirements.txt || die
-	#sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.3.4/" ${S}/requirements.txt || die
+	sed -i -e "s/^sqlalchemy==1.3.11/sqlalchemy==1.3.17/" ${S}/requirements.txt || die
 	sed -i -e "s/^tempora==1.8/tempora==1.14.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^tzlocal==1.4/tzlocal==2.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^urllib3==1.24.2/urllib3==1.25.10/" ${S}/requirements.txt || die
diff --git a/sci-electronics/bitscope-dso/Manifest b/sci-electronics/bitscope-dso/Manifest
new file mode 100644
index 0000000..3acc231
--- /dev/null
+++ b/sci-electronics/bitscope-dso/Manifest
@@ -0,0 +1,2 @@
+DIST bitscope-dso_2.9.V23KG6ZT_amd64.deb 3650112 BLAKE2B 7c97b41da44a0970e70de1783fe37dbc6a90fc566b8650acb481cea708baa86daff91887b6c7193ee6d8357da4609cd2e2a4092cfb14cfc5a47a744c1df2f419 SHA512 10abadfa8b1e326d382f03adc8efc38d3a16020af557dd4369f0d9e6d74bef45856a2440f9d33657aea05cd82e70da2ed2b5e7158f8b67eff5b7d7aff1af940c
+EBUILD bitscope-dso-2.9.ebuild 1135 BLAKE2B dc00d6f37912e81bbb090d850bc42ef90d92f70d12839ce81f2a490ce511b39ebb335898e1aa975fcf5d21d0e336da34310523ba31ea832719a4b0d1a4f3c31a SHA512 ddb2d200ab4315a74e0f092d703fa144a2e7157b31109a35063f07522d09b10871f7ade834900e22e8f4cc9576e4e358e09fbffcdc9ae98651bb9f14b4792dd2
diff --git a/sci-electronics/bitscope-dso/bitscope-dso-2.9.ebuild b/sci-electronics/bitscope-dso/bitscope-dso-2.9.ebuild
new file mode 100644
index 0000000..69e7d87
--- /dev/null
+++ b/sci-electronics/bitscope-dso/bitscope-dso-2.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils udev unpacker xdg
+
+VERSION_TAG="V23KG6ZT"
+MY_PV="${PV}.${VERSION_TAG}"
+MY_P="${PN}_${MY_PV}"
+
+SRC_URI="amd64? ( http://bitscope.com/download/files/${MY_P}_amd64.deb )"
+
+DESCRIPTION="BitScope DSO for the BitScope PC oscilloscopes."
+
+HOMEPAGE="http://www.bitscope.com/software/dso"
+IUSE=""
+SLOT="0"
+
+KEYWORDS="-* ~amd64"
+LICENSE=""
+RESTRICT=""
+
+RDEPEND=">=dev-libs/atk-1.12.4
+	>=dev-libs/glib-2.12.0
+	sys-libs/libcap
+	>=x11-libs/cairo-1.2.4
+	x11-libs/gtk+:2
+	>=x11-libs/pango-1.14.0
+	x11-libs/libX11"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i "s/Icon=bitscope-dso\.png/Icon=bitscope-dso/" \
+		"${S}"/usr/share/applications/${PN}.desktop
+
+	gunzip -r "${S}"/usr/share/doc/${PN}/
+}
+
+src_install() {
+	insinto /etc/bitscope
+	doins -r /etc/bitscope
+
+	udev_dorules etc/udev/rules.d/77-bitscope.rules
+
+	dobin usr/bin/${PN}
+	dobin usr/bin/start-${PN}
+	dodoc -r usr/share/doc/${PN}/*
+	doicon usr/share/pixmaps/${PN}.png
+	domenu usr/share/applications/${PN}.desktop
+}
diff --git a/sci-electronics/bitscope-logic/Manifest b/sci-electronics/bitscope-logic/Manifest
new file mode 100644
index 0000000..b4d8d0d
--- /dev/null
+++ b/sci-electronics/bitscope-logic/Manifest
@@ -0,0 +1,2 @@
+DIST bitscope-logic_1.3.FC20FKZY_amd64.deb 1481286 BLAKE2B 95b6c522628a7909c7fdeaec4ec4de01bb22ce1e171619aa09c98221b5d0c38c5ff093d507d64c817d7c4b356a0c625a803706477b031efe34f262cd5ffe9445 SHA512 5b8d6d5199e0e24ec58b8930404e7a618a944eb3ce2f4ad2265df4e8853f7db3cf56fa1185f825e5d5d346cf7a373cd5b9789082d111a82521f7f13ccc08b36c
+EBUILD bitscope-logic-1.3.ebuild 1088 BLAKE2B 3dd5b7cfb274d4c493ebaccfb9db2f2be13d2677e6cd93024ec5bd897c3078d6548212ad9f15ebb9cd36bdba8e3cae27b6fd1f5312e9a79afe33b790690ca5fc SHA512 d8e2ab60805ac135991ecff7fe74e95bc9d44866d4f91a373ecb9f5ae93cfb900af2c65045a42833c32bad1c1764b69cd455713730f87afb4414ea587d36bd01
diff --git a/sci-electronics/bitscope-logic/bitscope-logic-1.3.ebuild b/sci-electronics/bitscope-logic/bitscope-logic-1.3.ebuild
new file mode 100644
index 0000000..c9641f0
--- /dev/null
+++ b/sci-electronics/bitscope-logic/bitscope-logic-1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils unpacker desktop xdg
+
+VERSION_TAG="FC20FKZY"
+MY_PV="${PV}.${VERSION_TAG}"
+MY_P="${PN}_${MY_PV}"
+
+SRC_URI="amd64? ( http://bitscope.com/download/files/${MY_P}_amd64.deb )"
+
+DESCRIPTION="BitScope Logic is a logic analyzer designed for use with the BitScope PC oscilloscopes."
+
+HOMEPAGE="http://www.bitscope.com/software/logic"
+IUSE=""
+SLOT="0"
+
+KEYWORDS="-* ~amd64"
+LICENSE=""
+RESTRICT=""
+
+RDEPEND=">=dev-libs/atk-1.12.4
+	>=dev-libs/glib-2.12.0
+	sys-libs/libcap
+	>=x11-libs/cairo-1.2.4
+	x11-libs/gtk+:2
+	>=x11-libs/pango-1.14.0
+	x11-libs/libX11"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i "s/Icon=bitscope-logic\.png/Icon=bitscope-logic/" \
+		"${S}"/usr/share/applications/${PN}.desktop
+
+	gunzip "${S}"/usr/share/doc/${PN}/changelog.gz
+}
+
+src_install() {
+	dobin usr/bin/${PN}
+	dobin usr/bin/start-${PN}
+	dodoc -r usr/share/doc/${PN}/*
+	doicon usr/share/pixmaps/${PN}.png
+	domenu usr/share/applications/${PN}.desktop	
+}