* [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-chemistry/rasmol/files/, sci-libs/cbflib/files/, ...
@ 2021-06-06 16:02 Joonas Niilola
0 siblings, 0 replies; only message in thread
From: Joonas Niilola @ 2021-06-06 16:02 UTC (permalink / raw
To: gentoo-commits
commit: e7534ff5b94d7aed1595a2405b2216d35264afd4
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 6 16:00:24 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 6 16:01:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7534ff5
sci-libs/cbflib & sci-chemistry/rasmol: remove last-rited packages
Closes: https://bugs.gentoo.org/788508
Closes: https://bugs.gentoo.org/668568
Closes: https://bugs.gentoo.org/721998
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
profiles/package.mask | 9 -
sci-chemistry/rasmol/Manifest | 1 -
sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch | 80 ---------
.../files/rasmol-2.7.5.2-format-security.patch | 39 -----
.../rasmol/files/rasmol-2.7.5.2-glib.h.patch | 31 ----
.../rasmol/files/rasmol-2.7.5.2-longlong.patch | 12 --
sci-chemistry/rasmol/metadata.xml | 11 --
sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild | 106 ------------
sci-libs/cbflib/Manifest | 1 -
sci-libs/cbflib/cbflib-0.9.3.3.ebuild | 58 -------
.../cbflib/files/cbflib-0.9.3.3-unbundle.patch | 181 ---------------------
sci-libs/cbflib/metadata.xml | 22 ---
12 files changed, 551 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 3365a96e690..faac01b021d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -382,15 +382,6 @@ app-portage/perl-info
# bug #731266
>=net-mail/cyrus-imapd-3.4.0
-# Joonas Niilola <juippis@gentoo.org> (2021-05-06)
-# sci-libs/cbflib: Doesn't compile with GCC-10 or GCC-11. Was never
-# ported to work with GCC-10+. sci-chemistry/rasmol depends on cbflib.
-# Both packages have updates ignored in Gentoo, and their ebuilds
-# pretty much untouched during git-era. Both had their latest upstream
-# version release in 2018. Removal in ~30 days. Bug #788508
-sci-libs/cbflib
-sci-chemistry/rasmol
-
# David Seifert <soap@gentoo.org> (2021-05-05)
# Causes unsolvable package conflicts, bug #788310
>=media-libs/openexr-3
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
deleted file mode 100644
index 7b5d0a12929..00000000000
--- a/sci-chemistry/rasmol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f
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 10705165ad4..00000000000
--- 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 22eb229d8a3..00000000000
--- 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 69c19dae5e8..00000000000
--- 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 3cff0fa2f98..00000000000
--- 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 59ea086025a..00000000000
--- 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 534cffb9bba..00000000000
--- 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
-}
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
deleted file mode 100644
index 83e5d601f29..00000000000
--- a/sci-libs/cbflib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
diff --git a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
deleted file mode 100644
index 4d53d2881cf..00000000000
--- a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
-# test? (
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-# )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-S=${WORKDIR}/${MY_P1}
-
-RDEPEND="sci-libs/hdf5:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_prepare() {
- rm -rf Py* drel* dRel* ply* || die
-
- append-fflags -fno-range-check
-
- tc-export CC CXX AR RANLIB FC F77
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUNPACKED_DIRECTORY="${S}"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dosym ${PN} /usr/include/cbf
-}
diff --git a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
deleted file mode 100644
index ef24c4b94b2..00000000000
--- a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
+++ /dev/null
@@ -1,181 +0,0 @@
- CMakeLists.txt | 118 +++------------------------------------------------------
- 1 file changed, 6 insertions(+), 112 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75054d6..15bab99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran)
- enable_testing()
- set (CBF_CMAKE_DEBUG "ON")
-
--set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing")
-
- #
- # User setable parameters
-@@ -530,42 +530,6 @@ find_package(ZLIB)
-
-
-
--#Load external packages in build directory at cmake time
--add_subdirectory(${CBF__EXTERNAL_PACKAGES} "${CBF__EXT_PKG}")
--
--find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}")
--if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
-- file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running")
-- CBF_DEBUG_MESSAGE("CMAKE_COMMAND: ${CMAKE_COMMAND}")
-- CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR: ${CBFlib_SOURCE_DIR} ")
-- execute_process(
-- COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR}
-- RESULT_VARIABLE CBF_BUILD_RESULT)
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
-- execute_process(
-- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5
-- RESULT_VARIABLE CBF_BUILD_RESULT)
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
-- execute_process(
-- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF
-- RESULT_VARIABLE CBF_BUILD_RESULT)
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
-- file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running")
--endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
--
--
--file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*")
--CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH: ${CBF_HDF5_LIBRARY_PATH}")
--file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*")
--CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}")
--
--if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
-- MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}")
-- MESSAGE(STATUS "Then rerun cmake")
-- MESSAGE(WARNING "Finishing run to make Makefiles")
--endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
--
--
- #
- # Data Directories
- #
-@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE "http://downloads.sf.net/cbflib")
- set(CBF_DATAURLI "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz")
- set(CBF_DATAURLO "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz")
- set(CBF_DATAURLS "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz")
--#
--# Load and unpack the Data Files
--#
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS})
--#
--# Verify the checksums
--#
--file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*")
--file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*")
--foreach(loop_file ${CBF_DATADIRI_FILES} )
-- if (NOT "${loop_file}" MATCHES "[*.]md5")
-- file(MD5 "${loop_file}" loop_file_md5)
-- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
-- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
-- message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
-- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
-- endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
--foreach(loop_file ${CBF_DATADIRO_FILES} )
-- if (NOT "${loop_file}" MATCHES "[*.]md5")
-- file(MD5 "${loop_file}" loop_file_md5)
-- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
-- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
-- message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
-- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
-- endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
-
-
- #
-@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED ${CBF_C_SOURCES})
- set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf")
- set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C)
- set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}")
--target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(cbf_shared hdf5)
-
- #
- # Build the static and shared IMG libraries
-@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib")
- add_library(img_shared SHARED ${CBF__EXAMPLES}/img.c)
- set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img")
- set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C)
--target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(img_shared hdf5 m )
-
-
- #
-@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH})
- #
- # C and C++ examples
- #
--CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}")
--CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "")
-
-
-
-@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary fcb_static)
- #
- # install
- #
--install (TARGETS makecbf DESTINATION bin)
--install (TARGETS img2cif DESTINATION bin)
--install (TARGETS cif2cbf DESTINATION bin)
--install (TARGETS adscimg2cbf DESTINATION bin)
--install (TARGETS cbf2adscimg DESTINATION bin)
--install (TARGETS changtestcompression DESTINATION bin)
--install (TARGETS convert_image DESTINATION bin)
--install (TARGETS convert_minicbf DESTINATION bin)
--install (TARGETS minicbf2nexus DESTINATION bin)
--install (TARGETS cbf_template_t DESTINATION bin)
--install (TARGETS testcell DESTINATION bin)
--install (TARGETS sauter_test DESTINATION bin)
--install (TARGETS sequence_match DESTINATION bin)
--install (TARGETS tiff2cbf DESTINATION bin)
--install (TARGETS cbf_static DESTINATION lib)
--install (TARGETS cbf_shared DESTINATION lib)
--install (TARGETS fcb_static DESTINATION lib)
--install (TARGETS fcb_shared DESTINATION lib)
--install (TARGETS img_static DESTINATION lib)
--install (TARGETS img_shared DESTINATION lib)
-+install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX})
- install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
- install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
-
-@@ -914,10 +812,6 @@ endif ()
- #
- # tests -- to be extended
- #
--add_test(NAME cbftest_makecbf
-- COMMAND ${CMAKE_COMMAND}
-- -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf
-- -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake)
- add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc)
- add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5)
- add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree)
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
deleted file mode 100644
index e0080f59068..00000000000
--- a/sci-libs/cbflib/metadata.xml
+++ /dev/null
@@ -1,22 +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@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription>
-CBFLIB is a library of ANSI-C functions providing a simple mechanism
-for accessing Crystallographic Binary Files (CBF files) and Image-supporting
-CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for
-mmCIF files. Starting with this release, CBFLIB performs validation checks
-on reading of a CBF. If a dictionary is provided, values will be validated
-against dictionary ranges and enumerations. Tags missing under parent-child
-relationships or category key requirements will be reported. CBFlib provides
-functions to create, read, modify and write CBF binary data files and imgCIF
-ASCII data files.
-</longdescription>
- <upstream>
- <remote-id type="sourceforge">cbflib</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-06 16:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-06 16:02 [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-chemistry/rasmol/files/, sci-libs/cbflib/files/, Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox