Merge updates from master

3 files changed, 2 insertions, 83 deletions

diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index afa0caa0e227..18816888a20a 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
 
 LICENSE="mplus-fonts"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="X"
 
 DEPEND="x11-apps/mkfontdir
diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
index 74a3a4eab192..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"
-}