gentoo resync : 14.04.2018

3 files changed, 9 insertions, 20 deletions

diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index e042760c60a4..3552f5154dc9 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,6 +1,5 @@
-AUX ffcall-make-jN.patch 374 BLAKE2B 742c2a5ce8372090b0e0801183b0975eec407ad4d38a1e38a463e5acfb86c7c0020a955d0cbf9ea13095a130aa724fbe036df164d46313cdf1f1bd5cf4273e58 SHA512 2b5407bdfccb5395b499f725fd0c538ecb89572189bcdfa9dc196e3329cd6c2490b5b51f0c591fde86b8cd8d55cfbdbf916a3c61112a5d8a3888f2a345501123
-DIST libffcall-1.13.tar.gz 985185 BLAKE2B 78d9b9f046185a9a658ed2864167c64e373359e709cde7abc9360b21959c015b201423b46b8048120b98edfd0047dd20184c5f543c7d1d33a7ffad983036c043 SHA512 c059fa89eb3e85bad22d045de074bfc88fae42454821e10905ffd67209b6e6ea44eeab120b869696f77b816aacb9a5af3e4b51c640512e876df1b6da6f296bd4
 DIST libffcall-2.0.tar.gz 938605 BLAKE2B 1e6fcae8f1dcaad52ca84d0dcf97f8dde5bb8153244bbb9047dbab5f6a1dade0a00f149507e6bb14225369a7081cadb069d23c8bc7cdcfaec937d7b9d47d08c1 SHA512 d75aa1df97b14692a9137745bae5b24c4d8f739cb1c7f854e7ed47e4a77a49759122abd6b0e445efa56381f47932c13cd21a154b2783649afb9c7a39e73fea04
-EBUILD ffcall-1.13.ebuild 1485 BLAKE2B 776e5bd03ca067fb09f24260702dbc82224da929ccba41b2b89b3d9d7234b2feb5c1791527b2de57c6b26305f1853b33ffb2a6c242a01c1edbbbad6e97970876 SHA512 cd06188825a8ceaa04adca8bb532b429faf7d2c25a66c09e51a1ebbe5f9b204bbb9fa470363044e795fb9aed9c135b31e05456fe613da181b41618dfa828c69d
+DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 EBUILD ffcall-2.0.ebuild 1486 BLAKE2B 5d10f52e50730d59a1c6923fc04220e9335780279ff38568109585dd190ae26294a60ab70442f0102c44b230629337a1126ce11d7890e374039e383743891b50 SHA512 b3f368154157db13f660a1aa9cb1f7dca813c8d2921f1038b456cf3c15c79a9752eeb219dafc2753ba11e4891e1a47fd66692c76a8d25290b1f2c51102d07eb3
+EBUILD ffcall-2.1.ebuild 1523 BLAKE2B dd4e60e71b5b812f6a818d3acce35d0f4490994113c0d4ed7165512fc8213105b710dbe5e5c212f50aabf17e07576d6fe37f8a9d137707bdf927fd4ce762cfa7 SHA512 34a9f2ab5a6b508119c657175ea64cdeb1c90e1c2b36e4ac10ec9ab7778b231bf724c14e568f70b95c3ae0c26b0fecc1f8944644d27f005f4e7545fb9e437398
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-1.13.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index 127ea9cd215e..b4762103c805 100644
--- a/dev-libs/ffcall/ffcall-1.13.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 MY_PV="libffcall-${PV}"
 
-DESCRIPTION="foreign function call libraries"
+DESCRIPTION="Build foreign function call interfaces in embedded interpreter"
 HOMEPAGE="https://www.gnu.org/software/libffcall/"
 SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 
@@ -25,8 +25,6 @@ DEPEND=""
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-make-jN.patch
-
 	# The build system is a strange mix of autogenerated
 	# files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly.
 	# We are adding them consistently here and a bit over the top:
@@ -53,6 +51,11 @@ src_configure() {
 		--disable-static
 }
 
+src_compile() {
+	# TODO. Remove -j1
+	emake -j1
+}
+
 src_install() {
 	dodoc NEWS README
 	dodir /usr/share/man
diff --git a/dev-libs/ffcall/files/ffcall-make-jN.patch b/dev-libs/ffcall/files/ffcall-make-jN.patch
deleted file mode 100644
index 98f4c497504e..000000000000
--- a/dev-libs/ffcall/files/ffcall-make-jN.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ffcall-1.10/callback/Makefile.in~  2003-10-01 21:46:19.000000000 +0200
-+++ ffcall-1.10/callback/Makefile.in   2007-12-18 21:10:51.302118000 +0100
-@@ -51,6 +51,10 @@
- all-subdirs : force
-       cd @subdir@; $(MAKE) all
- 
-+vacall_r/libvacall.la: all-subdirs
-+
-+trampoline_r/libtrampoline.la: all-subdirs
-+
- callback.h :
-       $(LN_S) $(srcdir)/callback.h.in callback.h
-