From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- sci-electronics/Manifest.gz | Bin 9039 -> 9049 bytes sci-electronics/puff/Manifest | 6 ++- .../puff/files/puff-20100127-Makefile.patch | 19 +++++++++ .../puff/files/puff-20181104-Makefile.patch | 21 +++++++++ sci-electronics/puff/puff-20100127-r1.ebuild | 12 +++--- sci-electronics/puff/puff-20181104.ebuild | 47 +++++++++++++++++++++ 6 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 sci-electronics/puff/files/puff-20100127-Makefile.patch create mode 100644 sci-electronics/puff/files/puff-20181104-Makefile.patch create mode 100644 sci-electronics/puff/puff-20181104.ebuild (limited to 'sci-electronics') diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz index adc267edeb10..618e8b271a3b 100644 Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ diff --git a/sci-electronics/puff/Manifest b/sci-electronics/puff/Manifest index 5b4183ba2895..ae08dae6507f 100644 --- a/sci-electronics/puff/Manifest +++ b/sci-electronics/puff/Manifest @@ -1,3 +1,7 @@ +AUX puff-20100127-Makefile.patch 597 BLAKE2B 92a36f8db91336f7f6ec7ad99e366bda848cb80f75c8a43dac6fd1c50ae86483eccd1f5281fa16e954410ce8f9c04753aebd1711e9828b2df7562907a36f7faa SHA512 92831a435af24352027ee3f698eb8b5c651e736c937021732107915280cf9364039a5014dbdc3e25d52e8f85ba118bfae245d97e8ce053ddb434914b97c3e850 +AUX puff-20181104-Makefile.patch 630 BLAKE2B 4b82553375931c58baad49f60fef3fce0e38ba25302ce79d6af802076672c3237e7a10146b86c41353dfc9ae6edab4b3dc16376eb305bef692543ba0ab4aec51 SHA512 b49fb848122ef177c9152c38054806f6ea602799a07626d1233c9809ad2e4e6d9295592f096126b50bd0bf18c2ffe868e8153cb89fbc7b19d63931884a47d198 DIST puff-20100127.tgz 430028 BLAKE2B e3c019c4034f4f70c3f1a2468360a8838ee338ec167b8da9ef6ec630d6443c66e798e22e6e2b80f6d706191756831aa3fa5146170e0bdb2cebe3cfcf13f6cd99 SHA512 d39d74300a5f6d226dcd6147f3c63cf30396abd14d765b24b48dbd1956c81a10d4233c141789648423aa44631197e1ec160630f9b20b6ac5ae641ae67cdcb2da -EBUILD puff-20100127-r1.ebuild 990 BLAKE2B da8f3d236b90d7fc2e50a85ddebc62c3f202501d784ddb65cb4b8607f2b7c5e6173408a5ca33dc6efd9ddd4b9328bd1a3930ce46ec129569df8c2f73c4dd9d72 SHA512 a66e59302b7a144c5dd3f3111d9d06441755b84b417f235024cef787fe2318a7f8c54560b7d475afd73858510ccfdc26feeda2a5160565d01eac1761265d8dea +DIST puff-20181104.tgz 430096 BLAKE2B f87bd2d93ff83271fbac9b2933b87dbbd47aa032e5662a77d77e58563a1e353b302f295520895b1a705c28a146ebf080fc5b66d17737a7c1d6fa48d320d3fb70 SHA512 44ffc132f2ecf92868129a98ae9d154a62232c670bfd139de6bee7f03c2ad3531068f8738f26a0074d169097945436e4630bf795c006354f335d41efa5aaa881 +EBUILD puff-20100127-r1.ebuild 986 BLAKE2B 48007106aa3b545ab45becb063fc622dc56ee2bad3311a62f150329e09bf7fbce9751ce834813cfec78a403ad4e7385b36397b6889b04cb547238ce59c444704 SHA512 345246a1f1a89ee343a3afcca2d9190c24cd94abd8cb21f5b6b09cdf4d0c335c9a42ac1d748e3e2c23c5d5416416c587b614ff6a0bb30b76964fe7e934cda0a7 +EBUILD puff-20181104.ebuild 986 BLAKE2B 48007106aa3b545ab45becb063fc622dc56ee2bad3311a62f150329e09bf7fbce9751ce834813cfec78a403ad4e7385b36397b6889b04cb547238ce59c444704 SHA512 345246a1f1a89ee343a3afcca2d9190c24cd94abd8cb21f5b6b09cdf4d0c335c9a42ac1d748e3e2c23c5d5416416c587b614ff6a0bb30b76964fe7e934cda0a7 MISC metadata.xml 378 BLAKE2B b89c27528f1e752ccee9a0150ea027f80f1a123d78e625d40344dc915e24aa7682d78e75289e16259ade5e35377149981f363fe9020e6ccbc065be0b3fff731f SHA512 e6cdfd1639a8c45afd779dfda0d3a76d66576a7fa089d2285cc044a627a1ba4c5a3d3814a43fc8a7be118d7d2c58b2ffc9d3ade71025fc0f51508d98c7265aa0 diff --git a/sci-electronics/puff/files/puff-20100127-Makefile.patch b/sci-electronics/puff/files/puff-20100127-Makefile.patch new file mode 100644 index 000000000000..025b7237adfe --- /dev/null +++ b/sci-electronics/puff/files/puff-20100127-Makefile.patch @@ -0,0 +1,19 @@ +--- Makefile.old 2010-01-22 18:02:32.000000000 +0100 ++++ Makefile 2021-07-03 16:55:59.092249878 +0200 +@@ -1,12 +1,13 @@ + X11LIBDIR = /usr/X11R6/lib + PASCALCOMPILER = fpc +-CC = gcc +-CFLAGS = -O2 -g ++#CC = gcc ++#CFLAGS = -O2 -g + + POBJS = puff.o pfart.o pffft.o pfmsc.o pfrw.o pfst.o pfun1.o pfun2.o pfun3.o xgraph.o + + puff: $(POBJS) puff_c.o ppas.sh +- sed 's/link.res/link.res puff_c.o \/usr\/lib\/libX11.so/' ppasx.sh ++ sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh ++ sed 's/.res/.res $(LDFLAGS) puff_c.o \/usr\/lib64\/libX11.so/' ppasx.sh + sh ppasx.sh + + %.o: %.pas diff --git a/sci-electronics/puff/files/puff-20181104-Makefile.patch b/sci-electronics/puff/files/puff-20181104-Makefile.patch new file mode 100644 index 000000000000..a874b9173aed --- /dev/null +++ b/sci-electronics/puff/files/puff-20181104-Makefile.patch @@ -0,0 +1,21 @@ +# fix lib path for X11 and dont ignore LDFLAGS +# 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 @@ + X11LIBDIR = /usr/X11R6/lib + PASCALCOMPILER = fpc +-CC = gcc +-CFLAGS = -O2 -g ++#CC = gcc ++#CFLAGS = -O2 -g + + POBJS = puff.o pfart.o pffft.o pfmsc.o pfrw.o pfst.o pfun1.o pfun2.o pfun3.o xgraph.o + + puff: $(POBJS) puff_c.o ppas.sh +- sed 's/link.res/link.res puff_c.o -lX11/' ppasx.sh ++ sed -i -e 's!^[^[:space:]]\+ -b!$(LD) -b!g' ppas.sh ++ sed 's/.res/.res $(LDFLAGS) puff_c.o -lX11/' 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 0c27ca623e46..3ec8bccda1fa 100644 --- a/sci-electronics/puff/puff-20100127-r1.ebuild +++ b/sci-electronics/puff/puff-20100127-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="microwave CAD software" HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" @@ -20,14 +20,14 @@ DEPEND="${RDEPEND} src_prepare() { default # fix lib path for X11 and dont ignore LDFLAGS - sed -i -e "s#lib\\\/#$(get_libdir)\\\/#" \ - -e 's/CFLAGS/#CFLAGS/' \ - -e 's/link.res pu/link.res $(LDFLAGS) pu/' Makefile || die + # respect CC and LD + eapply -p0 "${FILESDIR}"/$P-Makefile.patch + eapply_user } src_compile() { LDFLAGS="$(raw-ldflags)" - emake -j1 + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" } src_install() { diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild new file mode 100644 index 000000000000..3ec8bccda1fa --- /dev/null +++ b/sci-electronics/puff/puff-20181104.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND} + dev-lang/fpc" + +src_prepare() { + default + # fix lib path for X11 and dont ignore LDFLAGS + # respect CC and LD + eapply -p0 "${FILESDIR}"/$P-Makefile.patch + eapply_user +} + +src_compile() { + LDFLAGS="$(raw-ldflags)" + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" +} + +src_install() { + dobin puff + + dodoc changelog.txt README.txt + newdoc "Puff Manual.pdf" Puff_Manual.pdf + + insinto /usr/share/${PN} + doins setup.puf + doins -r orig_dev_and_puf_files +} + +pkg_postinst() { + elog "You must copy /usr/share/${PN}/setup.puf into your working directory" + elog "before using the program." +} -- cgit v1.2.3