From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- sci-libs/inchi/Manifest | 5 +- sci-libs/inchi/files/inchi-1.03-shared.patch | 5 -- sci-libs/inchi/files/inchi-1.04-static.patch | 26 ---------- sci-libs/inchi/inchi-1.04-r1.ebuild | 64 ++++++++++++++++++++++++ sci-libs/inchi/inchi-1.04.ebuild | 73 ---------------------------- 5 files changed, 66 insertions(+), 107 deletions(-) delete mode 100644 sci-libs/inchi/files/inchi-1.04-static.patch create mode 100644 sci-libs/inchi/inchi-1.04-r1.ebuild delete mode 100644 sci-libs/inchi/inchi-1.04.ebuild (limited to 'sci-libs/inchi') diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest index 4214d4a96adf..9a103676acae 100644 --- a/sci-libs/inchi/Manifest +++ b/sci-libs/inchi/Manifest @@ -1,6 +1,5 @@ -AUX inchi-1.03-shared.patch 804 BLAKE2B f76a320c3bdd88075f5717e2bcfa717a7acd2b17f8ae4f105aef71e9716548f63937a0de5dae7c03df6e9224f1ef7aec3bfec34be4e28640bc543e1f80ad8d66 SHA512 58fef060fd199cd12f62135a139d0e09a5e50c7b0e8e3c992c698ab10ad88f938f18e002b5f590d0f4346b4a801b62906bdb0dd6391ad8e53e9c59f62a465085 -AUX inchi-1.04-static.patch 570 BLAKE2B 33ef224a8fe2304143b51fc57188b8e30b08797a9495c665d76f9cc4436ef8ee6804b50cda1bcf2b11b56acf829599a5b0d8318e75e434a90eedddcbc3e5ebb0 SHA512 0bc4aaf5ff4565517dbef481ca89069f3e91bd8d2b02f8e2591519183feca8725004a51375bec4560002d35b030483a21d9e36a1eb8202e3692186e23dcb7078 +AUX inchi-1.03-shared.patch 590 BLAKE2B 5dec4ce552bca56e517a03f7e9ce72df4c81ecac8510c7ed7c80f7ac9fbd2d8cdf2712b9f87371a6261861ac409f2967c77f5fbb9c4de13c59474eecaddd5690 SHA512 aaf71df8de4081a03e123190ddad8682754c4e6e7b57952c5376c58723679677d76c9c976100af12616a4c6a223ff9d4eac90e7324858fe707c0d59edbad4912 DIST inchi-1.04-doc.zip 2128303 BLAKE2B 041ee948e8a852b66e64c8b04a52a4b4972a750ebdc0e31ce68e6bacfae4d81e49e8356cde766fc87affacc6839c015d5e578e9bacff486605ce5d6b63ed1552 SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7 DIST inchi-1.04.zip 2701930 BLAKE2B 12e5153fdefffdd97794b3942936f93742729cd195a1be0687762263e1d8aa9b0130a79cc1c8a652d2cad67b14a175b8f5ad968c83094f9ebf250f43bcebc18c SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4 -EBUILD inchi-1.04.ebuild 1861 BLAKE2B 63da8fc04f9e8d9c20e9a6d9f4c56ee22150eca3dc144d881df58c99c71a0d777c3941c5e55fd86aa6de68c609b4e985edc928e80d492ccdb291f9b472063a2c SHA512 f3bed4d4b5e4220ab7309c78417786f301e51ae65e9fa8bb5e7669753be556b8d3981015e7ffc4d652c8bfba2341fa2f55c9db6dd263e1d3d436ca856e5d4718 +EBUILD inchi-1.04-r1.ebuild 1623 BLAKE2B d2213f27ab2c9a2860d45a7b9c84c517a87ef41a19f14de3837b839f84b35c5d70745001bddb5479bb57b73dcb7cd62feccf799b470f849af36c9aa113182f69 SHA512 6be6a4716a60cfb0667aa35b956fd53ad3f77bbe164866d9f7ccb73ca88ad289221842f4fc681881a638acc92b43e6db232cc448cf1460399a7d78d1603fdd6a MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch index 6f4619d86bd9..6a47ce99c294 100644 --- a/sci-libs/inchi/files/inchi-1.03-shared.patch +++ b/sci-libs/inchi/files/inchi-1.03-shared.patch @@ -1,8 +1,3 @@ - INCHI_API/gcc_so_makefile/makefile | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/INCHI_API/gcc_so_makefile/makefile b/INCHI_API/gcc_so_makefile/makefile -index dd8e53c..cd617ad 100644 --- a/INCHI_API/gcc_so_makefile/makefile +++ b/INCHI_API/gcc_so_makefile/makefile @@ -213,9 +213,11 @@ $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) diff --git a/sci-libs/inchi/files/inchi-1.04-static.patch b/sci-libs/inchi/files/inchi-1.04-static.patch deleted file mode 100644 index a367c153824a..000000000000 --- a/sci-libs/inchi/files/inchi-1.04-static.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:53.587632989 +0300 -+++ INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:11.668635419 +0300 -@@ -209,6 +209,14 @@ - - else - -+ifdef STATIC -+ -+libinchi.a: $(INCHI_LIB_OBJS) -+ $(AR) rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS) -+ $(RANLIB) $(INCHI_LIB_PATHNAME).a -+ -+else -+ - $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) - $(SHARED_LINK) $(SHARED_LINK_PARM) -o \ - $(INCHI_LIB_PATHNAME).so$(VERSION) \ -@@ -219,6 +226,8 @@ - - endif - -+endif -+ - # === InChI Library compile rule ========= - - %.o: $(P_LIBR)%.c diff --git a/sci-libs/inchi/inchi-1.04-r1.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild new file mode 100644 index 000000000000..5a19ed1854a7 --- /dev/null +++ b/sci-libs/inchi/inchi-1.04-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys" +HOMEPAGE="http://www.iupac.org/inchi/" +SRC_URI=" + http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip + doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP -> ${P}-doc.zip )" +S="${WORKDIR}"/INCHI-1-API + +LICENSE="IUPAC-InChi" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}"/${PN}-1.03-shared.patch +) + +src_configure() { + tc-export AR RANLIB +} + +src_compile() { + local dir common_opts + common_opts=( + C_COMPILER=$(tc-getCC) + CPP_COMPILER=$(tc-getCXX) + LINKER="$(tc-getCXX) ${LDFLAGS}" + SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" + C_COMPILER_OPTIONS="\${P_INCL} -ansi -DCOMPILE_ANSI_ONLY ${CFLAGS} -c " + CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -ansi ${CXXFLAGS} -frtti -c " + C_OPTIONS="${CFLAGS} -fPIC -c " + LINKER_OPTIONS="${LDFLAGS}" + CREATE_MAIN= + ISLINUX=1 + ) + for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do + pushd ${dir} > /dev/null || die + emake \ + "${common_opts[@]}" + popd > /dev/null || die + done +} + +src_install() { + dodoc readme*.txt + if use doc ; then + cd "${WORKDIR}"/INCHI-1-DOC || die + docinto doc + dodoc *.pdf readme.txt + fi + dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 + cd "${S}"/INCHI_API/gcc_so_makefile/result || die + rm *gz || die + dolib.so lib*so* + doheader ../../inchi_main/inchi_api.h +} diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild deleted file mode 100644 index c41a1e5ee2dc..000000000000 --- a/sci-libs/inchi/inchi-1.04.ebuild +++ /dev/null @@ -1,73 +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="Program and library for generating standard and non-standard InChI and InChIKeys" -HOMEPAGE="http://www.iupac.org/inchi/" -SRC_URI=" - http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip - doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP -> ${P}-doc.zip )" - -LICENSE="IUPAC-InChi" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}"/INCHI-1-API - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.03-shared.patch \ - "${FILESDIR}"/${PN}-1.04-static.patch - tc-export AR RANLIB -} - -src_compile() { - local dir common_opts - common_opts=( - C_COMPILER=$(tc-getCC) - CPP_COMPILER=$(tc-getCXX) - LINKER="$(tc-getCXX) ${LDFLAGS}" - SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" - C_COMPILER_OPTIONS="\${P_INCL} -ansi -DCOMPILE_ANSI_ONLY ${CFLAGS} -c " - CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -ansi ${CXXFLAGS} -frtti -c " - C_OPTIONS="${CFLAGS} -fPIC -c " - LINKER_OPTIONS="${LDFLAGS}" - CREATE_MAIN= - ISLINUX=1 - ) - for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do - pushd ${dir} > /dev/null - emake \ - "${common_opts[@]}" - popd > /dev/null - done - if use static-libs ; then - pushd INCHI_API/gcc_so_makefile > /dev/null - emake libinchi.a \ - "${common_opts[@]}" \ - STATIC=1 - popd > /dev/null - fi -} - -src_install() { - dodoc readme*.txt - if use doc ; then - cd "${WORKDIR}/INCHI-1-DOC/" - docinto doc - dodoc *.pdf readme.txt - fi - dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 - cd "${S}/INCHI_API/gcc_so_makefile/result" || die - rm *gz || die - dolib.so lib*so* - use static-libs && dolib.a lib*a - doheader ../../inchi_main/inchi_api.h -} -- cgit v1.2.3