gentoo resync : 15.10.2017

4 files changed, 6 insertions, 8 deletions

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index cfb73a67f2d4..b0fd6356f326 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -8,7 +8,7 @@ EBUILD eix-0.32.4.ebuild 2360 SHA256 26b9b757c3e31bd1d7b543e885112645d592e6a823e
 EBUILD eix-0.32.5-r1.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
 EBUILD eix-0.32.5.ebuild 2454 SHA256 affb1e42e44c972dd070af11bbf9a68394e6c8fe8f3d5869b764978d3e00a6e5 SHA512 248caf260d7f06375eca2a60debc9427326623496a90c321a5f33b141b247c2d660345dfd3aa60473003e02d9e86ba78f14c91c19576f742d700aa7f7dd207c0 WHIRLPOOL 33c8f33093b4c6268f50e044e5ac987cad5b2654a6f2b65edbdb1c13f9b1ab0d384565491bc28a5a59b611b686257789810896818f57d743954f70f73552ced9
 EBUILD eix-0.32.9.ebuild 2937 SHA256 0adbf6b21cc3217c2cf567e9d06ab4a6cd0217fce09ca37ffceaa7ae9f5e64c3 SHA512 6851d0e1708beffaec5e0685d885a0d3d46e93b9bee25a291fb26b6c6837a8003e34c41904218f3af44e50f0fe37c99de4802c0a7909b615264aa3e079cbf1ff WHIRLPOOL e0e7c24899162488df59f74179eb142012968dbca54e7864ff803f3a3b66cb47d6a69c13bf77b029d476f528666e59cc55eaabfbf5c48700dc61003129fed449
-EBUILD eix-0.33.0.ebuild 2949 SHA256 008c1e3ecce8d8034f2b25ad24e3498c166c365c777eeb2de20fad6ebf0080ac SHA512 fdd98d866bafe7c64feecfd4dae28eac41bf4038e2e4db7bfd2b7bb5de2ec33a822df14f73e1bbbc84ba3e0d0a22e8592a2fa607f552d36c9267caeb227e2da8 WHIRLPOOL 0936e2a483dd6bf05097a5124826580af4684c5dcd300fd10b19656ad406fd24c07ace2b2da776076ca8c488f465f74a895386ec2f4c8a4bfec5759013b9ff76
+EBUILD eix-0.33.0-r1.ebuild 2875 SHA256 5b5f9dbfdae314c5104a658b389bd4e2e2026e9dfc3ce2ee7d9407f801c5fe74 SHA512 83747fb3c36f165cf989edc73c00cb6905a002218eefd1058099580aa53ab7819d7765af6626725beef9b32915dafb72fd4b3e7b5e207e434e3457a7f82fadb1 WHIRLPOOL adc0c4340237ac758a41787a81a9fd073025a722563e0ca454ad53c25c6c52b676cf80410b6e6d99d0527b459566b4ff7204c2c1b06aa3bea7705a2847cab82e
 MISC ChangeLog 9770 SHA256 4b50e3176529311b7210564458969cfe7e9bcccbb476d012507a1b01dcce5d6c SHA512 fb26b4781f4a4af63619763afd097566190545b48a81e737e58ea7aab41f12b4bf8e9e713f4302bea29f3779626cf172f5f3713546a51c39ae14f52faef84da5 WHIRLPOOL c3b7f92c57f9b21cf095f867406895c29de2e5f3ab72a4afeb53994d2a75e3c72ab27239b45fa4fc91373f9bdd5e1c8968ec53fa9f1870932992a75bd51424e6
 MISC ChangeLog-2015 62879 SHA256 dd3e3360c5a6ff69ddc4ebd0263adcbde4b4c72d130ba57b2ae304af40f62c09 SHA512 d6f1888e8cc75bccd6609c062689c64d978458b4bd9056a9297016d1419752f65cc19f7c175d0d0ffe4d7ddfbd3bb22b668717f073525a18cd6c136f9e000f46 WHIRLPOOL 4bb43b05071475173f9bc3afa4d7bfef3ad434c0a8ae9de21d8e9aa78272730c83dc21789aecaf886491aa1c5dbcd93b4a5213b6c83b7124b823225bd4b17c10
 MISC metadata.xml 933 SHA256 f46c9806d9a2a4dffe59f1340a0253a56118c509c5338a6d2c2c4bebf51b1db0 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550 WHIRLPOOL e5b8206377b7f671b9e65f47e67d91774d667cb93e42336f5fe6cfa5e1f302a5ba7537e96bb40b96a6926bfeec2f075e1b42f53d7d6e938f5702ddb627e3ea57
diff --git a/app-portage/eix/eix-0.33.0.ebuild b/app-portage/eix/eix-0.33.0-r1.ebuild
index ecc62a0a6c0d..bd9217a151fd 100644
--- a/app-portage/eix/eix-0.33.0.ebuild
+++ b/app-portage/eix/eix-0.33.0-r1.ebuild
@@ -39,14 +39,14 @@ src_prepare() {
 	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
 		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
 		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
-		$(use_enable debug paranoic-assertsasserts)
+		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
 		$(use_with doc extra-doc)
 		$(use_with sqlite)
@@ -85,9 +85,7 @@ src_install() {
 	dobashcomp bash/eix
 	systemd_dotmpfilesd tmpfiles.d/eix.conf
 
-	insinto /usr/share/${PN}
-	doins "${ED}"/usr/bin/eix-functions.sh
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
 	keepdir /var/cache/eix
 }
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index de3685e80117..7974c74984f9 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,7 +6,7 @@ DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b95
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
 EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
 EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
-EBUILD portage-utils-0.64.ebuild 1095 SHA256 370cf1d787311040e3d0aa5be13d783d0ef2bc02acbcd74dcc63a5b63f07f185 SHA512 24baa7729a7371f39ceafde863d19789a17654e982107ac0dd9392bab7d770328db4b94c7e3031ff251766ddd5b95e9d71fab3171fca0bc4fda05223ce3eee67 WHIRLPOOL 00f861a61e06fff5fa0f6a5479c7f437f17719e3e178812ebf7bc90de4e2f418f1954ec7956bb80f25431e9f05cc55f6dd05022740753afe0454df69fd3ad4fc
+EBUILD portage-utils-0.64.ebuild 1094 SHA256 495e54fb94738ce605ccdcdff58d28024338228e8c2512b60623091a7a43646c SHA512 bdbd5bf3c037f4d07ae7734438141f7c84b4a8de45f1a7c1bec3c8a76a04a4f4beb18856ac74aa9ad266a592e1f76f2cbc0d326c37a307ce0dde93ca1af70a94 WHIRLPOOL 25ab67151c102e9a75fda3732237245d532a5c02fd388f9a42bfeea5020f4205047ad481b08004208ba1902bbd3c8332c65e4f16726e4f4eb232f0d7c3df04cd
 MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
 MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
 MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 59bd71fb220f..25e6dff758d4 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"