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 A83761382C5 for ; Sun, 14 Mar 2021 22:58:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02E6CE083B; Sun, 14 Mar 2021 22:58:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D3080E083B for ; Sun, 14 Mar 2021 22:58:49 +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 C3224340D87 for ; Sun, 14 Mar 2021 22:58:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 735815A5 for ; Sun, 14 Mar 2021 22:58:47 +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: <1615762668.c061b7e28839e7747df90df1cb77aee61cd53849.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/octaveforge.eclass X-VCS-Directories: eclass/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: c061b7e28839e7747df90df1cb77aee61cd53849 X-VCS-Branch: dev Date: Sun, 14 Mar 2021 22:58:47 +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: 4091246f-7e8a-4445-b335-f0d0e7eec15f X-Archives-Hash: 97e3700313ceaa9f3c1394196049fcae commit: c061b7e28839e7747df90df1cb77aee61cd53849 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Mar 14 22:57:48 2021 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Sun Mar 14 22:57:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c061b7e2 eclass: no live ebuilds, dodoc, minor style things, || die Signed-off-by: Alessandro Barbieri gmail.com> eclass/octaveforge.eclass | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass index d5492e89..8a7fe039 100644 --- a/eclass/octaveforge.eclass +++ b/eclass/octaveforge.eclass @@ -11,15 +11,10 @@ # the octave-forge category of the package. OCTAVEFORGE_CAT="${OCTAVEFORGE_CAT:-main}" - REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge" -if [[ "${PV}" = 9999* ]]; then - inherit subversion autotools - ESVN_REPO_URI="${REPO_URI}/${OCTAVEFORGE_CAT}/${PN}" -else - inherit autotools - SRC_URI="mirror://sourceforge/octave/${P}.tar.gz" -fi + +inherit autotools +SRC_URI="mirror://sourceforge/octave/${P}.tar.gz" SRC_URI=" ${SRC_URI} @@ -39,22 +34,21 @@ octaveforge_src_unpack() { default if [ ! -d "${WORKDIR}/${P}" ]; then S="${WORKDIR}/${PN}" - cd "${S}" + cd "${S}" || die fi } octaveforge_src_prepare() { - [[ "${PV}" = 9999* ]] && subversion_src_prepare for filename in Makefile configure; do - cp "${DISTDIR}/octaveforge_${filename}" "${S}/${filename}" + cp "${DISTDIR}/octaveforge_${filename}" "${S}/${filename}" || die done #octave_config_info is deprecated in octave5 sed -i 's|octave_config_info|__octave_config_info__|g' Makefile || die - chmod 0755 "${S}/configure" - if [ -e "${S}"/src/autogen.sh ]; then - cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh' + chmod 0755 "${S}/configure" || die + if [ -e "${S}/src/autogen.sh" ]; then + cd "${S}/src" && ./autogen.sh || die 'failed to run autogen.sh' fi if [ -e "${S}/src/Makefile" ]; then sed -i 's/ -s / /g' "${S}/src/Makefile" || die 'sed failed.' @@ -65,16 +59,14 @@ octaveforge_src_prepare() { octaveforge_src_install() { emake DESTDIR="${D}" DISTPKG='Gentoo' install if [ -d doc/ ]; then - insinto "/usr/share/doc/${PF}" - doins -r doc/* || die 'failed to install the docs' + dodoc -r doc/* fi } octaveforge_pkg_postinst() { einfo "Registering ${CATEGORY}/${PF} on the Octave package database." - [ -d "${OCT_PKGDIR}" ] || mkdir -p "${OCT_PKGDIR}" - "${OCT_BIN}" -H -q --no-site-file --eval "pkg('rebuild');" \ - &> /dev/null || die 'failed to register the package.' + [ -d "${OCT_PKGDIR}" ] || mkdir -p "${OCT_PKGDIR}" || die + "${OCT_BIN}" -H -q --no-site-file --eval "pkg('rebuild');" &> /dev/null || die 'failed to register the package.' } octaveforge_pkg_prerm() { @@ -86,10 +78,10 @@ octaveforge_pkg_prerm() { disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); " ) - rm -f "${pkgdir}"/packinfo/on_uninstall.m - if [ -e "${pkgdir}"/packinfo/on_uninstall.m.orig ]; then - mv "$pkgdir"/packinfo/on_uninstall.m{.orig,} - cd "$pkgdir"/packinfo + rm -f "${pkgdir}/packinfo/on_uninstall.m" || die + if [ -e "${pkgdir}/packinfo/on_uninstall.m.orig" ]; then + mv "$pkgdir"/packinfo/on_uninstall.m{.orig,} || die + cd "$pkgdir/packinfo" || die "${OCT_BIN}" -H -q --no-site-file --eval " l = pkg('list'); on_uninstall(l{cellfun(@(x)strcmp(x.name,'${PN}'), l)}); @@ -99,7 +91,6 @@ octaveforge_pkg_prerm() { octaveforge_pkg_postrm() { einfo 'Rebuilding the Octave package database.' - [ -d "${OCT_PKGDIR}" ] || mkdir -p "${OCT_PKGDIR}" - "${OCT_BIN}" -H --silent --eval 'pkg rebuild' \ - &> /dev/null || die 'failed to rebuild the package database' + [ -d "${OCT_PKGDIR}" ] || mkdir -p "${OCT_PKGDIR}" || die + "${OCT_BIN}" -H --silent --eval 'pkg rebuild' &> /dev/null || die 'failed to rebuild the package database' }