gentoo resync : 03.03.2019

4 files changed, 2 insertions, 84 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9d0fd908546d..39faf84cc0fd 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index f45b74c73f96..5b69bdabbe46 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -3,6 +3,5 @@ DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035
 DIST gnucap-2009-12-07-models-ngspice17.tar.gz 4418060 BLAKE2B b7d300cc93b870b13eab25d4b0303af647303551f2777e61cc38d18d770e9b446b9a1e4f8fd94b81c11f96eb1c6bac4ef113f69806a979ac3fe69903e0855d91 SHA512 0f26b4491531d41f18d35b8cde339e99b593794495346186dac74f72bd3632dfe4690ede50a972c47ae41b2229a62d708ecd28bb8fc04b5b7347a481bca709d5
 DIST gnucap-2009-12-07-models-spice3f5.tar.gz 629424 BLAKE2B 3369374942a0b0b14dc484a6d49b9650d461112f15623f43b1140a4bddd4d23a6035c4c31294f1003828b93bc21b1c1c059acf61c2db85c9578bb8162e247234 SHA512 4c16e4bcdd3b4092bd6c89c56421ef9ca85b6aba90d9e244fee03278916c6b5ac1c56ecba62d4a5561ff3d93abc61492c0116ccc350c483128ca792b52fa7155
 DIST gnucap-2009-12-07.tar.gz 545578 BLAKE2B a1ff8ed82a8ab57c455fdb96c399a5e480b1eb898d439e39380c4287d65538e9c0e1f61aef08c616aff34390a507243edc1fbb2f55b2bfc6d383264e2281e1c9 SHA512 c0e8a4f6b66eeff2cf95e9cf2050a25aa08f660de1e4b3e78011998deb93cd4e5b562cdcf5f3beb72e04cb3c7650cde6ae8c81602ffc31f5e333d84e7e3867a9
-EBUILD gnucap-0.35.20091207-r1.ebuild 2015 BLAKE2B 457f4c6a4a079485dbdbf192e240c6bfdadad1552f5842a6819013b6bff75b878f50ab69990df71c5d17332fc074bddbb19806b1a87fd8befd0e325fb1adf62f SHA512 2e4087bfb6e48b12031c221cac00f0878b4d4c6f32787d09eff4025604910467c915fe7139a040ba6e7f15f6833f1ef93a917681bddf64bd237f7912615acc16
-EBUILD gnucap-0.35.20091207.ebuild 2222 BLAKE2B c27bb9aa7a7ac83da4500f75a9c66e4c07a6cb1247523d4b9566351c9f8b1bd39351b26c0c2b8bab41af9510a73a17a19be9c58785f6fdc9c43862466def5199 SHA512 e60b00af725bb116172b614291f92c43effc705aab47a2fcf91aa8661d09143c17e9299e421b0e97fdd66de5303f4448ff5aa2432713d57f1d38564fae5e10b9
+EBUILD gnucap-0.35.20091207-r1.ebuild 2012 BLAKE2B 4f34563b35e08269f7929211f25256d1dbee0e47f446d88e54442741d1d39296f3c369ad1c69dcfea9abba665395988a8c812ad10ed597d3db6973ad87446c9c SHA512 027ab0632a5bdf76ab55cd39517b7e2e928a61728d5666e4c39b119fd7a28038234d686f62f0db025e9f20f35d4dba23ed1febfd911fea411c1979d9e91c4c40
 MISC metadata.xml 744 BLAKE2B 01d7c9ebd0ccc384f44c12182b3ad5b2aa675079e2538d0fc9e18582de67e7736759c57f28011301daf5550f43bc922ef9bfe16fb76e254faecdb1bf7b57fed6 SHA512 35f918617232c6986e7aa4461861454a0629840c8fee4e814915eb8e7d44d8d50545dba6f74c12700741e9372515b076a2ce832c9c90d4daba5acf8f0e6a87db
diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
index e3064c93b3f7..aa2182dda711 100644
--- a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gnucap.org/"
 IUSE="examples"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207.ebuild
deleted file mode 100644
index ef828018d8f4..000000000000
--- a/sci-electronics/gnucap/gnucap-0.35.20091207.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib toolchain-funcs flag-o-matic
-
-SNAPSHOTDATE="${P##*.}"
-MY_PV="${PN}-${SNAPSHOTDATE:0:4}-${SNAPSHOTDATE:4:2}-${SNAPSHOTDATE:6:2}"
-
-DESCRIPTION="GNUCap is the GNU Circuit Analysis Package"
-SRC_URI="http://www.gnucap.org/devel/${MY_PV}.tar.gz
-	http://www.gnucap.org/devel/${MY_PV}-models-bsim.tar.gz
-	http://www.gnucap.org/devel/${MY_PV}-models-jspice3-2.5.tar.gz
-	http://www.gnucap.org/devel/${MY_PV}-models-ngspice17.tar.gz
-	http://www.gnucap.org/devel/${MY_PV}-models-spice3f5.tar.gz"
-HOMEPAGE="http://www.gnucap.org/"
-
-IUSE="examples"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	# No need to install COPYING and INSTALL
-	sed -i \
-		-e 's: COPYING INSTALL::' \
-		-e 's:COPYING history INSTALL:history:' \
-		doc/Makefile.in || die "sed failed"
-
-	if ! use examples ; then
-		sed -i \
-			-e 's:examples modelgen:modelgen:' \
-			Makefile.in || die "sed failed"
-	fi
-
-	sed -i -e 's:CFLAGS = -O2 -g:CPPFLAGS +=:' \
-		-e '/CCFLAGS =/i\CFLAGS += $(CPPFLAGS)' \
-		-e 's:CCFLAGS = $(CFLAGS):CXXFLAGS += $(CPPFLAGS):' \
-		-e 's:LDFLAGS = :LDFLAGS += :' \
-		-e 's:CCFLAGS:CXXFLAGS:' \
-		-e "s:../Gnucap:${S}/src:" \
-		models-*/Make2 || die "sed failed"
-
-	sed -i -e "s:strchr(str2, '|'):const_cast<char*>(strchr(str2, '|')):" \
-		{src,modelgen}/ap_match.cc || die "sed failed"
-
-	tc-export CC CXX
-	append-cxxflags -std=gnu++98
-}
-
-src_compile () {
-	emake || die "Compilation failed"
-	for PLUGIN_DIR in models-* ; do
-		cd "${S}/${PLUGIN_DIR}"
-		emake CC=$(tc-getCC) CCC=$(tc-getCXX) || die "Compilation failed in ${PLUGIN_DIR}"
-	done
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	insopts -m0755
-	for PLUGIN_DIR in models-* ; do
-		insinto /usr/$(get_libdir)/gnucap/${PLUGIN_DIR}
-		cd "${S}/${PLUGIN_DIR}"
-		for PLUGIN in */*.so ; do
-			newins ${PLUGIN} ${PLUGIN##*/} \
-			|| die "Installation of ${PLUGIN_DIR}/${PLUGIN} failed"
-		done
-	done
-}
-
-pkg_postinst() {
-	elog "Documentation for development releases is now available at :"
-	elog "    http://wiki.gnucap.org/dokuwiki/doku.php?id=gnucap:manual"
-}