From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [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 4DC4D138335 for ; Sun, 27 Jan 2019 11:06:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93311E0FDC; Sun, 27 Jan 2019 11:05:59 +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 54A2BE0FDC for ; Sun, 27 Jan 2019 11:05:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C0580335D57 for ; Sun, 27 Jan 2019 11:05:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0972537 for ; Sun, 27 Jan 2019 11:05:54 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1548587135.fb7ab97a42fcee73444a5c81465b8be209bf4e2b.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/erlang/Manifest dev-lang/erlang/erlang-20.3.8.ebuild dev-lang/erlang/erlang-21.1.ebuild X-VCS-Directories: dev-lang/erlang/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: fb7ab97a42fcee73444a5c81465b8be209bf4e2b X-VCS-Branch: master Date: Sun, 27 Jan 2019 11:05: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: 20419873-9974-4532-a9bc-2ce931f5eeaf X-Archives-Hash: f258d6bb3aa642b2caab7aebd5a3a8f0 commit: fb7ab97a42fcee73444a5c81465b8be209bf4e2b Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 27 10:49:26 2019 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 27 11:05:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7ab97a dev-lang/erlang: Drop old Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Pacho Ramos gentoo.org> dev-lang/erlang/Manifest | 2 - dev-lang/erlang/erlang-20.3.8.ebuild | 227 ----------------------------------- dev-lang/erlang/erlang-21.1.ebuild | 161 ------------------------- 3 files changed, 390 deletions(-) diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index d2f5d868672..7945bf64e13 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,8 +1,6 @@ DIST erlang-19.3.6.12.tar.gz 34004718 BLAKE2B 49f726a4c3f3bb4fcde1d3ff7cee93ef68a0ed0f5cbb00af8fb3585fb640302bf407351b61b0507c6aaefb4311f77dc0de450d2c43c6f8310f6af01ffd424a79 SHA512 9e117cbbc9cf53d908ae87f58f80f5ad4d3e69d5f1c94e3460a1d9c287dc7290d05fccb104ffc7779dd36b6b9377290ac4c5983a8ad3ea3ca518f66e0ab0db3f DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b -DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab -DIST erlang-21.1.tar.gz 53857079 BLAKE2B ae292f5e98d747a6afb5d82205dd33d55cb6e275e3ebc98a4dbc8378cfcb1ea64f83d5f2d2256fd7208c7fe553b47ff25edf2858287f5316cae50788f2175337 SHA512 9e118e902c33b8dd71266efb4cc4aeb0db0d8be8adb64ac85595a6507dc847b84e5444a9b5c5cbf46b560c885db9f4cd934c74de4aa2e1574785295ea0865348 DIST erlang_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f diff --git a/dev-lang/erlang/erlang-20.3.8.ebuild b/dev-lang/erlang/erlang-20.3.8.ebuild deleted file mode 100644 index ac47c4ad59c..00000000000 --- a/dev-lang/erlang/erlang-20.3.8.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" - -inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(get_version_component_range 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" - -IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets" -REQUIRED_USE="dirty-schedulers? ( smp )" #621610 - -RDEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - emacs? ( virtual/emacs ) - java? ( >=virtual/jdk-1.2:* ) - odbc? ( dev-db/unixODBC ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND} - dev-lang/perl - sctp? ( net-misc/lksctp-tools ) - sys-libs/zlib - tk? ( dev-lang/tk ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - virtual/glu ) -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch" - "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" - ) - -SITEFILE=50"${PN}"-gentoo.el - -# Taken from the upstream build script, build_otp -erlang_create_lib_configure_in() { - local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel - lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools" - local sdirs= - for lib_app in ${bootstrap_apps}; do - case "${lib_app}" in - lib/*) - if [[ -f "${lib_app}/configure.in" ]]; then - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` - sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die - fi;; - *) - ;; - esac - done - - local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g" - - sdirs= - for lib_app in lib/*; do - local is_bapp=false - for bapp in ${bootstrap_apps}; do - test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; } - done - if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die - sdirs="${sdirs} test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" - fi - done - - local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g" - - rm -f lib/configure.in || die - sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac" - -} - -# Taken from the upstream build script, build_otp -erlang_distribute_config_helpers() { - local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco" - local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf" - - local aclocal_master="./erts/aclocal.m4" - local install_sh_master="./erts/autoconf/install-sh" - local config_guess_master="./erts/autoconf/config.guess" - local config_sub_master="./erts/autoconf/config.sub" - - for dir in ${aclocal_dirs}; do - "${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die - done - - for dir in ${autoconf_aux_dirs}; do - "${install_sh_master}" -d "${dir}" || die - "${install_sh_master}" -t "${dir}" "${install_sh_master}" || die - "${install_sh_master}" -t "${dir}" "${config_guess_master}" || die - "${install_sh_master}" -t "${dir}" "${config_sub_master}" || die - done -} - -src_prepare() { - default - - # Determines which directories to recurse into with autoconf - erlang_create_lib_configure_in - - # Move local autoconf files into the neccessary directories - erlang_distribute_config_helpers - - java-pkg-opt-2_src_prepare - - eautoreconf -} - -src_configure() { - use wxwidgets && need-wxwidgets unicode - - econf \ - --disable-builtin-zlib \ - $(use_enable dirty-schedulers) \ - $(use_enable hipe) \ - $(use_enable kpoll kernel-poll) \ - $(use_with java javac) \ - $(use_with odbc) \ - $(use_enable sctp) \ - $(use_enable smp smp-support) \ - $(use_with ssl) \ - $(use_with ssl ssl-rpath "no") \ - $(use_enable ssl dynamic-ssl-lib) \ - $(use_enable systemd) \ - --enable-threads -} - -src_compile() { - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" -} - -src_install() { - local ERL_LIBDIR="/usr/$(get_libdir)/erlang" - local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)" - local ERL_ERTS_VER="$(extract_version erts VSN)" - local MY_MANPATH="/usr/share/${PN}/man" - - [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version" - [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) - docompress -x /usr/share/doc/${PF} - fi - - einstalldocs - - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript - dosym \ - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ - /usr/bin/erl_call - - if use smp; then - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp - else - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam - fi - - ## Clean up the no longer needed files - rm "${ED}/${ERL_LIBDIR}/Install" || die - - insinto "${MY_MANPATH}" - - doins -r "${WORKDIR}"/man/* - - # extend MANPATH, so the normal man command can find it - # see bug 189639 - echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die - doenvd "${T}/90erlang" - - if use emacs ; then - pushd "${S}" &>/dev/null || die - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - popd &>/dev/null || die - fi - - newinitd "${FILESDIR}"/epmd.init epmd - systemd_dounit "${FILESDIR}"/epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/erlang/erlang-21.1.ebuild b/dev-lang/erlang/erlang-21.1.ebuild deleted file mode 100644 index 4b6b149c124..00000000000 --- a/dev-lang/erlang/erlang-21.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" - -inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets" - -RDEPEND=" - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( virtual/emacs ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - systemd? ( sys-apps/systemd ) - tk? ( dev-lang/tk:0 ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch" - "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" - "${FILESDIR}/${PN}-custom-autoconf.patch" -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - ./otp_build autoconf - find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed" - eautoreconf -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - $(use_enable hipe) - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_with odbc) - $(use_enable sctp) - $(use_with ssl) - $(use_with ssl ssl-rpath "no") - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(use_enable pgo) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - --enable-threads - ) - econf "${myconf[@]}" -} - -src_compile() { - if use pgo; then - # disable distcc and ccache - export DISTCC_HOSTS="" - export CCACHE_DISABLE=1 - fi - - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -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 - - if use doc ; then - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init epmd - use systemd && systemd_dounit "${FILESDIR}"/epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}