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 AFBE7138359 for ; Tue, 21 Jul 2020 09:42:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7934E0908; Tue, 21 Jul 2020 09:42:36 +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 AC1C4E0908 for ; Tue, 21 Jul 2020 09:42:36 +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 1455034F18C for ; Tue, 21 Jul 2020 09:42:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C7E9253 for ; Tue, 21 Jul 2020 09:42:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1595324523.b9ce0bb059a90dc796135b4fee18c1044d338775.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/nlopt/Manifest sci-libs/nlopt/nlopt-2.4.2-r2.ebuild sci-libs/nlopt/nlopt-2.6.2.ebuild X-VCS-Directories: sci-libs/nlopt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b9ce0bb059a90dc796135b4fee18c1044d338775 X-VCS-Branch: master Date: Tue, 21 Jul 2020 09:42:33 +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: e732c221-3ced-4f93-8a73-53481b4e586d X-Archives-Hash: 8c9263f1fa31496f54b7072f1416f63d commit: b9ce0bb059a90dc796135b4fee18c1044d338775 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 21 09:42:03 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 21 09:42:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ce0bb0 sci-libs/nlopt: Drop 2.4.2-r2 and 2.6.2 (r0) Closes: https://bugs.gentoo.org/724640 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/nlopt/Manifest | 1 - sci-libs/nlopt/nlopt-2.4.2-r2.ebuild | 118 ----------------------------------- sci-libs/nlopt/nlopt-2.6.2.ebuild | 110 -------------------------------- 3 files changed, 229 deletions(-) diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest index 763315e9b52..a4d07e389b1 100644 --- a/sci-libs/nlopt/Manifest +++ b/sci-libs/nlopt/Manifest @@ -1,2 +1 @@ -DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b diff --git a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild deleted file mode 100644 index 5a937cd80ed..00000000000 --- a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=1 - -inherit python-r1 autotools-utils - -DESCRIPTION="Non-linear optimization library" -HOMEPAGE="http://ab-initio.mit.edu/nlopt/" -SRC_URI="http://ab-initio.mit.edu/nlopt/${P}.tar.gz" - -LICENSE="LGPL-2.1 MIT" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="cxx guile octave python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - guile? ( dev-scheme/guile:* ) - octave? ( sci-mathematics/octave ) - python? ( - ${PYTHON_DEPS} - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-pkgconfig.patch - "${FILESDIR}"/${PN}-2.3-as-needed.patch - "${FILESDIR}"/${P}-fix-dynamic-underlinking.patch -) - -src_prepare() { - # fix #569996 due to renaming of Octave_map class - has_version ">=sci-mathematics/octave-4.0" && \ - epatch "${FILESDIR}/${P}-octave-4-map.patch" - autotools-utils_src_prepare - use cxx && BUILD_CXX="${S}_cxx" - use python && python_copy_sources -} - -src_configure() { - local myeconfargs=( - $(use_with octave) - ) - if use octave; then - export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)" - export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)" - else - export MKOCTFILE=None - fi - - myeconfargs+=( - $(use_with guile) - ) - - if use python; then - python_foreach_impl run_in_build_dir autotools-utils_src_configure - else - autotools-utils_src_configure - fi - - if use cxx; then - myeconfargs+=( --with-cxx --without-octave --without-python ) - BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure - fi -} - -src_compile() { - if use python; then - python_foreach_impl run_in_build_dir autotools-utils_src_compile - else - autotools-utils_src_compile - fi - use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile - #-C "${BUILD_DIR}_cxx" -} - -src_test() { - do_test() { - local a f - cd "${BUILD_DIR}"/test - for a in {1..7}; do - for f in {5..9}; do - ./testopt -a $a -o $f || die "algorithm $a function $f failed" - done - done - } - if use python; then - python_foreach_impl run_in_build_dir do_test - else - do_test - fi - cd "${BUILD_CXX}"/test - for a in {1..9}; do - for f in {5..9}; do - ./testopt -a $a -o $f || die "algorithm $a function $f failed" - done - done -} - -src_install() { - # build cxx first so the c lib overwrites the pc file - use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install - if use python; then - python_foreach_impl run_in_build_dir autotools-utils_src_install - else - autotools-utils_src_install - fi - local r - for r in */README; do newdoc ${r} README.$(dirname ${r}); done -} diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild deleted file mode 100644 index 21c2ada3624..00000000000 --- a/sci-libs/nlopt/nlopt-2.6.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6..9} ) - -inherit python-r1 cmake fortran-2 - -DESCRIPTION="Non-linear optimization library" -HOMEPAGE="https://ab-initio.mit.edu/nlopt/" -SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MIT" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="cxx guile octave python static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - guile? ( dev-scheme/guile:* ) - octave? ( sci-mathematics/octave ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' -2) - $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) - ) - " -DEPEND=" - ${RDEPEND} - python? ( dev-lang/swig ) - " - -src_prepare() { - cmake_src_prepare - use python && python_copy_sources -} - -src_configure() { - local mycmakeargs=( - -DNLOPT_CXX=$(usex cxx) - -DNLOPT_FORTRAN=$(usex test) - -DNLOPT_GUILE=$(usex guile) - -DNLOPT_OCTAVE=$(usex octave) - -DNLOPT_PYTHON=$(usex python) - -DNLOPT_SWIG=$(usex python) - -DNLOPT_TESTS=$(usex test) - ) - if use python; then - python_foreach_impl run_in_build_dir cmake_src_configure - else - cmake_src_configure - fi - if use static-libs; then - mycmakeargs+=( - -DBUILD_SHARED_LIBS=OFF - ) - BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure - fi -} - -src_compile() { - if use python; then - python_foreach_impl run_in_build_dir cmake_src_compile - else - cmake_src_compile - fi - if use static-libs; then - BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile - fi -} - -src_test() { - do_test() { - local a f - cd "${BUILD_DIR}"/test - for a in {1..$(usex cxx 9 7)}; do - for f in {5..9}; do - ./testopt -a $a -o $f || die "algorithm $a function $f failed" - done - done - } - if use python; then - python_foreach_impl run_in_build_dir do_test - else - do_test - fi - if use static-libs; then - BUILD_DIR="${S}_static-libs" run_in_build_dir do_test - fi -} - -nlopt_install() { - cmake_src_install - python_optimize -} - -src_install() { - if use python; then - python_foreach_impl run_in_build_dir nlopt_install - else - cmake_src_install - fi - if use static-libs; then - BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a - fi - local r - for r in */README; do newdoc ${r} README.$(dirname ${r}); done -}