From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sci-libs/pgplot/Manifest | 3 +- sci-libs/pgplot/pgplot-5.2.2-r6.ebuild | 180 --------------------------------- sci-libs/pgplot/pgplot-5.2.2-r7.ebuild | 4 +- 3 files changed, 3 insertions(+), 184 deletions(-) delete mode 100644 sci-libs/pgplot/pgplot-5.2.2-r6.ebuild (limited to 'sci-libs/pgplot') diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest index a41a85d213e0..117fd10baae6 100644 --- a/sci-libs/pgplot/Manifest +++ b/sci-libs/pgplot/Manifest @@ -5,6 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f -EBUILD pgplot-5.2.2-r6.ebuild 4414 BLAKE2B 5a8aa877ca1889859adc09b178f1be5808e6851b37843d8aab6b3a0b66087da1ee1fff0edeccd3f82e53ec9f4ac2a968a0fdaa640ad2e47f9789854448fd55ae SHA512 21e0ef68fdb94a9b37b5423b3d8b32f6e052ba931248a463f9abd5067aeb193f874c6449458a80eb8ff0c484ca1b225ea5c00782a96e950533d7c8ae5970c181 -EBUILD pgplot-5.2.2-r7.ebuild 4352 BLAKE2B 8051778edb0a2bad2835f1fc9bde8ec22492d350cee66dc67fe0ed103c4f9b03d70baa1b5a825b38be4f240c5b0b5bda031c81b85f5f51eee267bc8df0eb6437 SHA512 f82c4c994761b1bf9004218db54b6364cc8da6222fb1cb2bb9449b7f1761b55af03e43091b61d2c3310203f6454c039012a4c15c18a0de085ef9439fca28d7cb +EBUILD pgplot-5.2.2-r7.ebuild 4347 BLAKE2B 91131d11c0689666762aae5582d1d0eff52cccbae3c70cf446e19b42331e184003b0fa97df0edac35571704dbb5e4ad3a4d172636afef97eb702a6b30dbd9583 SHA512 493d3acaf32d115bcb94e636cdf1eb9d0de75da1861adae9ce0f3baefaf39db7c6310aa0fda2aac8bfd29093c062c8115882430c62cb20f3c00b36483100f5fd MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7 diff --git a/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild deleted file mode 100644 index 87dd80c669a9..000000000000 --- a/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs multilib - -MY_P="${PN}${PV//.}" - -DESCRIPTION="FORTRAN/C device-independent scientific graphic library" -HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/" -SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="free-noncomm" -KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc motif static-libs tk" - -RDEPEND=" - media-libs/libpng - x11-libs/libX11 - x11-libs/libXt - motif? ( >=x11-libs/motif-2.3:0 ) - tk? ( dev-lang/tk )" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${PN}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-drivers.patch \ - "${FILESDIR}"/${PN}-makemake.patch \ - "${FILESDIR}"/${PN}-compile-setup.patch \ - "${FILESDIR}"/${PN}-headers.patch \ - "${FILESDIR}"/${PN}-libpng15.patch \ - "${FILESDIR}"/${PN}-tk86.patch - - # gfortran < 4.3 does not compile gif, pp and wd drivers - if [[ $(tc-getFC) == *gfortran* ]] && - [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then - echo - ewarn "Warning!" - ewarn "gfortran < 4.3 selected: does not compile all drivers" - ewarn "disabling gif, wd, and ppd drivers" - ewarn "if you want more drivers, use gfortran >= 4.3" - echo - sed -i \ - -e 's/GIDRIV/! GIDRIV/g' \ - -e 's/PPDRIV/! GIDRIV/g' \ - -e 's/WDDRIV/! GIDRIV/g' \ - drivers.list || die "sed drivers failed" - fi - - # fix pointers for 64 bits - if use amd64 || use ia64; then - sed -i \ - -e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \ - drivers/{gi,pp,wd}driv.f || die "sed 64bits failed" - fi - - cp sys_linux/g77_gcc.conf local.conf - - sed -i \ - -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \ - -e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \ - local.conf || die "sed flags failed" - - if [[ "$(tc-getFC)" = if* ]]; then - sed -i \ - -e 's/-Wall//g' \ - -e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \ - local.conf || die "sed drivers failed" - fi - - sed -i \ - -e "s:/usr/local/pgplot:/usr/$(get_libdir)/pgplot:g" \ - -e "s:/usr/local/bin:/usr/bin:g" \ - src/grgfil.f makehtml maketex || die "sed path failed" - - use motif && sed -i -e '/XMDRIV/s/!//' drivers.list - use tk && sed -i -e '/TKDRIV/s/!//' drivers.list -} - -src_configure() { - ./makemake . linux - # post makefile creation prefix hack - sed -i -e "s|/usr|${EROOT}/usr|g" makefile || die -} - -src_compile() { - emake \ - CFLAGS="${CFLAGS} -fPIC" \ - FFLAGS="${FFLAGS} -fPIC" \ - shared cpg-shared pgxwin_server pgdisp pgplot.doc - - use tk && emake CFLAGS="${CFLAGS} -fPIC" libtkpgplot.so - use motif && emake CFLAGS="${CFLAGS} -fPIC" libXmPgplot.so - - emake -j1 clean - use static-libs && emake all cpg - - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake pgplot.html pgplot-routines.tex - pdflatex pgplot-routines.tex - pdflatex pgplot-routines.tex - fi - - # this just cleans out not needed files - emake -j1 clean -} - -src_test() { - # i can go to 16 - local i j - for i in 1 2 3; do - emake pgdemo${i} - # j can also be LATEX CPS... - for j in NULL PNG PS CPS LATEX; do - local testexe=./test_${j}_${i} - echo "LD_LIBRARY_PATH=. ./pgdemo${i} < ${testexe} - echo "/${j}" >> ${testexe} - echo "EOF" >> ${testexe} - sh ${testexe} || die "test ${i} failed" - done - done -} - -src_install() { - insinto /usr/$(get_libdir)/pgplot - doins grfont.dat grexec.f *.inc rgb.txt - echo "PGPLOT_FONT=${EROOT%/}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot - doenvd 99pgplot - - dolib.so libpgplot.so* - dobin pgxwin_server pgdisp - - # C binding - insinto /usr/include - doins cpgplot.h - dolib.so libcpgplot.so* - - if use motif; then - insinto /usr/include - doins XmPgplot.h - dolib.so libXmPgplot.so* - fi - - if use tk; then - insinto /usr/include - doins tkpgplot.h - dolib.so libtkpgplot.so* - fi - - use static-libs && dolib.a lib*pgplot.a - - # minimal doc - dodoc aaaread.me pgplot.doc - newdoc pgdispd/aaaread.me pgdispd.txt - - if use doc; then - dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc - dohtml pgplot.html - insinto /usr/share/doc/${PF} - doins pgplot-routines.pdf pgplot-routines.tex - insinto /usr/share/doc/${PF}/examples - doins examples/* cpg/cpgdemo.c - insinto /usr/share/doc/${PF}/applications - doins -r applications/* - if use motif; then - insinto /usr/share/doc/${PF}/pgm - doins pgmf/* drivers/xmotif/pgmdemo.c - fi - if use tk; then - insinto /usr/share/doc/${PF}/pgtk - doins drivers/xtk/pgtkdemo.* - fi - fi -} diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild index 793ce9da5939..f38f5b98ec9d 100644 --- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild +++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" SLOT="0" LICENSE="free-noncomm" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="doc motif static-libs tk" RDEPEND=" -- cgit v1.2.3