commit: 574c379129085b2dbd8aec74d0a43ec9b5145340 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Feb 10 09:15:47 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Feb 10 09:17:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574c3791
sci-chemistry/molscript: treeclean Closes: https://bugs.gentoo.org/828708 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 6 -- sci-chemistry/molscript/Manifest | 1 - 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 ---------------------- 9 files changed, 227 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 6cd9d8169c9e..0930db366fbe 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -259,12 +259,6 @@ sci-biology/repeatmasker sci-biology/repeatmasker-libraries sci-biology/rmblast -# Jakov Smolić <[email protected]> (2022-01-12) -# Upstream gone, uses EAPI 5, no revdeps, no other -# distro is packaging this. -# Removal on 2022-02-11. Bug #828708. -sci-chemistry/molscript - # Brian Evans <[email protected]> (2022-01-07) # The main consumer, phpunit, does not initiate the new timer correctly # This is likely to cause issues in tests; Unmask if using for other purposes diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest deleted file mode 100644 index f72a0fa91146..000000000000 --- a/sci-chemistry/molscript/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST molscript-2.1.2.tar.gz 412497 BLAKE2B ca28cf90cfbd1314351abd0c32e4a4012f2f6f178537e12918942f3c5e21e6875d045d46d76e645b4e9982d6d0784029b3d26eb17bb65aa486ecbea70842d9b4 SHA512 0f82936da3123770c0fdb703094dbb5289cc39e9f9ffd034d8dba563f8d615788f67040d38158ac2f203b480c5838a7d8e71ca07bc5098181c1e3cfea26703a4 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 <GL/gl.h> - -+#include <zlib.h> - #include <png.h> - - #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 <GL/glut.h> - -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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Chemistry Project</name> - </maintainer> -</pkgmetadata> 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 -}
