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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1146915808B for ; Sun, 27 Mar 2022 01:52:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16259E07DB; Sun, 27 Mar 2022 01:52:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A160E07DB for ; Sun, 27 Mar 2022 01:52:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A104343191 for ; Sun, 27 Mar 2022 01:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7E24344 for ; Sun, 27 Mar 2022 01:52:19 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1648345585.f7b3da5b1de23c8774708b9c88bbafcab19032da.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/bigloo/files/, dev-scheme/bigloo/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild dev-scheme/bigloo/bigloo-4.4c_p4.ebuild dev-scheme/bigloo/files/50bigloo-gentoo.el X-VCS-Directories: dev-scheme/bigloo/files/ dev-scheme/bigloo/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: f7b3da5b1de23c8774708b9c88bbafcab19032da X-VCS-Branch: master Date: Sun, 27 Mar 2022 01:52:19 +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: 5d170413-1836-40a0-b7b2-4f4552f2a723 X-Archives-Hash: 1d053d09c95b9114a491af29ade173e7 commit: f7b3da5b1de23c8774708b9c88bbafcab19032da Author: Maciej Barć gentoo org> AuthorDate: Sun Mar 27 01:45:39 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Mar 27 01:46:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b3da5b dev-scheme/bigloo: fix exe install and Emacs sitefile Signed-off-by: Maciej Barć gentoo.org> ...loo-4.4c_p4.ebuild => bigloo-4.4c_p4-r1.ebuild} | 25 +++++++++++++++++++--- dev-scheme/bigloo/files/50bigloo-gentoo.el | 1 + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dev-scheme/bigloo/bigloo-4.4c_p4.ebuild b/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild similarity index 81% rename from dev-scheme/bigloo/bigloo-4.4c_p4.ebuild rename to dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild index 967319442401..e0bff03017b4 100644 --- a/dev-scheme/bigloo/bigloo-4.4c_p4.ebuild +++ b/dev-scheme/bigloo/bigloo-4.4c_p4-r1.ebuild @@ -67,7 +67,7 @@ src_configure() { --ldflags="${LDFLAGS}" # Installation directories --prefix=/usr - --bindir=/usr/bin + --bindir=/usr/share/${PN}/bin --docdir=/usr/share/doc/${PF} --infodir=/usr/share/info --libdir=/usr/"$(get_libdir)" @@ -142,6 +142,27 @@ src_install() { emake DESTDIR="${D}" -C bdb install emake DESTDIR="${D}" -C cigloo install + # The ".sh" scripts set proper environment and library order for Bigloo, + # but programs (and the Bigloo Emacs library, "bee-mode") want "bigloo", + # not "bigloo.sh". To make programs work we install all executable files + # into "/usr/share/bigloo/bin", and then pick one by one for non-scripts: + # if a script with ".sh" extensions exists, then we link the script, + # not the picked executable to a binary name, otherwise link the binary. + mkdir -p "${D}"/usr/bin || die + pushd "${D}" >/dev/null || die + local bin bin_link + for bin in usr/share/${PN}/bin/* ; do + if [[ ${bin} != *.sh ]] ; then + bin_link=usr/bin/$(basename ${bin}) + if [[ -f ${bin}.sh ]] ; then + ln -s ../../${bin}.sh ${bin_link} || die + else + ln -s ../../${bin} ${bin_link} || die + fi + fi + done + popd >/dev/null || die + if use emacs ; then emake DESTDIR="${D}" install-bee elisp-site-file-install "${FILESDIR}/${SITEFILE}" @@ -151,8 +172,6 @@ src_install() { } pkg_postinst() { - einfo "Heads up: Bigloo is launched via \"bigloo.sh\" script, not \"bigloo\" executable!" - use emacs && elisp-site-regen } diff --git a/dev-scheme/bigloo/files/50bigloo-gentoo.el b/dev-scheme/bigloo/files/50bigloo-gentoo.el index 431f7e90ae73..9cac9f0f7d0f 100644 --- a/dev-scheme/bigloo/files/50bigloo-gentoo.el +++ b/dev-scheme/bigloo/files/50bigloo-gentoo.el @@ -1 +1,2 @@ (add-to-list 'load-path "@SITELISP@") +(autoload 'bee-mode "bee-mode" "Major mode for editing Bigloo code." t)