gentoo resync : 04.08.2018

12 files changed, 145 insertions, 407 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 6db09871c931..ae7fb9ce81da 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index f79632d62693..0ffdbb49b086 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -11,4 +11,4 @@ EBUILD eagle-7.3.0.ebuild 3538 BLAKE2B fdbac7c06a3c6f87215d8c26f6d2314ef00058ac3
 EBUILD eagle-7.4.0.ebuild 3540 BLAKE2B 7373ac5abebe65daf7efaabc58f0d15ad098cf19f330fae29a240638108951cdc4904e36fe4eb5cbbd33d2e957a2b1250360c3f331133e042140aee104666c38 SHA512 a3cd5350e4e4f23ccb590dbb322bcf92459aaf69d6e728fd0d8874648d45cd0bf173a9d06aebcb3395cb3d333d4dfb99e234dca89540e4cc4e1a04083fd5ea30
 EBUILD eagle-7.6.0.ebuild 3540 BLAKE2B e46e350a022f42366a2010e2d109b48b881d51bdf38887880e2e782917466c60863d58bc42eb1529274d11685a7ebf7b5ee0d84c1bb9bf63f882214c38175622 SHA512 cbfc083ead970ea2417a3a2cb67f6c659129d20e316a40a43f4d062b48dea51ceccac6bb1822232061c635afed3c3425a952c1aa267f413296d6f8c2479380b3
 EBUILD eagle-7.7.0.ebuild 3540 BLAKE2B e46e350a022f42366a2010e2d109b48b881d51bdf38887880e2e782917466c60863d58bc42eb1529274d11685a7ebf7b5ee0d84c1bb9bf63f882214c38175622 SHA512 cbfc083ead970ea2417a3a2cb67f6c659129d20e316a40a43f4d062b48dea51ceccac6bb1822232061c635afed3c3425a952c1aa267f413296d6f8c2479380b3
-MISC metadata.xml 781 BLAKE2B 966755c7f497175002e291cec41ecd8ce68cfc931dc1d17a62e200e5ca14deb10bcd4f82fe87e3ed5e9a50deffb1fb120e0856fc43142068510cf3f9b842b368 SHA512 cb30e6fffb1bfe09f177adc057e879a02b29f6651d45dceb029f541fb756cd1259c2658b14128bfd6b0866a67fcdeabcec8fc1df505ad4bc9ca11c79b20671af
+MISC metadata.xml 671 BLAKE2B fe104f5979bd1c3443983d0dd04b14fbce7c9f07b789a3faca57b3aacd3031855dd3eeda11775179f44a86b6f96274c235a574affb7b02abc21db34ce2e4c770 SHA512 e45c4c1d534e47500ad9a1354d568b879ba0b098f792c7bce74638148b153089fb85f2e5eb8198fe15406ded94981622be00db5572ec2d53dfca3d46f163d960
diff --git a/sci-electronics/eagle/metadata.xml b/sci-electronics/eagle/metadata.xml
index d171621207fd..3ed29bc26e16 100644
--- a/sci-electronics/eagle/metadata.xml
+++ b/sci-electronics/eagle/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 2f6a9702a974..3e0e609c1051 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,23 +4,13 @@ AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b5
 AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
 DIST kicad-4.0.4-i18n.tar.gz 2409039 BLAKE2B 95e0e8c8b001957df1f244ba5fef5b36658c75b3c903b495faab8c8ccb524d02dbb79b0197fa0485fc5f93a5a0088861bada57cd85d7982191437bdf8f7b1f3c SHA512 5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf
 DIST kicad-4.0.4.tar.xz 10672424 BLAKE2B 16bef2545e697757be270eeff6820e75b1a79a37528f264e127587131c519cbdf67a774a4a9a8ff32c90b236279746ffd2164cb4d8885dc68d2664ef3dd178de SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242
-DIST kicad-4.0.5-i18n.tar.gz 2464569 BLAKE2B d46800416593916da027bfafd754607b4d46f07d6b4a8167542f4201d6203ec186ffa3897019db80f7d99edffee9c57a248c498a472b083f58d59dcee436e85c SHA512 ff33051202d3aa50284170ca1b0ebd6279ee60559c4ce88c577248d4fe3d5781bb5b75eea6c165fbbd4abc1fd681357a7d7877339c4413fb3774bc8a55264b81
-DIST kicad-4.0.5.tar.xz 10626696 BLAKE2B 3e7efa8f0161c5633e5b1c615584489a346022d276f1fd81c12141e94a70b423f081c2d4c657894b4345c8a8f08e5650f451e18a00b418b003fa7c384106c960 SHA512 1486a039237e8d97ed21d62905ab74cb953b76c9d15bdfe7edd7380cf93e4c4b9a23aa82c6f523f6d5272e1dbe06ee8853a80eaabb1d0d9db6e304265f53ba7f
-DIST kicad-4.0.6-i18n.tar.gz 2578341 BLAKE2B 44f6f3a1789bd454a7031520211af5e7be6c82c380facaa1d932198e15a899b448848d9fa1f225e7c55cf0033396805c50a52de185387f927044443ef737d87d SHA512 d5a531857ed2699d9bbf583bd0716cef7b39d098e351a8e106d16b0001c592469c4f7a47f0c88e040479e5c515b9de3323b9419dfa17761c3f2cd059af2b0f8c
-DIST kicad-4.0.6.tar.xz 10834136 BLAKE2B e6fcd0856646878f9341d7f99648b1d8b2668858ec7e73b23be9163e32d15596e6b9471bb40e7d0e1113313d4f0718564535501d9d39b327e98581d29c45319f SHA512 f20e5bdb7f4535e8eb9d8d76926a89ad4b69fd727447269f45695556aed9f7ddfdc05f434021bc210490ccb4b5223658eafc275df8cfaae91e22e3b645f2837e
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
 DIST kicad-footprints-4.0.4.tar.gz 1400434 BLAKE2B eaf81e977a3d65305034f60eff18f6955cf6b805c2a28a2019c4bb2bd8de9868906a0f9e5ac17810c4779940c6b78e06472661966775cfb196b8cd8fc1ae4083 SHA512 7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e
-DIST kicad-footprints-4.0.5.tar.gz 2330378 BLAKE2B 110953681753d299e9a98c54e6fc83bcb9408ea711ad845b961185882568cc954b9e3acfaaa372f7df6e6cee64378e6185b143fcaf5b81acca9aa5f8ed2095fe SHA512 91122127be4b54bec7b37706d6438853463ed66b1c0c205e8d93709c159744e84ea58f3bf0cb1f4e18df6061f6df3d76f2ff0d6e698c6ba5ce3867d89838d95d
-DIST kicad-footprints-4.0.6.tar.gz 5315435 BLAKE2B 0d0aa6a19c8ec47750b87ca37eb88e62d142c7f5739959fa84e089a5be2c8b10b3b3c1945d678e19e0aa715cb6d4686ab66cff31e2dd21e53d448a0966172902 SHA512 808a5a16cabeb3c7ffcffbef9eb8b57b42953ea23e025c283ad8258a7fc07fecbfeaa4ffd6d33dc8fe00b63c45216a3a9fbd81568a2e99c07b6833df7f04e1a9
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-libcontext.tar.gz 25599 BLAKE2B b8871ab552745dfe29504b97c3c3e23f9e63100ef108c5a116512029f4973791e3d2bca240877319ee177f0a28da4a7946ae5cfaf18eaca0f5b0b1660335a520 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9
 DIST kicad-library-4.0.4.tar.gz 87947075 BLAKE2B b9176ad7ba05f32a5ed42012818a7636fd0f8993630627480557c3d8ab99884b31090f66f438a86dbc842677629cca629333be1d7b05f06a3c12373e57622954 SHA512 57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c
-DIST kicad-library-4.0.5.tar.gz 91081668 BLAKE2B 7bd7c765b62170173e35dbe0583ae3f0cb141ddf616123bf827411172d1b85cca10e179e30a01549fd43469632c092cba2d2375fd90a58d861cb289469b4bca2 SHA512 904d3439d1e76d13fe72a221efe2f9f3b0a4115f8e84e78d44a24d5a727138de0b91eec7733e851b9a6fec138897f203229bdf83b772ea49000a6d828ba6f25f
-DIST kicad-library-4.0.6.tar.gz 175137480 BLAKE2B 377b350c7a19164608eb244326b07dff59e817198d390c820cca3594477658e43a9699795bc9f45b4651395b02d98c9a12e3b8f8de0e4b324090e08d6f0b8629 SHA512 4c35ce045a59c289e54cf8f634b22e59c272d79f4db047a0049085793b70ce659aba7bdba182f03e7081e65d0921af380aa9ca84eff4d3ec8644822d161ba425
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.4.ebuild 7381 BLAKE2B a0368f595f54dcaf15d4053be3be8cfdbba40b4729f5e68700e2e970792eeba8b50e8eadd2c2e84de3fd6831f5d0a004ee8128c06809851c11bd6eea8fbb49a8 SHA512 c7784cab7473803eb7c51b62fe09c48d38b1f27dc9b33382cd5a7194fc08572f2024aa8d4564ff2f51eb1b1e651eadf6e389ee25b7d01eb2953ca04bc7a2d3c4
-EBUILD kicad-4.0.5-r1.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
-EBUILD kicad-4.0.6.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
 EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
 MISC metadata.xml 971 BLAKE2B 7f048f2b1d87a7590f0d2bee633f18913e735253b5c6bf209e95ed250c3b0071032860ada3482d52140acf249958b0266748c3367cf71b3ce7a8e1f0148deb54 SHA512 17e95b02c75fb0b36ef3e9f4ab4cc04e98bfb42481cc45f6860f8767cdc56941a140b2f0a417fde62e4644e386439eccc9d04f652914f01701d6c6e4ee86795f
diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
deleted file mode 100644
index 2e59e1a1d631..000000000000
--- a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
-
-DESCRIPTION="Electronic Schematic and PCB design tools."
-HOMEPAGE="http://www.kicad-pcb.org"
-
-SERIES=$(get_version_component_range 1-2)
-
-SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
-	!minimal? (
-		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
-	)
-	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples github i18n libressl minimal +python"
-LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-unset lang
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
-	github? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	media-libs/glew:0=
-	media-libs/freeglut
-	media-libs/mesa
-	sys-libs/zlib
-	x11-libs/cairo"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	i18n? ( virtual/libintl )
-	python? ( dev-lang/swig:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-
-	# Patch to work with >=boost 1.61
-	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
-	# Patch to work with >=cmake 3.11
-	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
-
-	# Remove cvpcb desktop file as it does nothing
-	rm "resources/linux/mime/applications/cvpcb.desktop" || die
-
-	# remove all the non unix file endings and fix application categories in desktop files
-	while IFS="" read -d $'\0' -r f; do
-		edos2unix "${f}"
-		sed -i '/Categories/s/Development;//' "${f}"
-	done < <(find "${S}" -type f -name "*.desktop" -print0)
-
-	# Handle optional minimal install.
-	if use minimal; then
-		# remove templates as they are not needed to run binaries
-		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
-	else
-		# create a link to the parts library in the main project folder
-		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
-		# create a link to the footprints library and add cmake build rule for it
-		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
-		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
-		# add the libraries directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
-		# add the footprints directory to cmake as a subproject to build
-		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the library module
-		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
-	fi
-
-	# Add internationalization for the GUI
-	if use i18n; then
-		# create a link to the translations library in the main project folder
-		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
-		# Remove unused languages. Project generates only languages specified in the
-		# file in LINGUAS in the subproject folder. By default all languages are added
-		# so we sed out the unused ones based on the user l10n_* settings.
-		local lang
-		for lang in ${LANGS}; do
-			if ! use l10n_${lang}; then
-				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
-				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
-			fi
-		done
-		# cmakelists does not respect our build dir variables, so make it point to the right location
-		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# we also make from the master project so the source dir is understood incorretly, replace that too
-		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# add the translations directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the translation module
-		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
-	fi
-
-	# Install examples if requested
-	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
-
-	# Add important missing doc files
-	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_SKIP_BOOST=ON
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-		-DCMAKE_CXX_FLAGS="-std=c++11"
-	)
-	use python && mycmakeargs+=(
-		-DwxUSE_UNICODE=ON
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	if use debug; then
-		append-cxxflags "-DDEBUG"
-		append-cflags "-DDEBUG"
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use minimal ; then
-		ewarn "If the schematic and/or board editors complain about missing libraries when you"
-		ewarn "open old projects, you will have to take one or more of the following actions :"
-		ewarn "- Install the missing libraries manually."
-		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
-		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
-		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
-	fi
-	elog ""
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-	elog "For help and extended documentation emerge app-doc/kicad-doc."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-4.0.6.ebuild b/sci-electronics/kicad/kicad-4.0.6.ebuild
deleted file mode 100644
index 2e59e1a1d631..000000000000
--- a/sci-electronics/kicad/kicad-4.0.6.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
-
-DESCRIPTION="Electronic Schematic and PCB design tools."
-HOMEPAGE="http://www.kicad-pcb.org"
-
-SERIES=$(get_version_component_range 1-2)
-
-SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
-	!minimal? (
-		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
-	)
-	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples github i18n libressl minimal +python"
-LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-unset lang
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
-	github? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	media-libs/glew:0=
-	media-libs/freeglut
-	media-libs/mesa
-	sys-libs/zlib
-	x11-libs/cairo"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	i18n? ( virtual/libintl )
-	python? ( dev-lang/swig:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-
-	# Patch to work with >=boost 1.61
-	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
-	# Patch to work with >=cmake 3.11
-	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
-
-	# Remove cvpcb desktop file as it does nothing
-	rm "resources/linux/mime/applications/cvpcb.desktop" || die
-
-	# remove all the non unix file endings and fix application categories in desktop files
-	while IFS="" read -d $'\0' -r f; do
-		edos2unix "${f}"
-		sed -i '/Categories/s/Development;//' "${f}"
-	done < <(find "${S}" -type f -name "*.desktop" -print0)
-
-	# Handle optional minimal install.
-	if use minimal; then
-		# remove templates as they are not needed to run binaries
-		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
-	else
-		# create a link to the parts library in the main project folder
-		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
-		# create a link to the footprints library and add cmake build rule for it
-		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
-		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
-		# add the libraries directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
-		# add the footprints directory to cmake as a subproject to build
-		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the library module
-		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
-	fi
-
-	# Add internationalization for the GUI
-	if use i18n; then
-		# create a link to the translations library in the main project folder
-		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
-		# Remove unused languages. Project generates only languages specified in the
-		# file in LINGUAS in the subproject folder. By default all languages are added
-		# so we sed out the unused ones based on the user l10n_* settings.
-		local lang
-		for lang in ${LANGS}; do
-			if ! use l10n_${lang}; then
-				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
-				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
-			fi
-		done
-		# cmakelists does not respect our build dir variables, so make it point to the right location
-		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# we also make from the master project so the source dir is understood incorretly, replace that too
-		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# add the translations directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the translation module
-		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
-	fi
-
-	# Install examples if requested
-	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
-
-	# Add important missing doc files
-	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_SKIP_BOOST=ON
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-		-DCMAKE_CXX_FLAGS="-std=c++11"
-	)
-	use python && mycmakeargs+=(
-		-DwxUSE_UNICODE=ON
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	if use debug; then
-		append-cxxflags "-DDEBUG"
-		append-cflags "-DDEBUG"
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use minimal ; then
-		ewarn "If the schematic and/or board editors complain about missing libraries when you"
-		ewarn "open old projects, you will have to take one or more of the following actions :"
-		ewarn "- Install the missing libraries manually."
-		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
-		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
-		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
-	fi
-	elog ""
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-	elog "For help and extended documentation emerge app-doc/kicad-doc."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/linsmith/Manifest b/sci-electronics/linsmith/Manifest
index 971f9985b38d..66e9abbddf2b 100644
--- a/sci-electronics/linsmith/Manifest
+++ b/sci-electronics/linsmith/Manifest
@@ -1,4 +1,6 @@
 AUX linsmith-datafiles.patch 757 BLAKE2B 273a60d1b93046c015c178c6d037252c667016c3601c7830c9b4c0ff1c1b899c013660ee76034d143011d8c34b6077d137202f3398b9d7fbae3836105dcc69c9 SHA512 af6f38420a4adc8386c70c4837aee74ff5cf2994bc0edf230198cb41cd53dbee69aa08c497dccb5e20f6a89282b2f690995d7cd5f86b93c8ac0f6488f0c0d266
 DIST linsmith-0.99.30.tar.gz 1132438 BLAKE2B fda024052d0aa1af7254aa37975a62bcb1bd2dbeb020202853bc32c85e6859bda6153fb5e6af8f18a4bf29a11c5eb7bd5eaacc68ebbf20b7d2622cc0d04d77d1 SHA512 d1f6cd3895b7c217de49c214f8b86b1bb9ce97d540546f0004b7f320b7cf142652cf0ec51ce48cf32b89564bf408546bf10d5f4937544cf9e8a4d87d1db5bed5
+DIST linsmith-0.99.31.tar.gz 1138998 BLAKE2B c8b32bf2530b87a0bb9f2b7914e5ccdb6c8ad28b57b919b93c4ed0fb272a2e61f588adb3794b81565580a68413f3cb4e43ac861c4a70cce105d3e821d21eccf3 SHA512 0218992243ff5db6efa39e01d7eddf6d44d921fe4caf131d020416d320a542f19bd577a3bbd9fc8df5f1ccb62ba152d02f825bab8fae55dadd262c5dce47c076
 EBUILD linsmith-0.99.30-r1.ebuild 1526 BLAKE2B 0c720c439ffd249855c05770704749edb84762c80dcccc5bc9e5d95a49f79faccc17979a27d63bb0fd6dad23de118623d43ac6e27057b956de8d0ee0ebfcca1d SHA512 5eb2efd3f7332957e440e7b2fa057b6376577029634c53139aae465aa37b91a4cbb56ef01a1670e7033d46dd9d2deea9b7dc15f250028016ad930ecb1d438b86
+EBUILD linsmith-0.99.31.ebuild 1560 BLAKE2B efc9459a1c0fa0d13962a3aa5a543249ac76dbde5a22aeb31d2e75a4deccf1c06ec0a1c80dacdcab370dc98cdba9251abd646dac94e3b77abb75e7b3096cc15e SHA512 71efe7710912c3c2a22a91f28b3e566eb94078cecc36e4f02bb7b2cdb8d9a18cdddc5d23251252244eb9a6beb476518a7cbe90d5c3f1d5a825ada31480d5cfc4
 MISC metadata.xml 473 BLAKE2B 397250ec12397650b2695e1ff89d5dfc9a3c556b64f6fc02c42427757c9c2ca8d0af8630854b611602f6cbf7d2ea66b529c7e4ea50d4d9a5ad7bf94dc15b14a0 SHA512 46151b41b8bacae4dc89d8ef861195f3c6baed7854c1ab176b5ab54b99cad27d92418a58739e2266491e2b4ec003000c4f694ca94c1e0257465ce1eb1b5c8f2b
diff --git a/sci-electronics/linsmith/linsmith-0.99.31.ebuild b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
new file mode 100644
index 000000000000..af9078102c2a
--- /dev/null
+++ b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="Smith charting program, mainly designed for educational use"
+HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	dev-libs/atk
+	gnome-base/libgnome
+	gnome-base/libgnomecanvas
+	gnome-base/libgnomeui"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS TODO )
+
+src_prepare() {
+	eapply_user
+
+	# This patch is to prevent make install copying
+	# the examples in /usr/share/linsmith
+	# Now they are cp to the correct location.
+	eapply -p0 "${FILESDIR}"/${PN}-datafiles.patch
+
+	# fix QA warnings about wrong categories and location of icon file
+	# in .desktop file
+	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
+		-e "s/Encoding=/#Encoding=/" \
+	    -e "s#pixmaps/linsmith/l#pixmaps/l#" \
+		${PN}.desktop || die
+
+	# fix QA warnings about 'maintainer mode'
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/usr/share/${PN}"
+	doins datafiles/conv0809
+
+	einstalldocs
+	doman doc/${PN}.1
+
+	domenu ${PN}.desktop
+	doicon ${PN}_icon.xpm
+
+	if use doc; then
+		insinto "/usr/share/doc/${PF}"
+		doins doc/manual.pdf
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins datafiles/*.circ datafiles/*.load || die
+	fi
+}
diff --git a/sci-electronics/puff/Manifest b/sci-electronics/puff/Manifest
index 9f939c689bfc..0f6071d99f06 100644
--- a/sci-electronics/puff/Manifest
+++ b/sci-electronics/puff/Manifest
@@ -1,3 +1,4 @@
 DIST puff-20100127.tgz 430028 BLAKE2B e3c019c4034f4f70c3f1a2468360a8838ee338ec167b8da9ef6ec630d6443c66e798e22e6e2b80f6d706191756831aa3fa5146170e0bdb2cebe3cfcf13f6cd99 SHA512 d39d74300a5f6d226dcd6147f3c63cf30396abd14d765b24b48dbd1956c81a10d4233c141789648423aa44631197e1ec160630f9b20b6ac5ae641ae67cdcb2da
+EBUILD puff-20100127-r1.ebuild 991 BLAKE2B d71c2956192892074c75cea8628c6627803cd01143c241f2920dbed68d992f7c002e93946ca5f262ace996abd9eb1ec39d866e4be46faf000ec0a543d42ea29b SHA512 1cd1216feb494f22d798a04a1105f185558d171b3a6108fe597bcbe26571c90ef4e907534ebd08453be56ea6583bae8bb5811a776834ad74cf716ed1e7b06e12
 EBUILD puff-20100127.ebuild 1076 BLAKE2B e5dbd08f27ab8a8f12d953abb7fdefe58dc5aeaf88816a0794b21a1b63cdaf44948768ecde83bc100d0f9b1e739f9289058de5e87ab4fbaa735e62fedbe4b020 SHA512 25b1ea4ed0abd027cfd4682aed6c2194f289a55cf7bdcf43ee0826e14d7252d1fadefa488c8dd9039e78ad7b3855e98564ebc439e0833e5df6a4da4beaa92959
 MISC metadata.xml 378 BLAKE2B b89c27528f1e752ccee9a0150ea027f80f1a123d78e625d40344dc915e24aa7682d78e75289e16259ade5e35377149981f363fe9020e6ccbc065be0b3fff731f SHA512 e6cdfd1639a8c45afd779dfda0d3a76d66576a7fa089d2285cc044a627a1ba4c5a3d3814a43fc8a7be118d7d2c58b2ffc9d3ade71025fc0f51508d98c7265aa0
diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild
new file mode 100644
index 000000000000..9ea282b9822f
--- /dev/null
+++ b/sci-electronics/puff/puff-20100127-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="microwave CAD software"
+HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/"
+SRC_URI="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/fpc"
+
+src_prepare() {
+	default
+	# fix lib path for X11 and dont ignore LDFLAGS
+	sed -i -e "s#lib\\\/#$(get_libdir)\\\/#" \
+		-e 's/CFLAGS/#CFLAGS/' \
+		-e 's/link.res pu/link.res $(LDFLAGS) pu/' Makefile || die
+}
+
+src_compile() {
+	LDFLAGS="$(raw-ldflags)"
+	emake -j1
+}
+
+src_install() {
+	dobin puff
+
+	dodoc changelog.txt README.txt
+	newdoc "Puff Manual.pdf" Puff_Manual.pdf
+
+	insinto /usr/share/${PN}
+	doins setup.puf
+	doins -r orig_dev_and_puf_files
+}
+
+pkg_postinst() {
+	elog "You must copy /usr/share/${PN}/setup.puf into your working directory"
+	elog "before using the program."
+}
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index 48161b9a0c29..b90abee4f234 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,3 +1,5 @@
 DIST voacapl-0.6.7.tar.gz 2061884 BLAKE2B cd0843f42f7284ea77be125b879c7304c50991540c1c376c2f684a8ef0def313b70a11d65a890d5b1458d51cd113e69ba3731f0eb5121f1c90b9555b449b58ed SHA512 bdd8c420ea1bb352885a0a127db1494b8cbb6d01e78fa47e577314e39b35d8265e1b62e99719edce512200ed84644dd6693e88aea63ab7416b1f24a3b25cdbc8
+DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
 EBUILD voacapl-0.6.7.ebuild 532 BLAKE2B 19c961cb23fbbea8fff25c7ee17846bc9fc011b6dff532d8d8301e423d40800968735d8711780f330bdf5b1405329ad57a03786b1c3d4f5cf8c5dc7a23e16b19 SHA512 2089971303460eb506b59c443c31e18d09bc325515b70914506bc0053b1896c5ea0a64fff422dff21d628448ec16aa5bf56bc4eef60da64e15e8d754a1406169
+EBUILD voacapl-0.7.2.ebuild 457 BLAKE2B f7db9e38562847c6a5e64fe32317759e48dbca3dc97b8a3f24757ff95e95127b4b1b5fbfe4fecd83fe6789a296746c9c2179a653a7a571e968d822ba92ca4ed2 SHA512 7d8509a92a4257700279ee8d598aa6e43098deae33d357f3e782cfef799a82d8eacbfaf0c1950c391c8f2c0880caa96cb289c16bcbf20608c73730de29895391
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/sci-electronics/voacapl/voacapl-0.7.2.ebuild b/sci-electronics/voacapl/voacapl-0.7.2.ebuild
new file mode 100644
index 000000000000..ee29ae4b04ce
--- /dev/null
+++ b/sci-electronics/voacapl/voacapl-0.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit fortran-2
+
+DESCRIPTION="HF propagation prediction tool"
+HOMEPAGE="http://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="http://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror bindist"
+
+src_compile() {
+	# bug 513766
+	emake -j1 DESTDIR="${D}"
+}