diff options
Diffstat (limited to 'sci-electronics/puff')
| -rw-r--r-- | sci-electronics/puff/files/puff-20181104-Makefile.patch | 5 | ||||
| -rw-r--r-- | sci-electronics/puff/puff-20100127-r1.ebuild | 8 | ||||
| -rw-r--r-- | sci-electronics/puff/puff-20181104.ebuild | 15 |
3 files changed, 18 insertions, 10 deletions
diff --git a/sci-electronics/puff/files/puff-20181104-Makefile.patch b/sci-electronics/puff/files/puff-20181104-Makefile.patch index a874b9173aed..c51c87d1d33b 100644 --- a/sci-electronics/puff/files/puff-20181104-Makefile.patch +++ b/sci-electronics/puff/files/puff-20181104-Makefile.patch @@ -2,7 +2,7 @@ # respect CC and LD --- Makefile.old 2021-07-03 16:34:49.937098627 +0200 +++ Makefile 2021-07-03 16:33:56.615284555 +0200 -@@ -1,12 +1,13 @@ +@@ -1,12 +1,14 @@ X11LIBDIR = /usr/X11R6/lib PASCALCOMPILER = fpc -CC = gcc @@ -15,7 +15,8 @@ puff: $(POBJS) puff_c.o ppas.sh - sed 's/link.res/link.res puff_c.o -lX11/' <ppas.sh >ppasx.sh + sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh -+ sed 's/.res/.res $(LDFLAGS) puff_c.o -lX11/' <ppas.sh >ppasx.sh ++ sed -i -e 's/\-b [^[:space:]]\+//g' ppas.sh ++ sed 's:.res:.res $(LDFLAGS) puff_c.o -lX11:' <ppas.sh >ppasx.sh sh ppasx.sh %.o: %.pas diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild index 3ec8bccda1fa..1c2f5621d272 100644 --- a/sci-electronics/puff/puff-20100127-r1.ebuild +++ b/sci-electronics/puff/puff-20100127-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="microwave CAD software" -HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" -SRC_URI="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}/${P}.tgz" +HOMEPAGE="https://www.pa3fwm.nl/software/puff/" +SRC_URI="https://www.pa3fwm.nl/software/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" @@ -21,7 +21,7 @@ src_prepare() { default # fix lib path for X11 and dont ignore LDFLAGS # respect CC and LD - eapply -p0 "${FILESDIR}"/$P-Makefile.patch + eapply -p0 "${FILESDIR}"/${P}-Makefile.patch eapply_user } diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild index 3ec8bccda1fa..3931f1297a2f 100644 --- a/sci-electronics/puff/puff-20181104.ebuild +++ b/sci-electronics/puff/puff-20181104.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="microwave CAD software" -HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" -SRC_URI="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}/${P}.tgz" +HOMEPAGE="https://www.pa3fwm.nl/software/puff/" +SRC_URI="https://www.pa3fwm.nl/software/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" @@ -21,11 +21,18 @@ src_prepare() { default # fix lib path for X11 and dont ignore LDFLAGS # respect CC and LD - eapply -p0 "${FILESDIR}"/$P-Makefile.patch + # additional drop explicite format option for linker (bug #831569) + eapply -p0 "${FILESDIR}"/${P}-Makefile.patch + # add missing LDPATH for libX11.so + sed -i -e "s:-lX11:-L/usr/$(get_libdir) -lX11:g" Makefile || die + # drop no longer needed and now unsupported paramter '-T' (bug #8802225) + sed -i -e "s: -T : :g" Makefile || die eapply_user } src_compile() { +# # fails to compile with -flto (bug #862516) + filter-lto LDFLAGS="$(raw-ldflags)" emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" } |