From c7d77d4129e3715eee8ee8fae1bf42bd7744ac19 Mon Sep 17 00:00:00 2001 From: Julius Putra Tanu Setiaji Date: Wed, 1 May 2019 09:08:29 +0000 Subject: [PATCH] dev-lang/erlang: Fix based on old ebuild files * Change ${ED} to ${D} as emake INSTALL_PREFIX as in the old ebuild * Remove empty ssl-rpath in econfigure, and re-add the path to OpenSSL library in "use_with ssl" Signed-off-by: Julius Putra Tanu Setiaji Closes: https://bugs.gentoo.org/684816 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Fabian Groffen --- dev-lang/erlang/erlang-21.1.1.ebuild | 5 ++--- dev-lang/erlang/erlang-21.2.6.ebuild | 5 ++--- dev-lang/erlang/erlang-21.2.7.ebuild | 5 ++--- dev-lang/erlang/erlang-21.3.ebuild | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild index d18a1dd37f6d..803c9286f09a 100644 --- a/dev-lang/erlang/erlang-21.1.1.ebuild +++ b/dev-lang/erlang/erlang-21.1.1.ebuild @@ -70,8 +70,7 @@ src_configure() { $(use_with java javac) $(use_with odbc) $(use_enable sctp) - $(use_with ssl) - $(usex ssl "--with-ssl-rpath" "") + $(use_with ssl ssl "${EPREFIX}"/usr) $(use_enable ssl dynamic-ssl-lib) $(use_enable systemd) $(use_enable pgo) @@ -113,7 +112,7 @@ src_install() { [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - emake INSTALL_PREFIX="${ED}" install + emake INSTALL_PREFIX="${D}" install if use doc ; then local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) diff --git a/dev-lang/erlang/erlang-21.2.6.ebuild b/dev-lang/erlang/erlang-21.2.6.ebuild index c6f58edf0237..ec653705b1a1 100644 --- a/dev-lang/erlang/erlang-21.2.6.ebuild +++ b/dev-lang/erlang/erlang-21.2.6.ebuild @@ -70,8 +70,7 @@ src_configure() { $(use_with java javac) $(use_with odbc) $(use_enable sctp) - $(use_with ssl) - $(usex ssl "--with-ssl-rpath" "") + $(use_with ssl ssl "${EPREFIX}"/usr) $(use_enable ssl dynamic-ssl-lib) $(use_enable systemd) $(use_enable pgo) @@ -113,7 +112,7 @@ src_install() { [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - emake INSTALL_PREFIX="${ED}" install + emake INSTALL_PREFIX="${D}" install if use doc ; then local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) diff --git a/dev-lang/erlang/erlang-21.2.7.ebuild b/dev-lang/erlang/erlang-21.2.7.ebuild index c6f58edf0237..ec653705b1a1 100644 --- a/dev-lang/erlang/erlang-21.2.7.ebuild +++ b/dev-lang/erlang/erlang-21.2.7.ebuild @@ -70,8 +70,7 @@ src_configure() { $(use_with java javac) $(use_with odbc) $(use_enable sctp) - $(use_with ssl) - $(usex ssl "--with-ssl-rpath" "") + $(use_with ssl ssl "${EPREFIX}"/usr) $(use_enable ssl dynamic-ssl-lib) $(use_enable systemd) $(use_enable pgo) @@ -113,7 +112,7 @@ src_install() { [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - emake INSTALL_PREFIX="${ED}" install + emake INSTALL_PREFIX="${D}" install if use doc ; then local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) diff --git a/dev-lang/erlang/erlang-21.3.ebuild b/dev-lang/erlang/erlang-21.3.ebuild index c6f58edf0237..ec653705b1a1 100644 --- a/dev-lang/erlang/erlang-21.3.ebuild +++ b/dev-lang/erlang/erlang-21.3.ebuild @@ -70,8 +70,7 @@ src_configure() { $(use_with java javac) $(use_with odbc) $(use_enable sctp) - $(use_with ssl) - $(usex ssl "--with-ssl-rpath" "") + $(use_with ssl ssl "${EPREFIX}"/usr) $(use_enable ssl dynamic-ssl-lib) $(use_enable systemd) $(use_enable pgo) @@ -113,7 +112,7 @@ src_install() { [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - emake INSTALL_PREFIX="${ED}" install + emake INSTALL_PREFIX="${D}" install if use doc ; then local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) -- 2.26.2