gentoo resync : 16.06.2018

8 files changed, 9 insertions, 9 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 6fcd554da617..0abed37ea1d8 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index fd644f974eae..386f97068f47 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,6 @@
 AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5
-EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B a33e3fe51cca9af22fe31c9ad35e925cbcd0bd821a16c5ae1341e8f527ff36d4d4e88841a02b65fcc22fac6fbd5b54518d72e414a48dd10a792dcaad603ec0c8 SHA512 545b7db63bf0409c092d45ef7f5478db11209c94096ff18d48aaecc66ea855653ce17c0dd8eee692dc141bd1250d2ed8cb4e27f22dbf0dffa4845690a9216f4e
-EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B 98fcba2d7b6b879e0446c56bf380b863b9862456568b6d674260a89077bec082af9c7d792938f3550ff05ea7ff5adb4a35f74e4664a8798f2b0812e320e377c7 SHA512 1d2994b0c2b5f3eb6112ffd9ff4f51a3e8d21a7ce99f119b9e00ec1b4b86960e767860d1ec8322f3f85505ce4d55dec0451a5c71d1fd9bd673ba9acec556d75d
+EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3
+EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B c9bd80c89361bf855487e92303476fe1d450314baeb860571408a71d87e23c6fde27f6e856da8baccce2f1655007e890a69150e9bf8a227af554004660726648 SHA512 205479dc6f9cc89254e1c1bd80578549a2817d4a3b89b1139469fd5412c81468d8750ce2bd11d43d2bfdbda132d722c2dd49b4b2f2793ff2d17756c31ef2ff53
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild b/games-strategy/freeciv/freeciv-2.5.11.ebuild
index d2e9a55ac115..149823db3192 100644
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -53,7 +53,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!dedicated? (
-		x11-proto/xextproto
+		x11-base/xorg-proto
 		nls? ( sys-devel/gettext )
 	)"
 
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
index 85687658671c..ceb9ae038ec1 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
@@ -54,7 +54,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!dedicated? (
-		x11-proto/xextproto
+		x11-base/xorg-proto
 		nls? ( sys-devel/gettext )
 	)"
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 733d5525023b..b4fb5a65e35e 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,6 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
-EBUILD wesnoth-1.14.1-r1.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f
+DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413 SHA512 57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa
 EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
+EBUILD wesnoth-1.14.3.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
index 5a1f6c5af2e9..27cde05f1ad0 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
@@ -100,7 +100,7 @@ src_configure() {
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_OMP="$(usex openmp)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
 	cmake-utils_src_configure
 }
diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
index 1cfcb4e99119..3ced68c2c9b2 100644
--- a/games-strategy/xbattleai/Manifest
+++ b/games-strategy/xbattleai/Manifest
@@ -1,4 +1,4 @@
 AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076
 DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18
-EBUILD xbattleai-1.2.2-r2.ebuild 986 BLAKE2B 8ef7e517a47d51c402fd7b6191ed479d25c646ba022fda8d0cb3a36b58ae426df8ec39f4311ec6ee0a1d397602559e31619bb6b8f1da2c642ba23f5e0e791ad3 SHA512 550ac98cf83017990f98e77b6784c64df01a798cfe9460f6a0a2be6bceb410dfd38a08efd614f956a6b517924da9ffd2e71ae2db20533bb3f9b1c9a87d75bfc6
+EBUILD xbattleai-1.2.2-r2.ebuild 989 BLAKE2B 483226fc6c987f27424b9b211049cde75bc2097bd65b56d7cdba96cbad66ea881bafda0c633b87ea7dd1e230efdab8735bbe68b6e9e489b39e0a78ded1389f75 SHA512 60ecbc9efe6394b2527d4d7dda9ea767fd8818e51a5942f5e2661b00997ef78d2a46b7bc75b38f7d3f9061f448603ccded22e35e430862c1d4fc9cb3369d30a7
 MISC metadata.xml 1356 BLAKE2B 13ecdee27af4359fa0052f3db53c55243a92de5fb9419272f8f97cb576ebbb8bdc04734bb10b72088e6ba31ea6ec9d32c129fb6704f037d30bd41f2a0b81db96 SHA512 fca551005a6b3e52d30e6a53b82e8d961debba3654a4e4f99e8cd23818a15bf4adfbcc1ffbd19cbe892c0118e5b24a5e83846ab7d72f8613c2e02cd58327cf7f
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
index 119e643d3faf..e7b53bcc541e 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/imake
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sandbox.patch