gentoo resync : 22.04.2018

7 files changed, 24 insertions, 24 deletions

diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 3ad03db12922..b05aff87084d 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,10 +1,10 @@
-AUX expat-2.2.1-gentoo-dash.patch 1346 BLAKE2B 975f26787495283ef79b93416cbf6faef3630844e3c2cd008a40275d5189bd4b46a9c074bcd29554cce8cd94284e1084754ca15193436b69b4ce840ad4918192 SHA512 692fe6f8c99bce93d883c8764c904561a32114c8e4908658b32b04911467d9b1348b99c6d3ada7cbc6f9c72f15732bd9617c114a8b6994c3dc300d970e0b5d81
-AUX expat-2.2.1-getrandom-detection.patch 807 BLAKE2B bcae37773ecc5b3e29841e4bb850acd6af76500dad12f9c8a5cf2dabf3539a2ceca302235b5315be57885b76fed432e1d3b6d8b2aeb4ae01406717912027fe1b SHA512 3399e097b66d9afc009fdc9f5fcdf8326f4b69dd72edf352b920e1ac1172e784aeb534ca4da256b2e30a276c6e4990820d5e48563fcac580f7a335ac80a8250b
-AUX expat-2.2.1-posix-shell.patch 1039 BLAKE2B 7f3eefc1a81def006063e4ddc299638a4b91bbdfd47883080631cb01acd39d92c5075a9760d1313988e334cba0fa3bac69a6440f34dada18623083eafcf2ce96 SHA512 7d8d293c90548ed6e622bdf7eff6ff3beda97ec9d7b0fea67fbf7c2b185575195325e26662e05886c9fcf4067aaa93533d05d48951c46e803a5215ca6c34b0c1
+AUX expat-2.2.1-gentoo-dash.patch 1334 BLAKE2B 87980af994bad94c9a339accef714903d63c187b66f430893363edd36105623197f9a3bd3ca98ce48bd30dd1bed413440b31ecd17a6b0190b7e6b93c20ae9ecd SHA512 af33e9708deff13d7bf1a8af732b3c171902d6044ca59bd63b3e10bfcc09328f141ad6022046b97eff53ed3e1a9b749f372db954567690a479ff92860b5cd7cc
+AUX expat-2.2.1-getrandom-detection.patch 795 BLAKE2B 278e3afd0f2b79ac1f528ebc06d56315e96e0d08ca6d49ae84747ca5a7124f209af189fd192b5632a6f4a82785f27838b8d7d5ee0427bba2acd467a63a68dafb SHA512 c0a918d48845c2270930ccf87411a89b60379db860c09d0bebe914cbd48f9c6b3941fa3b31b69ffaef4d754882b5d3b397a8e69352f354402a8aea29cfbe88ca
+AUX expat-2.2.1-posix-shell.patch 1027 BLAKE2B bfdeb67f4f41cfcf1db8bf4a9e0501789b35a8d1a47dd678877475e022810d5709bfff34ce6188df0608d30f280a341a1f47e825bb56ff43e60a4ed7fe2ab1d0 SHA512 9ec6056f5c86918bbd6f6017a29b73a26472cb0470437639845889068f6209d0dde12bbb37cade792525ce295944d60cd3dfe61d308896f2befabe28736a626f
 DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
 DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
-EBUILD expat-2.2.1.ebuild 2346 BLAKE2B 7a343c52553b838d76536142f7e67b78b02668c3a2efca8515f63ed6e9df5ce6f748228be4c6a3145487bbb2f7574df84bd3e374881169bdeba734a54e1c6195 SHA512 535d45f523a083cf3c3099ae912d3508a301a098239473add3ea6834e08fe386098346db810672038f361bab63b62bbc310a0710b9946546c154bc4dcd683be1
-EBUILD expat-2.2.4.ebuild 2538 BLAKE2B 9a758011bc642c6ef1c51661b0fe5289509e6e65fa19bbe337bf0758c6f00fc3b35191330477a4b2d69b828298cb796b754cb2c2a66729a902390b018a7933b5 SHA512 d5a54082586a67a06de13d5693ee1e2b9c604df4e021f9bb4fb936e6a413d6583f7ec16f1f9b4086cffbe29260e3acf968d376020ddbeb5a0a632312dfb7cb54
-EBUILD expat-2.2.5.ebuild 2595 BLAKE2B ec51e48d01b2587a9dfe98417b22577c5a152b5872e575774c6c5493d9c89221d6440dc30bb8286e068ff455ebba53dd36ac70a4789a93f86bf92137daa30c23 SHA512 b2bcc294095639fbb47a97e72c480ba47e54f9e51fab9477f3b04432b2a125646f1340a35911ab073a20e0d4dd74544f4863bf542b03f28faf1c99bd1ea5e9bc
+EBUILD expat-2.2.1.ebuild 2209 BLAKE2B f4910c2e5a6462c7c1859d2f20a2d9892c72572077c9e479851a47d49882f8ff578e399b40b93bb162e50052b0374ac7f632a02a6accdf509646cd6ee5e37bf1 SHA512 ea6413bb3948b72797acda79e186da6416ab0f95c5313391d158d4ddad549622f85fe0f69ec81811ed84a5c4497b63bd07feffaf964476bc64becfa66246a126
+EBUILD expat-2.2.4.ebuild 2409 BLAKE2B 1db61d230d3038095018a1f4a996ada84ca9f93df5b0f8de4bcfa258d4c8f0e56f00ba449ebed7c8e5c605856d28df2530f64c8f62b16b6463d6b756123bf793 SHA512 7d0ebe8c7ff822bec9908c5118eeee8a3145a9ecbb6986acb08806dce5134184706bf5c017ce766901671c7d733a1d59b700a3a889f62857726fdc38847a80a0
+EBUILD expat-2.2.5.ebuild 2466 BLAKE2B 5f4b6db129c491de37e2da970e2143c69f12a830a1aff5125d8b149f7ea3a668bc98df055c1999363d0b968cafc8f3528a6f0d8fcb0bdc02567dbf892de3d232 SHA512 526292962f0f8a1ae6032061ff3f8b6d681ca128692726734e81686e52e3f1113810640bb2f5f48aba89824731689cac5a4345804ee3c6714697986a2ff95e7a
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild
index ac705fc827fa..ac06d60513e4 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -12,16 +12,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( AUTHORS Changes README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-getrandom-detection.patch
+	"${FILESDIR}"/${P}-posix-shell.patch
+	"${FILESDIR}"/${P}-gentoo-dash.patch  # bug 622360
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-getrandom-detection.patch
-	epatch "${FILESDIR}"/${P}-posix-shell.patch
-	epatch "${FILESDIR}"/${P}-gentoo-dash.patch  # bug 622360
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild
index 36b9284d2a6b..fc3869969b43 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.4.ebuild
@@ -13,13 +13,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( README.md )
 
 src_prepare() {
-	eapply_user
+	default
 
 	# fix interpreter to be a recent/good shell
 	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index e480a0c3af75..62fe398a4281 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -13,13 +13,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( README.md )
 
 src_prepare() {
-	eapply_user
+	default
 
 	# fix interpreter to be a recent/good shell
 	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
index a0eb60ce6cc0..9bf9bfe44929 100644
--- a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
+++ b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
@@ -10,8 +10,8 @@ Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer
 
 diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh
 index a70e0fb..91e5c64 100755
---- a/expat/conftools/get-version.sh
-+++ b/expat/conftools/get-version.sh
+--- a/conftools/get-version.sh
++++ b/conftools/get-version.sh
 @@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`"
  MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
  MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
index eba004843db6..6ceb7d9993fc 100644
--- a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
+++ b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
@@ -11,8 +11,8 @@ There is no such thing but we need to link (not just compile) to realize.
 
 diff --git a/expat/configure.ac b/expat/configure.ac
 index 1357c9a..444c002 100644
---- a/expat/configure.ac
-+++ b/expat/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
  
  
diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
index 3f34d0d9853b..ab680451d8e0 100644
--- a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
+++ b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
@@ -11,8 +11,8 @@ It doesn't matter in bash, but some other sh don't like it, so it's a portabilit
 
 diff --git a/expat/configure.ac b/expat/configure.ac
 index e48c32e..1357c9a 100644
---- a/expat/configure.ac
-+++ b/expat/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
      [Do not retain context around the current parse point]),
    [enable_xml_context=${enableval}])