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 66C2C1382C5 for ; Mon, 4 Jan 2021 15:44:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A78F4E09CC; Mon, 4 Jan 2021 15:44:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 8E899E09CC for ; Mon, 4 Jan 2021 15:44:39 +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 A2A5D3411AE for ; Mon, 4 Jan 2021 15:44:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27CE7332 for ; Mon, 4 Jan 2021 15:44:37 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1609775064.c46ee96fe807bdddac08c9187e366403df977230.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tcltk/blt/blt-2.5.3.ebuild X-VCS-Directories: dev-tcltk/blt/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: c46ee96fe807bdddac08c9187e366403df977230 X-VCS-Branch: master Date: Mon, 4 Jan 2021 15:44:37 +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: 8098a981-26d4-48d0-a76a-c0c5b4de8ff4 X-Archives-Hash: e23fbefa29c441e9d6d2d49799ee27a3 commit: c46ee96fe807bdddac08c9187e366403df977230 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Jan 4 15:44:24 2021 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jan 4 15:44:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46ee96f dev-tcltk/blt: fix symlink Closes: https://bugs.gentoo.org/763528 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-tcltk/blt/blt-2.5.3.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-tcltk/blt/blt-2.5.3.ebuild b/dev-tcltk/blt/blt-2.5.3.ebuild index 0e86b1a0119..06eab0d5fb8 100644 --- a/dev-tcltk/blt/blt-2.5.3.ebuild +++ b/dev-tcltk/blt/blt-2.5.3.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit autotools eutils flag-o-matic multilib toolchain-funcs +MYP=${PN}$(ver_cut 1-2) + +inherit autotools flag-o-matic multilib toolchain-funcs DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" HOMEPAGE="https://sourceforge.net/projects/wize/" @@ -22,7 +24,7 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="app-arch/unzip" -S="${WORKDIR}"/${PN}2.5 +S="${WORKDIR}"/${MYP} MAKEOPTS+=" -j1" @@ -110,7 +112,7 @@ src_install() { dodir \ /usr/bin \ - /usr/$(get_libdir)/blt2.4/demos/bitmaps \ + /usr/$(get_libdir)/${MYP}/demos/bitmaps \ /usr/share/man/mann \ /usr/include @@ -124,8 +126,10 @@ src_install() { done # fix for linking against shared lib with -lBLT or -lBLTlite - dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) - dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) + SHVER=$(ver_cut 1-2) + SHVER=$(ver_rs 1 '' ${SHVER}) + dosym libBLT${SHVER}$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) + dosym libBLTlite${SHVER}$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) use static-libs || \ find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \