gentoo resync : 07.10.2018

3 files changed, 14 insertions, 8 deletions

diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 74cc65ea4645..9d825afa0e96 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -3,9 +3,9 @@ AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311
 AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
-AUX expect-5.45.4-examples.patch 807 BLAKE2B 7b102a0fc95324d7b2aae343edf1d5ecd914234d89e8d57f2c1cdb64e707b58969552ded0eacd17373de42aa7ab60ef32e4b0f41c389de93c15bcffbe52ffe2c SHA512 6a9d8b713c0c20b630d4c61373afde76924ac00b7057cab9b42c0a7f81bf9712006ef7f81e82523262a429b960cacf6dc7742c835617a69b0c248a2e13131f50
+AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
-EBUILD expect-5.45.4.ebuild 2179 BLAKE2B 1804f4383356a7a3e0e1f3d2120740d6fd44e9a043392be3925bd854e35f6fef8d89cc4c368dd68f7f7ebe525265514e14bd3ecc0afb8070e35469746379e90d SHA512 ee66f0c8d8c8cb69d022c2e02b06194a1e52c76874fd2fcc835550890c7c0cb100e27a99e06db7857cc9d056015d57f511c7399c712df52082374d1ed2aa8e9b
+EBUILD expect-5.45.4.ebuild 2339 BLAKE2B 4bbf3336ea71939b00a81752c41a6f7572841160a2caf7b51ced61390d22d1b836a9762cc2da7e78a0cdbde21e67a115a9a019417d1246ecb2db48c4bba3a68a SHA512 d990d458d1477c17ca197bffb05f564232960acb140dcdeaf9b79131b8d4c5d3af9cd58fa91ea25928f14b32b7ba9e337f83cbcc2104d439c9c6deadeedd595b
 EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
 MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index 7f5402663564..b6d1a0feefe2 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -72,6 +72,10 @@ src_install() {
 
 	if use doc ; then
 		docinto examples
+		echo dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
 		dodoc \
 			example/README \
 			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
diff --git a/dev-tcltk/expect/files/expect-5.45.4-examples.patch b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
index 10de8821a01a..cd631b30a5c1 100644
--- a/dev-tcltk/expect/files/expect-5.45.4-examples.patch
+++ b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
@@ -1,21 +1,23 @@
 --- a/Makefile.in	2018-09-26 15:59:09.049279363 +0200
 +++ b/Makefile.in	2018-09-26 16:00:00.514427553 +0200
-@@ -32,16 +32,12 @@
+@@ -32,15 +32,17 @@
  # SCRIPTS is a target. If this is a problem, just comment out the
  # SCRIPTS target itself.
  
 -SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
--	passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
--	tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
--	multixterm
 +SCRIPTS = unbuffer
++_SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
+ 	passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
+-	tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
++	tknewsbiff mkpasswd cryptdir decryptdir autoexpect \
+ 	multixterm
  
  # A couple of the scripts have man pages of their own.
  # You can delete these too if you don't want'em.
  
 -SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
--	passmass cryptdir decryptdir autoexpect multixterm
 +SCRIPTS_MANPAGES = unbuffer
++_SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
+ 	passmass cryptdir decryptdir autoexpect multixterm
  
  
- # allow us to handle null list gracefully, "end_of_list" should not exist