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 <indocomsoft@gmail.com>
Closes: https://bugs.gentoo.org/684816
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
index d18a1dd37f6d1ba7e387ddbfaa1ca0134c1e0878..803c9286f09a9a3ab58382333e5ffdddcc502d2c 100644 (file)
--- 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 c6f58edf0237e21cd910eb4f86e4c3f193487e95..ec653705b1a14b398e6efba7fb9894dfd15e5d88 100644 (file)
--- 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 c6f58edf0237e21cd910eb4f86e4c3f193487e95..ec653705b1a14b398e6efba7fb9894dfd15e5d88 100644 (file)
--- 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 c6f58edf0237e21cd910eb4f86e4c3f193487e95..ec653705b1a14b398e6efba7fb9894dfd15e5d88 100644 (file)
--- 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-* )