gentoo resync : 22.05.2018

3 files changed, 2 insertions, 73 deletions

diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index adc62df5970e..cbb82a138df2 100644
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -1,5 +1,4 @@
 AUX spice-3.5.5-gcc-4.1.patch 2511 BLAKE2B d9bb215dfcaf595d9f62a4748507342c3b6242f551a8458965e37c13e34432d686f00b91ee27d80451261b8baa9d0bd9616b378b246fc895b0dc1fff0d4975c8 SHA512 9ae98c77d8a95b2ccac03e48d778b431a449f8383938ca2d71dc1d77254a0dade6c159f1723aa9a00ac921379ec210584c32ae7e63a849bd07691d34bd92d5c7
 DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8
-EBUILD spice-3.5.5-r1.ebuild 1827 BLAKE2B 4e411ffd711552c8b91792a3d7d3360f2f3cf83390db8122f59fe5fe561d88c702b970e5f5e963a207de191ba3e2643b536f03e53b1b0e9e2174e9dba7f8b11b SHA512 9e88b5d5eebde7c06a4d955818965e72ca5e9191a2668ad48fbc1bacc3636ca7e57d90eb9a5cac22ffa8ce399c5468d3b4a7c30f149f7126eb2b4b03a86f3122
-EBUILD spice-3.5.5-r2.ebuild 1945 BLAKE2B f5f8323df81ea822f8a200353762511514a6de8dcb5e99f4c7013d7830ee7306b80b6519ff3f112447174e80e1fcf9107db05122e6eb495619822b1d242c9356 SHA512 891e93b1e9416f468291d6d311f1af7c78d3c85821d8f974851cb62ad41b4ced194122c47e8697d92db12af7a463692e55d65904d00ffc37c52b3e369f1a092b
+EBUILD spice-3.5.5-r2.ebuild 1948 BLAKE2B 33890c758aa111aac01004bffa707bfa9cd1424793c40ea79f35f977f4680b728aa40f29ba6ed749ebb0a7b91e99cbcdd90a2329c7b3c54e8f741ebe61356a1e SHA512 e3b160131fea8768834317550f5575453db47319cd1578bf5f4436ffe6375c445ca844df6bec0e8e81296fb1796d245dbda34d33cccb35fbae32b5ae0018af76
 MISC metadata.xml 795 BLAKE2B a0fb4029e9966c86b738f79130a94d73c4c9ea355974010c6ffda8343bc28946fc1ef515fec8367bf5c21af8517cade07ed01496e0d82a597e782769b173c20c SHA512 22b6f5f1ed00b4c4b6106da4c838345cadc8cfa1b3cea891f1f645414970f016ddeab0ef180eb91dac38d2f623d1d33fb2175efde9c02bdec80a0f4ceb85afd5
diff --git a/sci-electronics/spice/spice-3.5.5-r1.ebuild b/sci-electronics/spice/spice-3.5.5-r1.ebuild
deleted file mode 100644
index 7d19e22dfe34..000000000000
--- a/sci-electronics/spice/spice-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic multilib
-
-IUSE=""
-
-MY_P="spice3f5sfix"
-DESCRIPTION="general-purpose circuit simulation program"
-HOMEPAGE="http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="sys-libs/ncurses
-	x11-libs/libXaw
-	>=app-misc/editor-wrapper-3"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	# spice accepts -O1 at most
-	replace-flags -O* -O1
-
-	unpack ${A}
-	cd "${S}"
-	# Avoid re-creating WORKDIR due to stupid mtime
-	touch ..
-
-	sed -i -e "s:termcap:ncurses:g" \
-		-e "s:joe:/usr/libexec/editor:g" \
-		-e "s:-O2 -s:${CFLAGS}:g" \
-		-e "s:-lncurses -lm -s:-lncurses -lm ${LDFLAGS}:" \
-		-e "s:SPICE_DIR)/lib:SPICE_DIR)/$(get_libdir)/spice:g" \
-		-e "s:/usr/local/spice:/usr:g" \
-		-e "s:/X11R6::" \
-		conf/linux || die
-	sed -i -e "s:head -1:head -n 1:" util/build || die
-	epatch "${FILESDIR}"/${P}-gcc-4.1.patch
-
-	# fix possible buffer overflow (bug #339539)
-	sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \
-		src/lib/fte/misccoms.c || die
-}
-
-src_compile() {
-	./util/build linux || die "build failed"
-	obj/bin/makeidx lib/helpdir/spice.txt || die "makeidx failed"
-}
-
-src_install() {
-	# install binaries
-	dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die "failed to copy binaries"
-	newbin obj/bin/help spice.help || die
-	dosym /usr/bin/spice3 /usr/bin/spice || die
-	# install runtime stuff
-	rm -f lib/make*
-	dodir /usr/$(get_libdir)/spice || die
-	cp -R lib/* "${D}"/usr/$(get_libdir)/spice/ || die "failed to copy libraries"
-	# install docs
-	doman man/man1/*.1 || die
-	dodoc readme readme.Linux notes/spice2 || die
-}
diff --git a/sci-electronics/spice/spice-3.5.5-r2.ebuild b/sci-electronics/spice/spice-3.5.5-r2.ebuild
index 0f73d8396331..3b1e87cbbb5b 100644
--- a/sci-electronics/spice/spice-3.5.5-r2.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="sys-libs/ncurses:0
 	>=app-misc/editor-wrapper-3"
 
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}