aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-10-24 16:51:04 +0200
committerJustin Lecher <jlec@gentoo.org>2012-10-24 16:51:04 +0200
commit6311f7d7bf167b7754613c876d22eb43fe7f8c4b (patch)
tree19556b2ba00d38d3ccb7f412ffff4ab4070d0577
parentsci-libs/inchi: Straighten out some minor things, respect AR and RANLIB (diff)
downloadsci-6311f7d7bf167b7754613c876d22eb43fe7f8c4b.tar.gz
sci-6311f7d7bf167b7754613c876d22eb43fe7f8c4b.tar.bz2
sci-6311f7d7bf167b7754613c876d22eb43fe7f8c4b.zip
inCvs
-rw-r--r--sci-libs/inchi/ChangeLog14
-rw-r--r--sci-libs/inchi/Manifest2
-rw-r--r--sci-libs/inchi/files/inchi-1.03-shared.patch20
-rw-r--r--sci-libs/inchi/files/inchi-1.04-static.patch26
-rw-r--r--sci-libs/inchi/inchi-1.04.ebuild75
-rw-r--r--sci-libs/inchi/metadata.xml8
6 files changed, 0 insertions, 145 deletions
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
deleted file mode 100644
index fff62716b..000000000
--- a/sci-libs/inchi/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for sci-libs/inchi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 24 Oct 2012; Justin Lecher <jlec@gentoo.org> inchi-1.04.ebuild,
- files/inchi-1.04-static.patch:
- Straighten out some minor things, respect AR and RANLIB
-
-*inchi-1.04 (19 Oct 2012)
-
- 19 Oct 2012; Reinis Danne <rei4dan@gmail.com> +files/inchi-1.03-shared.patch,
- +inchi-1.04.ebuild, +files/inchi-1.04-static.patch, +metadata.xml:
- Add static-libs USE flag.
-
diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest
deleted file mode 100644
index 2bdd0b476..000000000
--- a/sci-libs/inchi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST inchi-1.04-doc.zip 2128303 SHA256 abede36063e838614aa6ade7f20f386f557a78aefb041e1ba0b736088a6a79bc SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7 WHIRLPOOL 5cb5884dbfc9f2e530deb8be0e35643b0a6af70a5b4e069cd610407fac067261a3282ad9db22651fc2efc313ade78930de10ff165dd709a83880815b89e4a4fd
-DIST inchi-1.04.zip 2701930 SHA256 c187573c0f6a1fcd555393315383bd1f69563ee47bd43c898f17c473b7bb690a SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4 WHIRLPOOL 89a7ac2f80a9a87a663934bd0f24af6aed77f51115bf0b4858f66c135f932b67dff7bbffa16999ab79f7ca1358ef716fa5f11cb8756011f7622f6440470c59e4
diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch
deleted file mode 100644
index 6f4619d86..000000000
--- a/sci-libs/inchi/files/inchi-1.03-shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- 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)
- $(SHARED_LINK) $(SHARED_LINK_PARM) -o \
- $(INCHI_LIB_PATHNAME).so$(VERSION) \
- $(INCHI_LIB_OBJS) \
-- -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION)
-+ -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION) -lm
- ln -fs $(INCHI_LIB_NAME).so$(VERSION) \
- $(INCHI_LIB_PATHNAME).so$(MAIN_VERSION)
-+ ln -fs $(INCHI_LIB_NAME).so$(VERSION) \
-+ $(INCHI_LIB_PATHNAME).so
-
- endif
-
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 a367c1538..000000000
--- 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.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
deleted file mode 100644
index 98d2ae665..000000000
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A 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 ~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
- done
- if use static-libs ; then
- pushd INCHI_API/gcc_so_makefile > /dev/null
- emake libinchi.a \
- "${common_opts[@]}" \
- STATIC=1
- popd
- 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"
- rm *gz
- dolib.so lib*so*
- use static-libs && dolib.a lib*a
- insinto /usr/include
- doins ../../inchi_main/inchi_api.h
-}
diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
deleted file mode 100644
index b78599478..000000000
--- a/sci-libs/inchi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci-chemistry</herd>
- <longdescription>
- Program v1.04 implementing IUPAC (Standard) InChI/InChIKey version 1.
- </longdescription>
-</pkgmetadata>