gentoo resync : 10.04.2018

8 files changed, 14 insertions, 143 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 85e0885c1b89..98d2f0cdfb85 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index 42eb62d3258f..f9f262071bb7 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -2,6 +2,6 @@ DIST guile-lib-0.1.9.tar.gz 499394 BLAKE2B 1a8fcd30d78250c454c709f5dbceaee9a8e3e
 DIST guile-lib-0.2.4.tar.gz 421960 BLAKE2B b1ce073d6deb1236209653dc65ec6667e33dd670493b11328ab5f6b260e8332673ff9856e4212952b4be4986c656169a830d403aca239bef145c6fe50f3b5d30 SHA512 d5744f7f99bf566c569fdb06bf51b8f74543930cbe120c392d111b06ac930afa15008af44765331db0542affc07afb3016b60dc35be612b99f79264cd07b8f5e
 DIST guile-lib-0.2.5.1.tar.gz 424124 BLAKE2B 36aaf66f6a1550e24101547203865fb73f60ebe04d04e13a8244d81cd91510288f00f7c77636b86fd4a5c49f6157e187d623eb26d4ad361e7a284d9dd2f017f0 SHA512 500f0a5c973af1594402a4d564be8a6e559f575e10de35368cbda2d24d73c9b781b06b4a61433cf2609f91a7548903dc01718d70796e48a49c6d50988227946a
 EBUILD guile-lib-0.1.9.ebuild 571 BLAKE2B 3cc28cc2e41daf45f9c97e1cb577ba04536f85c6bc5a8cfde62e743c55d1fe8a52c6f8abb8ae0323401e68da7f979407e3cd9bba27fe1320cdcf0e14eb7c2437 SHA512 5e8a86a54f9e5ad3ea1cffc74ea901d1a9481181f9915e23fa539c7e6d6a5957a69ea82ce84b10d5a663df18279623750704aa89902f6aa8501b1f04ccd07fbf
-EBUILD guile-lib-0.2.4.ebuild 584 BLAKE2B 3f325c7f82b195bbb0f56a9de22accd58c639cdaaa6b9abbdfcf0e5a85b238f05cf17a0ce9bc2cb87efa8d5d31d55b3e72dd022953fd974f898fcae439d72bd0 SHA512 fe217f67edf6fe6c7e9442d65a3a310d3ac3ad9aff5fec5e23882248342c7ce7c25aa4be09e5a29da650bb6e9ba9295f61215dddd30b8ca9088f4323736c798e
-EBUILD guile-lib-0.2.5.1.ebuild 577 BLAKE2B 1769d6bc9e4e6001a5923c46dd5536b5059d3f9c13f1e7040cd1f31ee511bbd3e956c11d0a5391de9c823229928a28678c158c01753549a8c0b96a85f12a2182 SHA512 e3d83947a3a8222044f5978bd558e51ec53617479e563390bb5aef248fe7a150c72a48ba035a8dddf406951fdb66db7f2702e70cb700c4c8c285d0e45d39a1dc
+EBUILD guile-lib-0.2.4.ebuild 582 BLAKE2B 8feca8daff95f0c70be530346f0c3ffdf425aa39bbee93a6cf717d6d58187002ea3902a5188b3e51d415368b31cec46399ca86a3dd3d3840829930a457e6836d SHA512 2fed68c2fb480b8c95ffa7a77902a814608f5511d3d4045ddd30af179bbd7fbd30a4389277ad1f18acca6d23deb6c541920d97279000f9f97778cebb6d38632b
+EBUILD guile-lib-0.2.5.1.ebuild 575 BLAKE2B 1d624c4f777570c724896ee8ca193db4e48d744449572c50b5c03c5495826276266d658423fc765e89979e352b9a1228b6434ea158009e3061150012904e652d SHA512 91162bc57fe42ffefc965315fe09962d0bb0592cd15ad58cadea7def38d44645ce1fcbd10211215a92dcda366ae9092850071ff93b1ecf123f506cff022a7e96
 MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
index 157a36687c8a..564aa43dbb1f 100644
--- a/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
@@ -11,12 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+RESTRICT="strip"
 
 RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
 DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
 
-STRIP_MASK="*.go"
-
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 }
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
index 2a330cfcbb8b..5faeeed6cc6a 100644
--- a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
@@ -11,12 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+RESTRICT="strip"
 
 RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
 DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
 
-STRIP_MASK="*.go"
-
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 }
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 99a5e7e537c4..783335d8664b 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -19,5 +19,5 @@ DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d
 EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
 EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
 EBUILD guile-2.0.14-r3.ebuild 2248 BLAKE2B 007df6973339b71f4a267cd437489ea59db77024b4c1844034ff40d1f56c7ade8833d41477a2889c526188f2ea2637382965ff3126e0762865dc61caea3ff999 SHA512 d291aaaa06c1f93172b490f60d97927dbfe433092d7238fe9811fea273a97abec03d0748ff789841ce12a57663391a6ccd9d7fcb86e44d6c3a9bf139e83904db
-EBUILD guile-2.2.3.ebuild 2054 BLAKE2B cd3af6f083dbd96eb50db8e65e1c6041bc18643207ef35fdbbd05f3ae9541672138f55c0c4001d9c4bf6567035c9c55dcaf8d2915adcb498c8c7d4aaf98dc30f SHA512 d3f1f1e2165e7c2faddd35e1b1e6e8bae693714c1f47cee9db0fc1bc726d56baab4612401e2f20784c7fea9043b252b0289463e3f754d920cc08266e797ab9f5
+EBUILD guile-2.2.3.ebuild 2016 BLAKE2B 2ae8537a627d4880c93f7a317de57c001685bb1cdc7a07aed1c2b81e01b11b029ee364b0ccc28893ce23236ad7a48fdc1aec8738a7ffc5bf10ac5f77ab867393 SHA512 ddeb74589c283bcd2d767c2670ec57f9d67477f3dbdbb8dcc40dfa8c68c5de7f73616f03e979b2292e91cff4fb05e89b33f319e42387006a120d2199054a7da1
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index e2fad703dca4..895f6d9e02bc 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit flag-o-matic
 
+MAJOR="2.2"
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
 LICENSE="LGPL-3+"
+SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
-# emacs useflag removal not working
-
-# workaround for bug 596322
-REQUIRED_USE="regex"
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
 
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
@@ -29,13 +31,8 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	sys-devel/gettext"
 
-SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-MAJOR="2.2"
-STRIP_MASK="*.go"
-
-DOCS=( GUILE-VERSION HACKING README )
-
 PATCHES=( "${FILESDIR}/${P}-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
 
 src_configure() {
 	# see bug #178499
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index c0527c5d5088..381389b0ead3 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -1,5 +1,4 @@
 AUX 50slib 39 BLAKE2B a7e221f173cfc2b24c72f047130e6b4c289533a22dc7d59fca49a147ed5c9290935f852e8425ac95942da2e8f135713dbd999d6e96521e35c9bce9cf8b6458d2 SHA512 e454fbcd8e4516b363a94055a0dde09f3cd5fa61babb0c6510ba6dcb50ddc123bb89ec8657171cc1d05fa5ebf5a1691b9425d3397c88617c9d2288770ff8a29b
-AUX slib-3.2.2-fix-texinfo.awk 1615 BLAKE2B 009e928700eaa5cd13dae27af10095cc10eabf4379e962f3c3f77c566a70fd7ec086b4713d5629941169d40c62527d55d63a977d5669a15b91e3ca9183fe558a SHA512 793b50b9678e5d29465e29fc00348df0357310cb10b5a9446397a11f21c30d885a6bbc92577ebd7c9ae82ac07081baa08692a80c4d0b0738020f01c57a7e128e
 AUX slib-3.2.5-fix-makefile-guile.patch 882 BLAKE2B 6e9c80b476cafa24477aae5b30e8c35f116cfbd0261f06b15672e39cc94e2ef6cb116104a41e5c0f1ebcb887664d9f43ec6c5b21ab3286d5a33c56d081ca9a4b SHA512 74997578edd5472f084a3b899c4e11b67432a4776bce6a19cbd4300316bf413f38374711a9a5cd3c10cd6cac01cb6d337d6f2ad18236bc4747c0bccf88948e3a
 AUX slib-3.2.5-fix-paths.patch 1627 BLAKE2B bea0c823ca1f4e006953128cb5fe2886f5e84efbcf2d1ee32c801524d3bbbaf65899853c476697b501673501b112e7bd9382f7e372d27745cd190d3fa66a0bd4 SHA512 bdd667f20ca0ef57707a4df379186b58ef5ffab38e61a7e8e4ef697d7a90ebbafa8e4ca1f887d87520290656f2445fe1a9f4bd4e22634587908f70059dde0f30
 DIST slib-3b5.tar.gz 987735 BLAKE2B ad1e6e43885a16277d01f37582db7de068f21da5e10b23e034f5487ac8748303dcc9c12615884ee047dce7c246203f1d0d1cc375794371eae6854199d720c209 SHA512 e5d1210b70cd882cd5e810b3c4102d6060ec82fb2093f472bf31b597f6273e0a02f4d35a82c4b5c8cdc3f8b2c7b9e498fa3e35c7f265fa864cd9dc50e7a874c8
diff --git a/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk b/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk
deleted file mode 100644
index 6bc3ce8e177b..000000000000
--- a/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk
+++ /dev/null
@@ -1,123 +0,0 @@
-# Fixes Texinfo input to compile with Texinfo 5 or later
-#
-# Written by Sebastian Pipping <sebastian@pipping.org>
-# Licensed under CC0 1.0 Universal Public Domain Dedication
-# https://creativecommons.org/publicdomain/zero/1.0/
-#
-# Version 0_p20150813_p0418
-
-BEGIN {
-	inside_deffn = 0
-	inside_defmac = 0
-	inside_defop = 0
-	inside_deftp = 0
-	inside_defun = 0
-}
-
-/^@deffn / {
-	if (inside_deffn) {
-		print "@end deffn"
-	}
-	inside_deffn = 1
-}
-
-/^@deffnx / {
-	if (inside_deffn) {
-		print "@end deffn"
-	}
-	sub(/^@deffnx/, "@deffn")
-	inside_deffn = 1
-}
-
-/^@defmac / {
-	if (inside_defmac) {
-		print "@end defmac"
-	}
-	inside_defmac = 1
-}
-
-/^@defmacx / {
-	if (inside_defmac) {
-		print "@end defmac"
-	}
-	sub(/^@defmacx/, "@defmac")
-	inside_defmac = 1
-}
-
-/^@defop / {
-	if (inside_defop) {
-		print "@end defop"
-	}
-	inside_defop = 1
-}
-
-/^@defopx / {
-	if (inside_defop) {
-		print "@end defop"
-	}
-	sub(/^@defopx/, "@defop")
-	inside_defop = 1
-}
-
-/^@deftp / {
-	if (inside_deftp) {
-		print "@end deftp"
-	}
-	inside_deftp = 1
-}
-
-/^@deftpx / {
-	if (inside_deftp) {
-		print "@end deftp"
-	}
-	sub(/^@deftpx/, "@deftp")
-	inside_deftp = 1
-}
-
-/^@defun / {
-	if (inside_defun) {
-		print "@end defun"
-	}
-	inside_defun = 1
-}
-
-/^@defunx / {
-	if (inside_defun) {
-		print "@end defun"
-	}
-	sub(/^@defunx/, "@defun")
-	inside_defun = 1
-}
-
-/^@end deffn/ {
-	inside_deffn = 0
-}
-
-/^@end defmac/ {
-	inside_defmac = 0
-}
-
-/^@end defop/ {
-	inside_defop = 0
-}
-
-/^@end deftp/ {
-	inside_deftp = 0
-}
-
-/^@end defun/ {
-	inside_defun = 0
-}
-
-/^@subsubsection/ {
-	if (inside_deffn) {
-		print "@end deffn"
-		print $0
-		print "@deffn {Dummy} Dummy"
-		next
-	}
-}
-
-{
-	print
-}