commit: ab15b7fa1819dfce3e4b55138922f25a5b8d3eee
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 13:42:27 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 21 20:56:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab15b7fa
dev-libs/expat: epatch->PATCHES=()
Also reformatted the patches to be -p1 applicable, and switched
eapply_user to default.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
dev-libs/expat/expat-2.2.1.ebuild | 11 +++++++----
dev-libs/expat/expat-2.2.4.ebuild | 2 +-
dev-libs/expat/expat-2.2.5.ebuild | 2 +-
dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 4 ++--
dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch | 4 ++--
dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 4 ++--
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/dev-libs/expat/expat-2.2.1.ebuild
b/dev-libs/expat/expat-2.2.1.ebuild
index 9a4ba03a1ee..ac06d60513e 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -16,11 +16,14 @@ 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 5ff41c1f875..fc3869969b4 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.4.ebuild
@@ -18,7 +18,7 @@ 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 e4888fba94b..62fe398a428 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -18,7 +18,7 @@ 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 a0eb60ce6cc..9bf9bfe4492 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 eba004843db..6ceb7d9993f 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 3f34d0d9853..ab680451d8e 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}])
