diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sci-chemistry/rasmol | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'sci-chemistry/rasmol')
-rw-r--r-- | sci-chemistry/rasmol/Manifest | 7 | ||||
-rw-r--r-- | sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch | 80 | ||||
-rw-r--r-- | sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch | 39 | ||||
-rw-r--r-- | sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch | 31 | ||||
-rw-r--r-- | sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch | 12 | ||||
-rw-r--r-- | sci-chemistry/rasmol/metadata.xml | 11 | ||||
-rw-r--r-- | sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild | 106 |
7 files changed, 0 insertions, 286 deletions
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest deleted file mode 100644 index 1578aefbece1..000000000000 --- a/sci-chemistry/rasmol/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 2.7.5-bundled-lib.patch 2513 BLAKE2B d913fb8572abb58ffcb6a48f2f855432e33ef74168b6461d3b2d18bba9c0fedb33a975a5d754ac9ffc56644d9256bf428694afbf0b3a078421ab372c6c84570d SHA512 940e85bbe35ed6055d8deb1d761e925aec3b60d63c3e91bcc3c08596f1b8269efd4c8a257ff9efdbe32888e987852e85ed19cba5566d8d610e8d625a23b0994a -AUX rasmol-2.7.5.2-format-security.patch 1617 BLAKE2B d9a083ae6c72724359274da5b61683b615ca1daf8e0dd8763e999ee7cfbe7ec23cdefffd4d5fda94c9d5366c812f51fef663578d9c39805b6a6eaa8f9e3c569a SHA512 cab29465d5830e669eca152880ae60c403f90668ee5bf97e3694b6e754e2e23086a520717c2df990c74fcfbafc761a460bea111d868a57ae63f13bce1603f074 -AUX rasmol-2.7.5.2-glib.h.patch 770 BLAKE2B 1c83587711540a9e2b91b53ffd0836cde27f040c593b7d771eb185edf8e72b50f09d1c38ef0b2510effee95649bbaf3adf7d0340f49a38381bd15200fd94e749 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e -AUX rasmol-2.7.5.2-longlong.patch 396 BLAKE2B 68ce4bff3584bbc6331ad5e27171d23e443be2d24b60bbd45dd02d4f04b5531cfd7fdb18904471c85ef107875fb23574f6b3212b78706746cc73c39d09cda801 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3 -DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f -EBUILD rasmol-2.7.5.2-r2.ebuild 2335 BLAKE2B 3eb46ccf0799da8a5514e963193593ee4319cda48f474c616bb09191e59163c49d922f1c865b43fc5e49abc4e146c0725a66a95527e8ae55aff79368d9ee3ebc SHA512 c67480fea952676dbaee686ca6e6a5c4a7b0750b72ab45247f469c8643ec8a4a46b5d60c89aab531c84666560a3414fc0ccd176dab0ea17094cc7c7db3ff9bc8 -MISC metadata.xml 355 BLAKE2B 71f9b1537eea00556419ae1c9920458d86992e3c0b01083d55ca02f162c420f82e8f52ee8af224573912e2b988497901702962ed3b54342991f22e1eec37ce2e SHA512 98822367149551ef6af6d75e4bd0b9104f1a625a5a17e1a2dad32e7ed83345870dc45392525cfe7e49514eae29f986e8ac2ed253ec22fec94d6152f96620b916 diff --git a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch deleted file mode 100644 index 10705165ad47..000000000000 --- a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/Imakefile b/src/Imakefile -index 03be00e..a0c68f9 100755 ---- a/src/Imakefile -+++ b/src/Imakefile -@@ -176,7 +176,7 @@ XFORMSLIB_DIR = /usr/local - #endif - endif - XFORMSLIB_INCLUDE_DIR = $(XFORMSLIB_DIR)/include --XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib -lforms -+XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib - #endif - #endif - #endif -@@ -281,17 +281,10 @@ RASMOLDIR = $(USRLIBDIR)/rasmol/ - - #ifndef USE_XFORMSLIB - DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ -- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ -- -I$(CQRLIB_INCLUDE_DIR) \ -- -I$(CVECTOR_INCLUDE_DIR) \ -- -I$(NEARTREE_INCLUDE_DIR) -+ -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib - #else - DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ -- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ -- -I$(CQRLIB_INCLUDE_DIR) \ -- -I$(CVECTOR_INCLUDE_DIR) \ -- -I$(NEARTREE_INCLUDE_DIR) \ -- -I$(XFORMSLIB_INCLUDE_DIR) -+ -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib - #endif - - -@@ -317,11 +310,11 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \ - # Additional RS6000 AIX MITSHM Library - # LDLIBS = -lm -lXi -lXextSam $(XLIB) - --LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \ -- $(CBFLIB_LDLIB) \ -- $(CQRLIB_LDLIB) \ -- $(CVECTOR_LDLIB) \ -- $(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB) -+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(GTKLIBS) \ -+ -lcbf \ -+ -lCQRlib \ -+ -lCVector \ -+ -lCNearTree -lgfortran - - - # -@@ -425,11 +418,11 @@ $(NEARTREE_DIR): - $(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR) - #endif - --$(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ -- $(CQRLIB_OBJDEP) \ -- $(CVECTOR_OBJDEP) \ -- $(NEARTREE_OBJDEP) \ -- $(XFORMSLIB_OBJDEP) -+# $(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ -+# $(CQRLIB_OBJDEP) \ -+# $(CVECTOR_OBJDEP) \ -+# $(NEARTREE_OBJDEP) \ -+# $(XFORMSLIB_OBJDEP) - - - gtkwin.c: gtkui.h -diff --git a/src/Makefile.in b/src/Makefile.in -index fc6d0af..bad90fc 100755 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -165,7 +165,7 @@ $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR) - - all: postdownload rasmol rastxt - --rasmol: postdownload $(X11OBJS) $(CBFLIBDIR)/lib/libcbf.a -+rasmol: postdownload $(X11OBJS) - $(CC) -o rasmol $(LFLAGS) $(X11OBJS) $(X11LIBS) - chmod 755 rasmol - diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch deleted file mode 100644 index 22eb229d8a3d..000000000000 --- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urp RasMol-2.7.5.2/src/command.c RasMol-2.7.5.2_sprintf/src/command.c ---- RasMol-2.7.5.2/src/command.c 2011-05-15 01:23:49.000000000 +0700 -+++ RasMol-2.7.5.2_sprintf/src/command.c 2014-02-12 18:02:24.633489549 +0700 -@@ -1286,7 +1286,7 @@ void ShowRecordCommand( void ) { - if (record_on[1]) WriteString("record appearance on\n"); - else WriteString("record apperance off\n"); - if (RecordMaxMS == 1.) { -- sprintf(param,RecordTemplate); -+ sprintf(param, "%s", RecordTemplate); - } else{ - sprintf(param,RecordTemplate,millisec<0?0:millisec); - } -@@ -1381,7 +1381,7 @@ void ShowPlayCommand( void ) { - WriteString(param); - } - if (PlayMaxMS == 1.) { -- sprintf(param,PlayTemplate); -+ sprintf(param, "%s", PlayTemplate); - } else{ - sprintf(param,PlayTemplate,millisec<0?0:millisec); - } -@@ -1469,7 +1469,7 @@ void WriteMovieFrame( void ) { - RecordPause = True; - } else { - if (RecordMaxMS == 1.) { -- sprintf(param,RecordTemplate); -+ sprintf(param, "%s", RecordTemplate); - } else{ - sprintf(param,RecordTemplate,millisec); - } -@@ -1505,7 +1505,7 @@ static int PlayMovieFrame( void ) { - for (play_frame[1] = 0;play_frame[1]<=millisec; play_frame[1]++) - { - if (RecordMaxMS == 1.) { -- sprintf(param,PlayTemplate); -+ sprintf(param, "%s", PlayTemplate); - } else{ - sprintf(param,PlayTemplate,millisec-play_frame[1]); - } diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch deleted file mode 100644 index 69c19dae5e8d..000000000000 --- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch +++ /dev/null @@ -1,31 +0,0 @@ - src/egg-macros.h | 3 ++- - src/eggfileformatchooser.c | 2 ++ - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/src/egg-macros.h b/src/egg-macros.h -index 9a7caad..1a6bce0 100644 ---- a/src/egg-macros.h -+++ b/src/egg-macros.h -@@ -9,7 +9,8 @@ - #ifndef _EGG_MACROS_H_ - #define _EGG_MACROS_H_ - --#include <glib/gmacros.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - G_BEGIN_DECLS - -diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c -index 32ce2ab..febfc2e 100644 ---- a/src/eggfileformatchooser.c -+++ b/src/eggfileformatchooser.c -@@ -19,6 +19,8 @@ - #include "eggfileformatchooser.h" - #include "egg-macros.h" - -+#include <glib.h> -+#include <glib/gprintf.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <string.h> diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch deleted file mode 100644 index 3cff0fa2f98f..000000000000 --- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp rasmol-2.7.5-23Jul09/src/rasmol.h rasmol-2.7.5-23Jul09-64b/src/rasmol.h ---- rasmol-2.7.5-23Jul09/src/rasmol.h 2009-07-20 21:08:43.000000000 +0700 -+++ rasmol-2.7.5-23Jul09-64b/src/rasmol.h 2013-02-22 14:40:00.378574163 +0700 -@@ -125,6 +125,8 @@ - #define VECTOR_FAR - #endif - -+#define _LONGLONG -+ - /*========================*/ - /* Default User Options! */ - /*========================*/ diff --git a/sci-chemistry/rasmol/metadata.xml b/sci-chemistry/rasmol/metadata.xml deleted file mode 100644 index 59ea086025a2..000000000000 --- a/sci-chemistry/rasmol/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-chemistry@gentoo.org</email> - <name>Gentoo Chemistry Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">openrasmol</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild deleted file mode 100644 index 534cffb9bba5..000000000000 --- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch fortran-2 multilib prefix toolchain-funcs - -MY_P="RasMol_${PV}" -VERS="13May11" - -DESCRIPTION="Molecular Graphics Visualisation Tool" -HOMEPAGE="http://www.openrasmol.org/" -#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz" -SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz" -#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz" - -LICENSE="|| ( GPL-2 RASLIC )" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - dev-libs/cvector - dev-util/gtk-builder-convert - >=sci-libs/cbflib-0.9.2 - >=sci-libs/cqrlib-1.1.2 - >=sci-libs/neartree-3.1.1 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libXext - x11-libs/libXi - x11-libs/vte:0" -DEPEND="${RDEPEND} - app-text/rman - x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1" - -#S="${WORKDIR}/${PN}-2.7.5-${VERS}" -S="${WORKDIR}/RasMol-${PV}" - -src_prepare() { - cd src || die - - epatch \ - "${FILESDIR}"/${P}-glib.h.patch \ - "${FILESDIR}"/${P}-format-security.patch \ - "${FILESDIR}"/${P}-longlong.patch - - if use amd64 || use amd64-linux; then - mv rasmol.h rasmol_amd64_save.h && \ - echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h - fi - - sed \ - -e 's:-traditional::g' \ - -i Makefile* || die - - cat > Imakefile <<- EOF - #define PIXELDEPTH 32 - #define GTKWIN - EOF - - cat Imakefile_base >> Imakefile || die - epatch "${FILESDIR}"/2.7.5-bundled-lib.patch - - eprefixify Imakefile - - sed \ - -e 's:vector.c:v_ector.c:g' \ - -e 's:vector.o:v_ector.o:g' \ - -e 's:vector.h:v_ector.h:g' \ - -i *akefile* || die - - sed \ - -e 's:vector.h:v_ector.h:g' \ - -i *.c *.h || die - - mv vector.c v_ector.c || die - mv vector.h v_ector.h || die - - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -DGTKWIN || die -} - -src_compile() { - emake -C src clean - emake \ - -C src \ - DEPTHDEF=-DTHIRTYTWOBIT \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - libdir=$(get_libdir) - insinto /usr/${libdir}/${PN} - doins doc/rasmol.hlp - dobin src/rasmol - dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz - doman doc/rasmol.1 - insinto /usr/${libdir}/${PN}/databases - doins data/* - - dohtml -r *html doc/*.html html_graphics -} |