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 51BB613933E for ; Tue, 13 Jul 2021 06:55:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EC86E0EE6; Tue, 13 Jul 2021 06:55:01 +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 4E47CE0EE6 for ; Tue, 13 Jul 2021 06:55:01 +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 09AF5342ACE for ; Tue, 13 Jul 2021 06:55:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E7C0798 for ; Tue, 13 Jul 2021 06:54:58 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1626159297.8bc7dea2d176afcaa3321006f488e47ddf5fa562.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-libs/saclib/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-libs/saclib/saclib-2.2.7-r1.ebuild sci-libs/saclib/saclib-2.2.7-r2.ebuild sci-libs/saclib/saclib-2.2.7-r3.ebuild X-VCS-Directories: sci-libs/saclib/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: 8bc7dea2d176afcaa3321006f488e47ddf5fa562 X-VCS-Branch: dev Date: Tue, 13 Jul 2021 06:54:58 +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: b10b6984-38a6-4f27-b7ab-06711d63ab75 X-Archives-Hash: 478b54f4bd6fe86e503c1e427f752649 commit: 8bc7dea2d176afcaa3321006f488e47ddf5fa562 Author: Alessandro Barbieri gmail com> AuthorDate: Tue Jul 13 05:45:58 2021 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Tue Jul 13 06:54:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bc7dea2 sci-libs/saclib: various fixes Signed-off-by: Alessandro Barbieri gmail.com> sci-libs/saclib/saclib-2.2.7-r1.ebuild | 79 ---------------------- ...clib-2.2.7-r2.ebuild => saclib-2.2.7-r3.ebuild} | 37 +++++----- 2 files changed, 16 insertions(+), 100 deletions(-) diff --git a/sci-libs/saclib/saclib-2.2.7-r1.ebuild b/sci-libs/saclib/saclib-2.2.7-r1.ebuild deleted file mode 100644 index cb91a9a86..000000000 --- a/sci-libs/saclib/saclib-2.2.7-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -MYP="${PN}${PV}" - -MAJOR=$(ver_cut 1) -MINOR=$(ver_cut 2) -REVISION=$(ver_cut 3) -LIBNAME="lib${PN}.so" -MAJLIBNAME="${LIBNAME}.${MAJOR}" -MINMAJLIBNAME="${MAJLIBNAME}.${MINOR}" -FULLLIBNAME="${MINMAJLIBNAME}.${REVISION}" - -DESCRIPTION="Reference implementations of algorithms and forms the basis of QEPCAD" -HOMEPAGE="https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html" -SRC_URI="https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/${MYP}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="debug" - -RDEPEND="" -DEPEND="" -BDEPEND=" - app-shells/bash - app-shells/tcsh -" - -S="${WORKDIR}/${MYP}" - -DOCS=( doc/saclib.pdf doc/saclocal.dvi doc/desc.doc ) - -src_prepare() { - export saclib="${S}" - sed -i "s|SACFLAG=|SACFLAG=-fPIC ${CFLAGS} |g" bin/mklib || die - default - #TODO: disable static lib building -} - -src_configure() { - cd "${saclib}/bin" || die - ./sconf || die - ./mkproto || die - ./mkmake || die -} - -src_compile() { - cd "${saclib}/bin" || die - if use debug ; then - ./mklib deb || die - cd ../lib/objd || die - else - ./mklib opt || die - cd ../lib/objo || die - fi - - echo $(tc-getCC) *.o "-fPIC -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${FULLLIBNAME} -o ../${FULLLIBNAME}" > make.sh || die - bash make.sh || die - cd .. || die - ln -s "${FULLLIBNAME}" "${MINMAJLIBNAME}" || die - ln -s "${MINMAJLIBNAME}" "${MAJLIBNAME}" || die - ln -s "${MAJLIBNAME}" "${LIBNAME}" || die -} - -src_install() { - einstalldocs - dolib.so "lib/${FULLLIBNAME}" - dolib.so "lib/${MINMAJLIBNAME}" - dolib.so "lib/${MAJLIBNAME}" - dolib.so "lib/${LIBNAME}" - insinto /usr/include/saclib - doins -r include/. -} diff --git a/sci-libs/saclib/saclib-2.2.7-r2.ebuild b/sci-libs/saclib/saclib-2.2.7-r3.ebuild similarity index 76% rename from sci-libs/saclib/saclib-2.2.7-r2.ebuild rename to sci-libs/saclib/saclib-2.2.7-r3.ebuild index 631d69b07..6de03d8f8 100644 --- a/sci-libs/saclib/saclib-2.2.7-r2.ebuild +++ b/sci-libs/saclib/saclib-2.2.7-r3.ebuild @@ -3,21 +3,14 @@ EAPI="7" -inherit toolchain-funcs - MYP="${PN}${PV}" -MAJOR=$(ver_cut 1) -MINOR=$(ver_cut 2) -REVISION=$(ver_cut 3) -LIBNAME="lib${PN}.so" -MAJLIBNAME="${LIBNAME}.${MAJOR}" -MINMAJLIBNAME="${MAJLIBNAME}.${MINOR}" -FULLLIBNAME="${MINMAJLIBNAME}.${REVISION}" +inherit toolchain-funcs DESCRIPTION="Reference implementations of algorithms and forms the basis of QEPCAD" HOMEPAGE="https://www.usna.edu/Users/cs/wcbrown/qepcad/B/QEPCAD.html" SRC_URI="https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/${MYP}.tar.gz" +S="${WORKDIR}/${MYP}" LICENSE="MIT" SLOT="0" @@ -25,23 +18,26 @@ KEYWORDS="~amd64" IUSE="debug" -RDEPEND="" -DEPEND="" BDEPEND=" app-shells/bash app-shells/tcsh " -S="${WORKDIR}/${MYP}" - PATCHES=( "${FILESDIR}/makefile.patch" ) - DOCS=( doc/saclib.pdf doc/saclocal.dvi doc/desc.doc ) src_prepare() { + MAJOR=$(ver_cut 1) + MINOR=$(ver_cut 2) + REVISION=$(ver_cut 3) + export LIBNAME="lib${PN}.so" + export MAJLIBNAME="${LIBNAME}.${MAJOR}" + export MINMAJLIBNAME="${MAJLIBNAME}.${MINOR}" + export FULLLIBNAME="${MINMAJLIBNAME}.${REVISION}" export saclib="${S}" - export FULLLIBNAME - export CC=$(tc-getCC) + tc-export CC + #no main, it's a library + rm src/main.c || die default } @@ -53,19 +49,18 @@ src_configure() { } src_compile() { - cd "${saclib}/bin" || die + pushd "${saclib}/bin" || die if use debug ; then ./mklib deb || die - cd ../lib/objd || die else ./mklib opt || die - cd ../lib/objo || die fi - - cd .. || die + popd || die + pushd lib || die ln -s "${FULLLIBNAME}" "${MINMAJLIBNAME}" || die ln -s "${MINMAJLIBNAME}" "${MAJLIBNAME}" || die ln -s "${MAJLIBNAME}" "${LIBNAME}" || die + popd || die } src_install() {