gentoo resync : 16.02.1018

3 files changed, 4 insertions, 61 deletions

diff --git a/app-office/sc/Manifest b/app-office/sc/Manifest
index 05b796e50fe1..07be67109e7e 100644
--- a/app-office/sc/Manifest
+++ b/app-office/sc/Manifest
@@ -3,6 +3,5 @@ AUX sc-7.16-c.patch 4345 BLAKE2B 622f8200d7bce8606ae65368fee3cfbfdeabb042c814cd9
 AUX sc-7.16-lex-syntax.patch 207 BLAKE2B 02ef6909652247141eddd8845c83879789133e878abc05d0b4db55536b594f0ccb8453735d66e0f927498d35ee8fd5c556f43179e1dc272c4d98539e3e2cf460 SHA512 d4f6673a51f27034deb38595cd5a7ccb3a4027f14a9697b22b0d59763c6dd9df61e81d8749013f0eb9add370d9fdef4370c26e39d67d24b8573f93b600713a2a
 AUX sc-7.16-printf.patch 3242 BLAKE2B 824673b0798f0a268cfb755ddd661d9f84673a49ef456341124669d0f4119e23b21f3ba3e0786ea5cfaafd51ce0ceb32b6a4236ca01bbf58d647d9f8adc126da SHA512 2ad30d2394256ec1c740565507c5672d37d0380a3e2b619fdddff65749e03c57bb3b1a9d08b962751120aa063b39f3042b29906a6819076c1777c726d903791b
 DIST sc-7.16.tar.gz 210809 BLAKE2B d497d935342e942662f28605be60504e71afa0a3f148275afb19a317c546eb39c849b80195a1f1eeb2dc5e5250e3907673713585459ecde5e10714864860d3cf SHA512 efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b
-EBUILD sc-7.16-r1.ebuild 1390 BLAKE2B 6adca89debb8e39450db181c5e6bb065eae573037e0cdbbdc774669d74eb7c3eaa601e187c64888665b5fbc0970bde8e15f593e406a606c2a9f1a95f307c97ac SHA512 2048804999b3dc18291d46d7e808a3ea7a6cf86e69cf9b5ebd18dcf66e7b1c551997030429cabd1cc53ad477add853c552a83de98a7e6579b5de779090b1aceb
-EBUILD sc-7.16-r2.ebuild 1388 BLAKE2B 495dbd71b94154917654502db85322d05ef118d9d27a7510b2678d9ab8908c5f73d8d9436a9f2e512d5ed256c9a5c1bb6f3d4a77e40e51f96ce9d30ef7ccb4d3 SHA512 ca1c0e84a683125f61b7ebb6f10a7e0504281e60996e5632f35c086c04b1a25f7b6cbf08faa6d2c4c075695a941800fabeefcba33cd59c3a3b36e9b967b76d6d
+EBUILD sc-7.16-r2.ebuild 1371 BLAKE2B 73f2f79a2f759076d65f79e29ea38be487c8ed39bd7aa9979e14601a9924199a475d51c4097c948865cf4dba8bb147ebb3445fa1ffaa098c4db03612fdea9963 SHA512 36cb58109317e029db7d1c4ee03b0e9fb991cf4ce1b19c2d12e3e50a059d7b4aa3ecf47713917c139a86a184c5a6e76dde282a09f2bacba7315491046fc01eec
 MISC metadata.xml 305 BLAKE2B a30ed0bef58b07807c1bbc48c8530277e2ed3f36c4dcc2c5f3cf39a0aebc8983297660d7116c747a97d31db38df8b3ec0c9ce9c87d7d8cde724bd4c56add283d SHA512 b023b745f213339706f73ad2404536ce259461346d33a182aed31d9f7904fc8e392629794561f133953cbe22010b1e2b41caeee56472a6ecda0444f6594317d8
diff --git a/app-office/sc/sc-7.16-r1.ebuild b/app-office/sc/sc-7.16-r1.ebuild
deleted file mode 100644
index 46a5705bfb3b..000000000000
--- a/app-office/sc/sc-7.16-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Spreadsheet Calculator"
-SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${P}.tar.gz"
-HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc sparc x86"
-
-COMMON_DEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="virtual/pkgconfig"
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-lang/stratego"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-lex-syntax.patch
-
-	sed -i \
-		-e "/^prefix=/ s:/usr:${D}/usr:" \
-		-e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \
-		-e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \
-		-e '/^LIB=/s|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \
-		-e "/^CC=/ s:gcc:$(tc-getCC):" \
-		-e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \
-		-e "/strip/ s:^:#:g" \
-		Makefile || die
-
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	# no autoconf
-	emake prefix="${D}"/usr || die
-}
-
-src_install () {
-	# yes the makefile is so dumb it can't even make it's own dirs
-	dodir /usr/bin
-	dodir /usr/$(get_libdir)/sc
-	dodir /usr/share/man/man1
-	emake install
-
-	sed -i -e "s:${D}::g" sc.1 || die
-	doman sc.1 psc.1
-
-	dodoc CHANGES README sc.doc psc.doc tutorial.sc
-	dodoc VMS_NOTES ${P}.lsm TODO SC.MACROS
-}
diff --git a/app-office/sc/sc-7.16-r2.ebuild b/app-office/sc/sc-7.16-r2.ebuild
index 81aadd2e238f..52b5a7888ace 100644
--- a/app-office/sc/sc-7.16-r2.ebuild
+++ b/app-office/sc/sc-7.16-r2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="Spreadsheet Calculator"
 SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${P}.tar.gz"
@@ -10,7 +11,7 @@ HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 COMMON_DEPEND="
 	>=sys-libs/ncurses-5.2