Import Version Bump from sci overlay prepared by Reinis Danne

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 81 insertions, 11 deletions

diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog
index 594bf60a4ca7..df78dc444673 100644
--- a/sci-libs/inchi/ChangeLog
+++ b/sci-libs/inchi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/inchi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/ChangeLog,v 1.1 2011/03/26 15:18:23 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/ChangeLog,v 1.2 2012/03/04 13:22:18 jlec Exp $
+
+*inchi-1.04 (04 Mar 2012)
+
+  04 Mar 2012; Justin Lecher <jlec@gentoo.org> +inchi-1.04.ebuild,
+  metadata.xml:
+  Import Version Bump from sci overlay prepared by Reinis Danne
 
 *inchi-1.03 (26 Mar 2011)
 
diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest
index 55fcba8e8363..1cfad95e9283 100644
--- a/sci-libs/inchi/Manifest
+++ b/sci-libs/inchi/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX inchi-1.03-shared.patch 804 RMD160 9f8fd6da39bcb217ef8c9e4be081af94809a3032 SHA1 c320ade7eb6831947e72048b1db35314f5550da8 SHA256 bff5e32c125603e02f48f035493a9e5b342c4d0706f95f4c0d79418ff3342007
 DIST INCHI-1-API.zip 3642980 RMD160 5a808be29e751c706b3ace7dfd8c1c7a0cdfb022 SHA1 9a9ac4b2f0a03638a97ffcd325b52c9992c777af SHA256 d84ed63f71cba6c8622d36870085b7a2a7ea4abaf433808ea4f202d2e4637a69
 DIST INCHI-1-DOC.zip 2260288 RMD160 1390a48cd691a5b4d00cc74152ac4df6fb4e836b SHA1 4f2d2453573dd2ef22a70e190e9e2e90562959a7 SHA256 434575d37eedc4a4e3e77fa512c5f9fe904fded6d25fff8587717b56abac05bf
+DIST inchi-1.04-doc.zip 2128303 RMD160 5569807d2266811efd9db7d86f6fc590155d6448 SHA1 408ab981f4f64836093b365949d2f34f9d8d3ace SHA256 abede36063e838614aa6ade7f20f386f557a78aefb041e1ba0b736088a6a79bc
+DIST inchi-1.04.zip 2701930 RMD160 d3af45e84ea5b01c494f708391487d7f3d736893 SHA1 46a99a532ae6fcec40efe20abafed0ed52d73c43 SHA256 c187573c0f6a1fcd555393315383bd1f69563ee47bd43c898f17c473b7bb690a
 EBUILD inchi-1.03.ebuild 1575 RMD160 299d93d1baa205fe061568f95bca1ef5aeff6c6d SHA1 f790630468185948ab307d018315c1b6f126db7d SHA256 17c3d4acdccad9ddf099fdd334af068d695b1108248d04a9d55cedc14e5f7146
-MISC ChangeLog 385 RMD160 ad05cca93027fb3f57a609d83cb392a5337326e9 SHA1 f13d95cf0a3718eb38e88e39bdd52fa44dd02a4e SHA256 942501df8a24e8ce64807c6a2bea055f7e816f687c01e30b419e63039c087cd3
-MISC metadata.xml 273 RMD160 4dbb6215a549febf2d70d623b7080e8f13950e9f SHA1 4aad40e88427e89243042f4d16c11ad20c076d19 SHA256 a8ad582d8a12497d93d86e6613037bc33ea867e66e9f498b2791e25d2dedb7da
+EBUILD inchi-1.04.ebuild 1637 RMD160 db9a6d01eb3c84469340e9d9f6e6032afaaa3260 SHA1 4427fa195f5002134609b545e96ba80d03984800 SHA256 33d9525dd27ea66c459f8c8ef5eb38e4e523accd70d8c165cf0a5a4c5ce13482
+MISC ChangeLog 560 RMD160 b5a41901f1a998e95b8d7021399c6b4a40b24b71 SHA1 9398ba778b83340165e18e4295c55f60c13e4091 SHA256 b2f6530d7f66c835111e7e6e41def7938860285edf14e55bac8b71b1eef37c2d
+MISC metadata.xml 275 RMD160 055136c9adf66863aa784926b9519819d6a2a412 SHA1 4f218cf34914d221c08cae924d66d5346e5ea1bd SHA256 d4338e211184f29f2d8bc5dc69ae429a5a24765e2ddb7f4a65f569caf4d56334
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2OA8QACgkQgAnW8HDreRZB6ACfYlHGXvZb6j4QJPhBGagHExpN
-+OEAnRwxJckJvuRiWmxg0KWgJ/qLGNua
-=G4Y9
+iEYEAREKAAYFAk9TbJAACgkQgAnW8HDreRYokACfQCoGp5mgoBa/XJ1oi0nfCadJ
+yn4AoMwmCMnZ9LPt4GGHs56qHHpoUi/K
+=/twY
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
new file mode 100644
index 000000000000..f5b0f1fcc5ca
--- /dev/null
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -0,0 +1,61 @@
+# 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.04.ebuild,v 1.1 2012/03/04 13:22:18 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 -> ${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"
+
+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
index 035d004c2e92..f6b8d04f1abf 100644
--- a/sci-libs/inchi/metadata.xml
+++ b/sci-libs/inchi/metadata.xml
@@ -1,8 +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>
+	<herd>sci-chemistry</herd>
+	<longdescription>
 Program v1.03 implementing IUPAC (Standard) InChI/InChIKey version 1.
 </longdescription>
 </pkgmetadata>