public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/
Date: Mon,  4 Jan 2021 15:44:37 +0000 (UTC)	[thread overview]
Message-ID: <1609775064.c46ee96fe807bdddac08c9187e366403df977230.tupone@gentoo> (raw)

commit:     c46ee96fe807bdddac08c9187e366403df977230
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 15:44:24 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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 | \


             reply	other threads:[~2021-01-04 15:44 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-04 15:44 Alfredo Tupone [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-24 23:31 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/blt/ Sam James
2023-06-12 19:53 Alfredo Tupone
2023-01-15 14:59 Sam James
2023-01-15 12:19 Alfredo Tupone
2023-01-15 11:05 Alfredo Tupone
2022-12-26  2:03 WANG Xuerui
2022-06-27  6:40 Alfredo Tupone
2021-06-30 17:55 Marek Szuba
2021-04-22  2:59 Sam James
2021-04-21 18:53 Sam James
2021-04-21 18:39 Sergei Trofimovich
2021-04-20 23:35 Sam James
2021-04-20 23:35 Sam James
2021-04-20 23:35 Sam James
2021-01-06 22:33 Fabian Groffen
2021-01-04 21:34 Alfredo Tupone
2021-01-04 15:07 Alfredo Tupone
2020-06-04 17:14 Mart Raudsepp
2018-06-08  7:59 Mikle Kolyada
2017-06-21 10:27 Alexis Ballier
2015-09-21 11:27 Agostino Sarubbo
2015-09-06 13:25 Agostino Sarubbo
2015-08-26 15:53 Markus Meier
2015-08-23 15:01 Jeroen Roovers
2015-08-16 17:50 Mikle Kolyada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1609775064.c46ee96fe807bdddac08c9187e366403df977230.tupone@gentoo \
    --to=tupone@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox