From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sci-chemistry/molscript/Manifest | 8 --- sci-chemistry/molscript/files/2.1.2-ldflags.patch | 22 ------- sci-chemistry/molscript/files/2.1.2-libpng15.patch | 19 ------ sci-chemistry/molscript/files/2.1.2-prll.patch | 10 ---- .../molscript/files/fix-makefile-shared.patch | 62 -------------------- sci-chemistry/molscript/files/glutbitmap.h | 32 ----------- sci-chemistry/molscript/metadata.xml | 8 --- sci-chemistry/molscript/molscript-2.1.2-r2.ebuild | 67 ---------------------- 8 files changed, 228 deletions(-) delete mode 100644 sci-chemistry/molscript/Manifest delete mode 100644 sci-chemistry/molscript/files/2.1.2-ldflags.patch delete mode 100644 sci-chemistry/molscript/files/2.1.2-libpng15.patch delete mode 100644 sci-chemistry/molscript/files/2.1.2-prll.patch delete mode 100644 sci-chemistry/molscript/files/fix-makefile-shared.patch delete mode 100644 sci-chemistry/molscript/files/glutbitmap.h delete mode 100644 sci-chemistry/molscript/metadata.xml delete mode 100644 sci-chemistry/molscript/molscript-2.1.2-r2.ebuild (limited to 'sci-chemistry/molscript') diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest deleted file mode 100644 index 38fb983d7b3e..000000000000 --- a/sci-chemistry/molscript/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 2.1.2-ldflags.patch 818 BLAKE2B f36003fd8ac6a9c921dba8cac94612f1a7226361d4e3acb9903fd940d2e92729f4b9ed6d82890135185362f0ce2d417f1b836a11fed764d3db12709081e1bf77 SHA512 0e14bbf2869357e19360a977941995f8610cf2c5c4fe272a30480725350705f4d8dfa83541b1eca441c78079ca926a6449d488854d3b6b7ee1c84e644d6c023a -AUX 2.1.2-libpng15.patch 536 BLAKE2B 80cc7e5b6a82c6460d666e2f9dd3e7682ac00377fac15281888890aa1d79d98429a9a77b5bd57c033186fd368593cd3fca88dbfe32b6e9fb01e97bdff8c00287 SHA512 29f929401478beb652e04ca2b043b8dd10497251c7fd7d6668479269f06791f1419db37f0535c173ec6e29cbeb44da26d68b3413593517641d6fe9ae63090f72 -AUX 2.1.2-prll.patch 409 BLAKE2B 83eefcd062c9904a06a69ccafa9da14578f102af96ad1b3b61340223c78a2d744ebc5325db43a9181a9d81a3f3271fd97d45f1b2f48d716e69f5055dda1a2e1c SHA512 16b8566212cf06454a466678db61c2377c6080e8c72cd6e841b104f70f105fefa5d128ef96cb679f583a413d1d285a8f369dd2e757be347883d7e3e99bf88606 -AUX fix-makefile-shared.patch 2051 BLAKE2B 145edf9dc11ee0f59325fcc3e2f981de03aeaa582bea06ca80406cc88ce38971590b687aa9dd40b37fb8edd07c9b30a0f81aa20ab38dcdb02378a407ba068878 SHA512 0c12bd5aea0a6175b7647ed61ae139113329058c42cfb56105ee35af35bdab9f61adfe635a1c3322dbff00ddfcee06383bbd6bd048cc7ded1961f3997a527358 -AUX glutbitmap.h 845 BLAKE2B e5c5a6fed84021a35e132301c06efa9b877fc475a1230a58c93e9e24fb0b220cea1bcb68d411ed17897877dd3b9c4e3d6a1646906b0f09819449e6321e8f108a SHA512 a11e8c23472ed8950c8b56fdfd57ddd9c6539f427437ab26a2d3561ad388ca24a36029dee9ff6b8af759eeadf89fbd45dd10279d8089e6978eec07858624c7da -DIST molscript-2.1.2.tar.gz 412497 BLAKE2B ca28cf90cfbd1314351abd0c32e4a4012f2f6f178537e12918942f3c5e21e6875d045d46d76e645b4e9982d6d0784029b3d26eb17bb65aa486ecbea70842d9b4 SHA512 0f82936da3123770c0fdb703094dbb5289cc39e9f9ffd034d8dba563f8d615788f67040d38158ac2f203b480c5838a7d8e71ca07bc5098181c1e3cfea26703a4 -EBUILD molscript-2.1.2-r2.ebuild 1402 BLAKE2B 01e6bf7bf6b448ebb98c1ff3aa6d7efd58394c21d8091ec8f9696d618d8922d339b48df9f3969bf7b5d8026add28971d66a1442d958962957d67e16dd9f4012f SHA512 665a24745db7cfba2ed95bcc272430105a50ead3c4711cf3595f7b1f66bdcc08db51c7fb7ebdd54c6fb73ed223a75a613475d930a23b8bd5c3dc5dc95a657358 -MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c diff --git a/sci-chemistry/molscript/files/2.1.2-ldflags.patch b/sci-chemistry/molscript/files/2.1.2-ldflags.patch deleted file mode 100644 index 8867bc10a6b5..000000000000 --- a/sci-chemistry/molscript/files/2.1.2-ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Makefile.complete b/Makefile.complete -index 4ad535a..b565266 100644 ---- a/Makefile.complete -+++ b/Makefile.complete -@@ -91,7 +91,7 @@ clean: - - #------------------------------------------------------------ - molscript: $(OBJ) clib/clib.a -- $(CC) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \ -+ $(CC) $(LDFLAGS) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \ - $(GLUTLINK) $(JPEGLINK) $(PNGLINK) $(GIFLINK) $(ZLIBLINK) -lm - - molscript.tab.o: molscript.tab.c molscript.tab.h -@@ -147,7 +147,7 @@ gif_img.o: gif_img.c gif_img.h global.h graphics.h image.h opengl.h - - #------------------------------------------------------------ - molauto: molauto.o clib/clib.a -- $(CC) -o molauto molauto.o clib/clib.a -lm -+ $(CC) $(LDFLAGS) -o molauto molauto.o clib/clib.a -lm - - molauto.o: molauto.c - diff --git a/sci-chemistry/molscript/files/2.1.2-libpng15.patch b/sci-chemistry/molscript/files/2.1.2-libpng15.patch deleted file mode 100644 index 9ed1b85909e8..000000000000 --- a/sci-chemistry/molscript/files/2.1.2-libpng15.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- png_img.c -+++ png_img.c -@@ -18,6 +18,7 @@ - - #include - -+#include - #include - - #include "clib/str_utils.h" -@@ -69,7 +70,7 @@ - info_ptr = png_create_info_struct (png_ptr); - if (info_ptr == NULL) - yyerror ("png_img: could not create PNG info structure"); -- if (setjmp (png_ptr->jmpbuf)) yyerror ("png_img: could not setjmp"); -+ if (setjmp (png_jmpbuf(png_ptr))) yyerror ("png_img: could not setjmp"); - - png_init_io (png_ptr, outfile); - png_set_compression_level (png_ptr, compression_level); diff --git a/sci-chemistry/molscript/files/2.1.2-prll.patch b/sci-chemistry/molscript/files/2.1.2-prll.patch deleted file mode 100644 index e4c972a10533..000000000000 --- a/sci-chemistry/molscript/files/2.1.2-prll.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/Makefile.complete b/Makefile.complete -index 92ef20a..e3f68e3 100644 ---- a/Makefile.complete -+++ b/Makefile.complete -@@ -153,4 +153,4 @@ molauto.o: molauto.c - - #------------------------------------------------------------ - clib/clib.a: -- cd clib; make clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)" -+ $(MAKE) -C clib clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)" diff --git a/sci-chemistry/molscript/files/fix-makefile-shared.patch b/sci-chemistry/molscript/files/fix-makefile-shared.patch deleted file mode 100644 index a9947a61a665..000000000000 --- a/sci-chemistry/molscript/files/fix-makefile-shared.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -urN molscript-2.1.2.orig/Makefile.complete molscript-2.1.2/Makefile.complete ---- molscript-2.1.2.orig/Makefile.complete 1998-11-25 01:04:39.000000000 -0800 -+++ molscript-2.1.2/Makefile.complete 2005-11-21 12:28:06.000000000 -0800 -@@ -23,9 +23,9 @@ - - # OpenGL and GLUT for X (UNIX). - # Must be modified for Windows 95/NT. <--- --GLUTDIR = $(FREEWAREDIR)/glut --GLUTLINK = $(GLUTDIR)/lib/glut/libglut.a -lGLU -lGL -lXmu -lXext -lX11 --OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include -+GLUTDIR = $(FREEWAREDIR) -+GLUTLINK = -lglut -lGLU -lGL -lXmu -lXext -lX11 -+OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include/GL - OPENGLOBJ = opengl.o - OPENGLCLIBOBJ = ogl_utils.o ogl_body.o ogl_bitmap_character.o - -@@ -35,25 +35,25 @@ - - # JPEG image file format; requires the JPEG library. - # Comment out these lines if the JPEG library is not available. <--- --JPEGDIR = $(FREEWAREDIR)/jpeg --JPEGLINK = $(JPEGDIR)/libjpeg.a --JPEGFLAG = -DJPEG_SUPPORT -I$(JPEGDIR) -+JPEGDIR = $(FREEWAREDIR) -+JPEGLINK = -ljpeg -+JPEGFLAG = -DJPEG_SUPPORT - JPEGOBJ = jpeg_img.o - - # PNG image file format; requires the PNG library and the zlib library. - # Comment out these lines if the PNG and zlib libraries are not available. <--- --ZLIBDIR = $(FREEWAREDIR)/zlib --ZLIBLINK = $(ZLIBDIR)/libz.a --PNGDIR = $(FREEWAREDIR)/libpng --PNGLINK = $(PNGDIR)/libpng.a --PNGFLAG = -DPNG_SUPPORT -I$(PNGDIR) -I$(ZLIBDIR) -+ZLIBDIR = $(FREEWAREDIR) -+ZLIBLINK = -lz -+PNGDIR = $(FREEWAREDIR) -+PNGLINK = -lpng -+PNGFLAG = -DPNG_SUPPORT - PNGOBJ = png_img.o - - # GIF image file format; requires the gd 1.3 library. - # Comment out these lines if the gd 1.3 library is not available. <--- --GIFDIR = $(FREEWAREDIR)/gd --GIFLINK = $(GIFDIR)/libgd.a --GIFFLAG = -DGIF_SUPPORT -I$(GIFDIR) -+GIFDIR = $(FREEWAREDIR) -+GIFLINK = -lgd -+GIFFLAG = -DGIF_SUPPORT - GIFOBJ = gif_img.o - - # SGI IRIX's C compiler. -@@ -62,7 +62,7 @@ - COPT = -O1 - # Correctness flags: - #CCHECK = -ansi -fullwarn -g -DSELECT_DEBUG --CCHECK = -ansi -fullwarn -+CCHECK = -ansi - #CCHECK = -ansi -fullwarn -DNDEBUG - - # General cc compile flags. diff --git a/sci-chemistry/molscript/files/glutbitmap.h b/sci-chemistry/molscript/files/glutbitmap.h deleted file mode 100644 index 9584bb129daa..000000000000 --- a/sci-chemistry/molscript/files/glutbitmap.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __glutbitmap_h__ -#define __glutbitmap_h__ - -/* Copyright (c) Mark J. Kilgard, 1994, 1998. */ - -/* This program is freely distributable without licensing fees - and is provided without guarantee or warrantee expressed or - implied. This program is -not- in the public domain. */ - -#define GLUT_NO_LIB_PRAGMA /* Avoid auto library linking when building - the GLUT library itself. */ -#include - -typedef struct { - const GLsizei width; - const GLsizei height; - const GLfloat xorig; - const GLfloat yorig; - const GLfloat advance; - const GLubyte *bitmap; -} BitmapCharRec, *BitmapCharPtr; - -typedef struct { - const char *name; - const int num_chars; - const int first; - const BitmapCharRec * const *ch; -} BitmapFontRec, *BitmapFontPtr; - -typedef void *GLUTbitmapFont; - -#endif /* __glutbitmap_h__ */ diff --git a/sci-chemistry/molscript/metadata.xml b/sci-chemistry/molscript/metadata.xml deleted file mode 100644 index e490bcb8aa87..000000000000 --- a/sci-chemistry/molscript/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - sci-chemistry@gentoo.org - Gentoo Chemistry Project - - diff --git a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild deleted file mode 100644 index eb7145817875..000000000000 --- a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch toolchain-funcs - -DESCRIPTION="Display 3D molecules (e.g., proteins) in schematic and detailed representations" -HOMEPAGE="http://www.avatar.se/molscript/" -SRC_URI="${P}.tar.gz" - -LICENSE="glut molscript" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND=" - media-libs/freeglut - media-libs/gd:2= - media-libs/libpng:0= - virtual/jpeg:0= - || ( - x11-libs/libXmu - x11-libs/libXext - x11-libs/libX11 - )" -RDEPEND="${DEPEND}" - -RESTRICT="fetch" - -pkg_nofetch() { - elog "Please visit ${HOMEPAGE}" - elog "and get ${A}." - elog "Place it into your DISTDIR directory." -} - -src_prepare() { - epatch \ - "${FILESDIR}"/fix-makefile-shared.patch \ - "${FILESDIR}"/${PV}-ldflags.patch \ - "${FILESDIR}"/${PV}-prll.patch \ - "${FILESDIR}"/${PV}-libpng15.patch - - # Provide glutbitmap.h, because freeglut doesn't have it - cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/ || die - - # Stop an incredibly hacky include - sed \ - -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \ - -i "${S}"/clib/ogl_bitmap_character.c || die -} - -src_compile() { - # Prefix of programs it links with - export FREEWAREDIR="${EPREFIX}/usr" - - ln -s Makefile.complete Makefile || die - - emake \ - CC="$(tc-getCC)" \ - COPT="${CFLAGS}" -} - -src_install() { - dobin molscript molauto - dohtml "${S}"/doc/*.html -} -- cgit v1.2.3