Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
Date: Sun, 04 Mar 2012 13:26:05
Message-Id: 1330867310.80e441c52a0abe7778fe08e29c068686b5016e3f.jlec@gentoo
1 commit: 80e441c52a0abe7778fe08e29c068686b5016e3f
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 4 13:21:50 2012 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 4 13:21:50 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=80e441c5
7
8 moved to tree
9
10 ---
11 sci-libs/inchi/ChangeLog | 12 -----
12 sci-libs/inchi/files/inchi-1.03-shared.patch | 20 --------
13 sci-libs/inchi/inchi-1.04.ebuild | 61 --------------------------
14 sci-libs/inchi/metadata.xml | 8 ---
15 4 files changed, 0 insertions(+), 101 deletions(-)
16
17 diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
18 deleted file mode 100644
19 index ef4bcb7..0000000
20 --- a/sci-libs/inchi/ChangeLog
21 +++ /dev/null
22 @@ -1,12 +0,0 @@
23 -# ChangeLog for sci-libs/inchi
24 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: $
26 -
27 -*inchi-1.04 (03 Mar 2012)
28 -
29 - 03 Mar 2012; Reinis Danne <rei4dan@×××××.com> +files/inchi-1.03-shared.patch,
30 - +inchi-1.04.ebuild:
31 - Version bump to 1.04. The license of the package has changed to
32 - "IUPAC/InChI-Trust InChI Licence No. 1.0", but according to its terms the
33 - sources can be distributed also under GPLv2 or later.
34 -
35
36 diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch
37 deleted file mode 100644
38 index 6f4619d..0000000
39 --- a/sci-libs/inchi/files/inchi-1.03-shared.patch
40 +++ /dev/null
41 @@ -1,20 +0,0 @@
42 - INCHI_API/gcc_so_makefile/makefile | 4 +++-
43 - 1 files changed, 3 insertions(+), 1 deletions(-)
44 -
45 -diff --git a/INCHI_API/gcc_so_makefile/makefile b/INCHI_API/gcc_so_makefile/makefile
46 -index dd8e53c..cd617ad 100644
47 ---- a/INCHI_API/gcc_so_makefile/makefile
48 -+++ b/INCHI_API/gcc_so_makefile/makefile
49 -@@ -213,9 +213,11 @@ $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS)
50 - $(SHARED_LINK) $(SHARED_LINK_PARM) -o \
51 - $(INCHI_LIB_PATHNAME).so$(VERSION) \
52 - $(INCHI_LIB_OBJS) \
53 -- -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION)
54 -+ -Wl$(LINUX_MAP)$(LINUX_Z_RELRO),-soname,$(INCHI_LIB_NAME).so$(MAIN_VERSION) -lm
55 - ln -fs $(INCHI_LIB_NAME).so$(VERSION) \
56 - $(INCHI_LIB_PATHNAME).so$(MAIN_VERSION)
57 -+ ln -fs $(INCHI_LIB_NAME).so$(VERSION) \
58 -+ $(INCHI_LIB_PATHNAME).so
59 -
60 - endif
61 -
62
63 diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
64 deleted file mode 100644
65 index c7eb4ac..0000000
66 --- a/sci-libs/inchi/inchi-1.04.ebuild
67 +++ /dev/null
68 @@ -1,61 +0,0 @@
69 -# Copyright 1999-2012 Gentoo Foundation
70 -# Distributed under the terms of the GNU General Public License v2
71 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/inchi-1.03.ebuild,v 1.1 2011/03/26 15:18:23 jlec Exp $
72 -
73 -EAPI=4
74 -
75 -inherit eutils toolchain-funcs
76 -
77 -DESCRIPTION="A program and library for generating standard and non-standard InChI and InChIKeys"
78 -HOMEPAGE="http://www.iupac.org/inchi/"
79 -SRC_URI="
80 - http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP
81 - doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP )"
82 -
83 -LICENSE="IUPAC+InChI-Trust_InChI_Licence-1.0"
84 -SLOT="0"
85 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
86 -IUSE="doc"
87 -
88 -DEPEND="app-arch/unzip"
89 -RDEPEND=""
90 -
91 -S="${WORKDIR}"/INCHI-1-API
92 -
93 -src_prepare() {
94 - epatch "${FILESDIR}"/${PN}-1.03-shared.patch
95 -}
96 -
97 -src_compile() {
98 - for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do
99 - pushd ${dir} > /dev/null
100 - emake \
101 - C_COMPILER=$(tc-getCC) \
102 - CPP_COMPILER=$(tc-getCXX) \
103 - LINKER="$(tc-getCXX) ${LDFLAGS}" \
104 - SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" \
105 - C_COMPILER_OPTIONS="\${P_INCL} -ansi -DCOMPILE_ANSI_ONLY ${CFLAGS} -c " \
106 - CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -ansi ${CXXFLAGS} -frtti -c " \
107 - C_OPTIONS="${CFLAGS} -fPIC -c " \
108 - LINKER_OPTIONS="${LDFLAGS}" \
109 - CREATE_MAIN= \
110 - ISLINUX=1
111 - popd
112 - done
113 -}
114 -
115 -src_install() {
116 - dodoc readme*.txt
117 - if use doc ; then
118 - cd "${WORKDIR}/INCHI-1-DOC/"
119 - docinto doc
120 - dodoc *.pdf readme.txt
121 - fi
122 - cd "${S}/INCHI/gcc/inchi-1"
123 - dobin inchi-1
124 - cd "${S}/INCHI_API/gcc_so_makefile/result"
125 - rm *gz
126 - dolib.so lib*
127 - insinto /usr/include
128 - doins ../../inchi_main/inchi_api.h
129 -}
130
131 diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
132 deleted file mode 100644
133 index cc20730..0000000
134 --- a/sci-libs/inchi/metadata.xml
135 +++ /dev/null
136 @@ -1,8 +0,0 @@
137 -<?xml version="1.0" encoding="UTF-8"?>
138 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
139 -<pkgmetadata>
140 - <herd>sci-chemistry</herd>
141 - <longdescription>
142 - Program and library implementing IUPAC (Standard) InChI/InChIKey version 1.
143 - </longdescription>
144 -</pkgmetadata>