* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2011-03-25 16:38 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2011-03-25 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 899c55de7df92a3c537367bad3d9187aa482d574
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 15:02:02 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 15:02:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=899c55de
Cleaned ebuild, moved from sci-chemistry to sci-libs
(Portage version: 2.2.0_alpha28/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-libs/inchi/ChangeLog | 14 ++++++
sci-libs/inchi/files/inchi-1.03-shared.patch | 20 +++++++++
sci-libs/inchi/inchi-1.03.ebuild | 59 ++++++++++++++++++++++++++
sci-libs/inchi/metadata.xml | 8 ++++
4 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
new file mode 100644
index 0000000..654f218
--- /dev/null
+++ b/sci-libs/inchi/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for sci-libs/inchi
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Mar 2011; Justin Lecher <jlec@gentoo.org> +inchi-1.03.ebuild,
+ +files/inchi-1.03-shared.patch, +metadata.xml:
+ Cleaned ebuild, moved from sci-chemistry to sci-libs
+
+*inchi-1.03 (14 Nov 2010)
+
+ 14 Nov 2010; Reinis Danne <rei4dan@gmail.com> +inchi-1.03.ebuild,
+ +files/inchi-1.03-makefile.patch, +metadata.xml:
+ New package sci-chemistry/inchi
+
diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch
new file mode 100644
index 0000000..6f4619d
--- /dev/null
+++ b/sci-libs/inchi/files/inchi-1.03-shared.patch
@@ -0,0 +1,20 @@
+ 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/inchi-1.03.ebuild b/sci-libs/inchi/inchi-1.03.ebuild
new file mode 100644
index 0000000..40ec722
--- /dev/null
+++ b/sci-libs/inchi/inchi-1.03.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 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.iupac.org/inchi/download/version${PV}/INCHI-1-API.zip
+ doc? ( http://www.iupac.org/inchi/download/version${PV}/INCHI-1-DOC.zip )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"/INCHI-1-API
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-shared.patch
+}
+
+src_compile() {
+ for i in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do
+ pushd ${i} > /dev/null
+ emake \
+ C_COMPILER=$(tc-getCC) \
+ CPP_COMPILER=$(tc-getCXX) \
+ LINKER="$(tc-getCXX) ${LDFLAGS}" \
+ SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" \
+ C_COMPILER_OPTIONS="\${P_INCL} -DADD_CMLPP=1 -ansi ${CFLAGS} -c " \
+ CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -DADD_CMLPP=1 ${CXXFLAGS} -c " \
+ C_OPTIONS="${CFLAGS} -fPIC -c " \
+ LINKER_OPTIONS="${LDFLAGS}" \
+ CREATE_MAIN= \
+ ISLINUX=1
+ popd
+ done
+}
+
+src_install() {
+ dodoc readme*.txt
+ if use doc ; then
+ cd "${WORKDIR}/INCHI-1-DOC/"
+ docinto doc
+ dodoc *.pdf readme.txt
+ fi
+ cd "${S}/INCHI/gcc/inchi-1"
+ dobin inchi-1
+ cd "${S}/INCHI_API/gcc_so_makefile/result"
+ dolib.so lib*
+ insinto /usr/include
+ doins ../../inchi_main/inchi_api.h
+}
diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
new file mode 100644
index 0000000..035d004
--- /dev/null
+++ b/sci-libs/inchi/metadata.xml
@@ -0,0 +1,8 @@
+<?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.03 implementing IUPAC (Standard) InChI/InChIKey version 1.
+</longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2011-03-26 16:03 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2011-03-26 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 6087cb8bd8b4e8ff85c36f8d2806c81ff170829f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:03:39 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:03:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6087cb8b
sci-libs/inchi moved to tree
---
sci-libs/inchi/ChangeLog | 17 -------
sci-libs/inchi/files/inchi-1.03-shared.patch | 20 ---------
sci-libs/inchi/inchi-1.03.ebuild | 60 --------------------------
sci-libs/inchi/metadata.xml | 8 ---
4 files changed, 0 insertions(+), 105 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
deleted file mode 100644
index fea35f4..0000000
--- a/sci-libs/inchi/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for sci-libs/inchi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 26 Mar 2011; Justin Lecher <jlec@gentoo.org> inchi-1.03.ebuild:
- Do not in gzipped libs, thanks rei4dan noticing me
-
- 25 Mar 2011; Justin Lecher <jlec@gentoo.org> +inchi-1.03.ebuild,
- +files/inchi-1.03-shared.patch, +metadata.xml:
- Cleaned ebuild, moved from sci-chemistry to sci-libs
-
-*inchi-1.03 (14 Nov 2010)
-
- 14 Nov 2010; Reinis Danne <rei4dan@gmail.com> +inchi-1.03.ebuild,
- +files/inchi-1.03-makefile.patch, +metadata.xml:
- New package sci-chemistry/inchi
-
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 6f4619d..0000000
--- 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/inchi-1.03.ebuild b/sci-libs/inchi/inchi-1.03.ebuild
deleted file mode 100644
index 1eadc5b..0000000
--- a/sci-libs/inchi/inchi-1.03.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 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.iupac.org/inchi/download/version${PV}/INCHI-1-API.zip
- doc? ( http://www.iupac.org/inchi/download/version${PV}/INCHI-1-DOC.zip )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"/INCHI-1-API
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-shared.patch
-}
-
-src_compile() {
- for i in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do
- pushd ${i} > /dev/null
- emake \
- C_COMPILER=$(tc-getCC) \
- CPP_COMPILER=$(tc-getCXX) \
- LINKER="$(tc-getCXX) ${LDFLAGS}" \
- SHARED_LINK="$(tc-getCC) ${LDFLAGS} -shared" \
- C_COMPILER_OPTIONS="\${P_INCL} -DADD_CMLPP=1 -ansi ${CFLAGS} -c " \
- CPP_COMPILER_OPTIONS="\${P_INCL} -D_LIB -DADD_CMLPP=1 ${CXXFLAGS} -c " \
- C_OPTIONS="${CFLAGS} -fPIC -c " \
- LINKER_OPTIONS="${LDFLAGS}" \
- CREATE_MAIN= \
- ISLINUX=1
- popd
- done
-}
-
-src_install() {
- dodoc readme*.txt
- if use doc ; then
- cd "${WORKDIR}/INCHI-1-DOC/"
- docinto doc
- dodoc *.pdf readme.txt
- fi
- cd "${S}/INCHI/gcc/inchi-1"
- dobin inchi-1
- cd "${S}/INCHI_API/gcc_so_makefile/result"
- rm *gz
- dolib.so lib*
- 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 035d004..0000000
--- 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.03 implementing IUPAC (Standard) InChI/InChIKey version 1.
-</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2012-03-04 13:25 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-03-04 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 80e441c52a0abe7778fe08e29c068686b5016e3f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 13:21:50 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 4 13:21:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=80e441c5
moved to tree
---
sci-libs/inchi/ChangeLog | 12 -----
sci-libs/inchi/files/inchi-1.03-shared.patch | 20 --------
sci-libs/inchi/inchi-1.04.ebuild | 61 --------------------------
sci-libs/inchi/metadata.xml | 8 ---
4 files changed, 0 insertions(+), 101 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
deleted file mode 100644
index ef4bcb7..0000000
--- a/sci-libs/inchi/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-# ChangeLog for sci-libs/inchi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*inchi-1.04 (03 Mar 2012)
-
- 03 Mar 2012; Reinis Danne <rei4dan@gmail.com> +files/inchi-1.03-shared.patch,
- +inchi-1.04.ebuild:
- Version bump to 1.04. The license of the package has changed to
- "IUPAC/InChI-Trust InChI Licence No. 1.0", but according to its terms the
- sources can be distributed also under GPLv2 or later.
-
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 6f4619d..0000000
--- 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/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
deleted file mode 100644
index c7eb4ac..0000000
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/inchi-1.03.ebuild,v 1.1 2011/03/26 15:18:23 jlec Exp $
-
-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
- doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP )"
-
-LICENSE="IUPAC+InChI-Trust_InChI_Licence-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"/INCHI-1-API
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.03-shared.patch
-}
-
-src_compile() {
- for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do
- pushd ${dir} > /dev/null
- emake \
- 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
- popd
- done
-}
-
-src_install() {
- dodoc readme*.txt
- if use doc ; then
- cd "${WORKDIR}/INCHI-1-DOC/"
- docinto doc
- dodoc *.pdf readme.txt
- fi
- cd "${S}/INCHI/gcc/inchi-1"
- dobin inchi-1
- cd "${S}/INCHI_API/gcc_so_makefile/result"
- rm *gz
- dolib.so lib*
- 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 cc20730..0000000
--- 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 and library implementing IUPAC (Standard) InChI/InChIKey version 1.
- </longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2012-10-19 18:00 Reinis Danne
0 siblings, 0 replies; 6+ messages in thread
From: Reinis Danne @ 2012-10-19 18:00 UTC (permalink / raw
To: gentoo-commits
commit: a83a18119d43577b88868f855185748f96492729
Author: Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 17:58:46 2012 +0000
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Fri Oct 19 17:58:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a83a1811
inchi: Add static-libs USE flag
---
sci-libs/inchi/ChangeLog | 10 +++
sci-libs/inchi/files/inchi-1.03-shared.patch | 20 ++++++
sci-libs/inchi/files/inchi-1.04-static.patch | 25 ++++++++
sci-libs/inchi/inchi-1.04.ebuild | 81 ++++++++++++++++++++++++++
sci-libs/inchi/metadata.xml | 8 +++
5 files changed, 144 insertions(+), 0 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
new file mode 100644
index 0000000..2f71821
--- /dev/null
+++ b/sci-libs/inchi/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/inchi
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*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/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch
new file mode 100644
index 0000000..6f4619d
--- /dev/null
+++ b/sci-libs/inchi/files/inchi-1.03-shared.patch
@@ -0,0 +1,20 @@
+ 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
new file mode 100644
index 0000000..93996fd
--- /dev/null
+++ b/sci-libs/inchi/files/inchi-1.04-static.patch
@@ -0,0 +1,25 @@
+--- 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,13 @@
+
+ else
+
++ifdef STATIC
++
++libinchi.a: $(INCHI_LIB_OBJS)
++ ar rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS)
++
++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
new file mode 100644
index 0000000..569b506
--- /dev/null
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -0,0 +1,81 @@
+# 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
+ epatch "${FILESDIR}"/${PN}-1.04-static.patch
+}
+
+src_compile() {
+ for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do
+ pushd ${dir} > /dev/null
+ emake \
+ 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
+ popd
+ done
+ if use static-libs ; then
+ pushd INCHI_API/gcc_so_makefile > /dev/null
+ emake libinchi.a \
+ 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 \
+ 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
+ cd "${S}/INCHI/gcc/inchi-1"
+ dobin inchi-1
+ cd "${S}/INCHI_API/gcc_so_makefile/result"
+ rm *gz
+ dolib.so lib*
+ if use static-libs ; then
+ dolib.a lib*.a
+ fi
+ insinto /usr/include
+ doins ../../inchi_main/inchi_api.h
+}
diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
new file mode 100644
index 0000000..b785994
--- /dev/null
+++ b/sci-libs/inchi/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2012-10-24 14:51 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-10-24 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 6357ca0d1cbb7b32590c95ae2567b055052f4b3c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 14:50:36 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:50:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6357ca0d
sci-libs/inchi: Straighten out some minor things, respect AR and RANLIB
Package-Manager: portage-2.2.0_alpha141
---
sci-libs/inchi/ChangeLog | 4 ++
sci-libs/inchi/files/inchi-1.04-static.patch | 5 +-
sci-libs/inchi/inchi-1.04.ebuild | 54 +++++++++++--------------
3 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
index 2f71821..fff6271 100644
--- a/sci-libs/inchi/ChangeLog
+++ b/sci-libs/inchi/ChangeLog
@@ -2,6 +2,10 @@
# 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,
diff --git a/sci-libs/inchi/files/inchi-1.04-static.patch b/sci-libs/inchi/files/inchi-1.04-static.patch
index 93996fd..a367c15 100644
--- a/sci-libs/inchi/files/inchi-1.04-static.patch
+++ b/sci-libs/inchi/files/inchi-1.04-static.patch
@@ -1,13 +1,14 @@
--- 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,13 @@
+@@ -209,6 +209,14 @@
else
+ifdef STATIC
+
+libinchi.a: $(INCHI_LIB_OBJS)
-+ ar rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS)
++ $(AR) rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS)
++ $(RANLIB) $(INCHI_LIB_PATHNAME).a
+
+else
+
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 569b506..98d2ae6 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -23,40 +23,37 @@ RDEPEND=""
S="${WORKDIR}"/INCHI-1-API
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.03-shared.patch
- epatch "${FILESDIR}"/${PN}-1.04-static.patch
+ 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
+ pushd ${dir} > /dev/null
emake \
- 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
+ "${common_opts[@]}"
popd
done
if use static-libs ; then
pushd INCHI_API/gcc_so_makefile > /dev/null
emake libinchi.a \
- 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 \
- STATIC=1
+ "${common_opts[@]}" \
+ STATIC=1
popd
fi
}
@@ -68,14 +65,11 @@ src_install() {
docinto doc
dodoc *.pdf readme.txt
fi
- cd "${S}/INCHI/gcc/inchi-1"
- dobin inchi-1
+ dobin "${S}"/INCHI/gcc/inchi-1/inchi-1
cd "${S}/INCHI_API/gcc_so_makefile/result"
rm *gz
- dolib.so lib*
- if use static-libs ; then
- dolib.a lib*.a
- fi
+ dolib.so lib*so*
+ use static-libs && dolib.a lib*a
insinto /usr/include
doins ../../inchi_main/inchi_api.h
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/
@ 2012-10-24 14:51 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-10-24 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 6311f7d7bf167b7754613c876d22eb43fe7f8c4b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 14:51:04 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:51:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6311f7d7
inCvs
---
sci-libs/inchi/ChangeLog | 14 -----
sci-libs/inchi/files/inchi-1.03-shared.patch | 20 -------
sci-libs/inchi/files/inchi-1.04-static.patch | 26 ---------
sci-libs/inchi/inchi-1.04.ebuild | 75 --------------------------
sci-libs/inchi/metadata.xml | 8 ---
5 files changed, 0 insertions(+), 143 deletions(-)
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
deleted file mode 100644
index fff6271..0000000
--- 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/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch
deleted file mode 100644
index 6f4619d..0000000
--- 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 a367c15..0000000
--- 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 98d2ae6..0000000
--- 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 b785994..0000000
--- 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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-24 14:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 13:25 [gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2012-10-24 14:51 Justin Lecher
2012-10-24 14:51 Justin Lecher
2012-10-19 18:00 Reinis Danne
2011-03-26 16:03 Justin Lecher
2011-03-25 16:38 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox