From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94EEE138334 for ; Wed, 1 May 2019 09:40:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C62C6E08F0; Wed, 1 May 2019 09:40:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B4C9E08F0 for ; Wed, 1 May 2019 09:40:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3BE434319C for ; Wed, 1 May 2019 09:40:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52C3A567 for ; Wed, 1 May 2019 09:40:54 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1556703645.c7d77d4129e3715eee8ee8fae1bf42bd7744ac19.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/erlang/erlang-21.1.1.ebuild dev-lang/erlang/erlang-21.2.6.ebuild dev-lang/erlang/erlang-21.2.7.ebuild dev-lang/erlang/erlang-21.3.ebuild X-VCS-Directories: dev-lang/erlang/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: c7d77d4129e3715eee8ee8fae1bf42bd7744ac19 X-VCS-Branch: master Date: Wed, 1 May 2019 09:40:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1b9013e-6773-4862-95b3-e24b75bedfa6 X-Archives-Hash: ecdc1fc4dc8e03ccaca728ed786a77da commit: c7d77d4129e3715eee8ee8fae1bf42bd7744ac19 Author: Julius Putra Tanu Setiaji gmail com> AuthorDate: Wed May 1 09:08:29 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed May 1 09:40:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d77d41 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 gmail.com> Closes: https://bugs.gentoo.org/684816 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Fabian Groffen gentoo.org> 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 d18a1dd37f6..803c9286f09 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 c6f58edf023..ec653705b1a 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 c6f58edf023..ec653705b1a 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 c6f58edf023..ec653705b1a 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-* )