diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-01-04 13:37:49 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-01-04 13:37:49 +0000 |
commit | f60f57f2cfeb65c6cce96974447328ae4d8b9e44 (patch) | |
tree | 6cd32a7e67966c2be708d9e8afe40992857ab527 /sci-libs/inchi | |
parent | Bump conduit-extra to 1.1.6.2, upstream applied the patch, so remove recently... (diff) | |
download | historical-f60f57f2cfeb65c6cce96974447328ae4d8b9e44.tar.gz historical-f60f57f2cfeb65c6cce96974447328ae4d8b9e44.tar.bz2 historical-f60f57f2cfeb65c6cce96974447328ae4d8b9e44.zip |
sci-libs/inchi: Drop old; add missing die; bump EAPI
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-libs/inchi')
-rw-r--r-- | sci-libs/inchi/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/inchi/Manifest | 41 | ||||
-rw-r--r-- | sci-libs/inchi/inchi-1.03.ebuild | 61 | ||||
-rw-r--r-- | sci-libs/inchi/inchi-1.04.ebuild | 19 | ||||
-rw-r--r-- | sci-libs/inchi/metadata.xml | 4 |
5 files changed, 37 insertions, 96 deletions
diff --git a/sci-libs/inchi/ChangeLog b/sci-libs/inchi/ChangeLog index 5d79a8d3c0eb..f048b7e5ea82 100644 --- a/sci-libs/inchi/ChangeLog +++ b/sci-libs/inchi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/inchi -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/ChangeLog,v 1.6 2013/02/20 19:42:07 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/ChangeLog,v 1.7 2015/01/04 13:37:37 jlec Exp $ + + 04 Jan 2015; Justin Lecher <jlec@gentoo.org> -inchi-1.03.ebuild, + inchi-1.04.ebuild, metadata.xml: + Drop old; add missing die; bump EAPI 20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> inchi-1.04.ebuild: Add ~arm, wrt bug #455960 diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest index ee3ea405cf39..aefe33c6d67c 100644 --- a/sci-libs/inchi/Manifest +++ b/sci-libs/inchi/Manifest @@ -3,28 +3,27 @@ Hash: SHA512 AUX inchi-1.03-shared.patch 804 SHA256 bff5e32c125603e02f48f035493a9e5b342c4d0706f95f4c0d79418ff3342007 SHA512 58fef060fd199cd12f62135a139d0e09a5e50c7b0e8e3c992c698ab10ad88f938f18e002b5f590d0f4346b4a801b62906bdb0dd6391ad8e53e9c59f62a465085 WHIRLPOOL 907c2b55f89c22fc16f0a231b02232696c86572e239584156beca4dce45de6590534ee1ef8218bfdf1f62854eb9bb302779412067ed2287382c5a9511f20203b AUX inchi-1.04-static.patch 570 SHA256 d69d5b5ec0f39ba0f3281ea9604d36a2ed9ab022f30e441fa52f886077391ae2 SHA512 0bc4aaf5ff4565517dbef481ca89069f3e91bd8d2b02f8e2591519183feca8725004a51375bec4560002d35b030483a21d9e36a1eb8202e3692186e23dcb7078 WHIRLPOOL aedda41fa4c38c46f419635a0d2509730ae20cc72e25b58147cf1215548a59dfb08ebd5471358f3268647e475ac5f3e388ba52c4f1dcad2b76a2118c064e858b -DIST INCHI-1-API.zip 3642980 SHA256 d84ed63f71cba6c8622d36870085b7a2a7ea4abaf433808ea4f202d2e4637a69 -DIST INCHI-1-DOC.zip 2260288 SHA256 434575d37eedc4a4e3e77fa512c5f9fe904fded6d25fff8587717b56abac05bf -DIST inchi-1.04-doc.zip 2128303 SHA256 abede36063e838614aa6ade7f20f386f557a78aefb041e1ba0b736088a6a79bc +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 -EBUILD inchi-1.03.ebuild 1575 SHA256 17c3d4acdccad9ddf099fdd334af068d695b1108248d04a9d55cedc14e5f7146 SHA512 eee4b29c8d6f3d8d7d20294f003867c6e4a14d24271912378002c1fe8d8df61182cfeb0e4ef177779a832fd2521c74b805990153c8c1227e114a54bea62c12e6 WHIRLPOOL 7c2bbeba7abe8633846b0ffee6538e4315754b499f87b775cee96c58b77ee604fa318aca80d13bb167e2aeea749a88b9d576b3815bca19566c1f61afc8b293bc -EBUILD inchi-1.04.ebuild 1955 SHA256 98f231b8f5ed65cdd651dee7a7c63289991d7fc2ca023d61ceaf7ef49a221d58 SHA512 5a9ca5cab76d22893d8795eb2fa2ae1852a726a9418d0b80274db8eecc334a2006c5edd7f91e4bd4d04a99bdaf402222860aa1ef8cc9cf78e582fae64422d037 WHIRLPOOL c2c7fc4d0a32bb0eea10ad7fcfad8427c4176470ab8982440a6bd9c94706ea11130b8b0c907b309608c6420c4192d88c512266c4592b21e9157bcc224c1ccc5f -MISC ChangeLog 1040 SHA256 04ff407e592ef8afa6c7429d3805e698d408f5270d085eea78218cf4452313bb SHA512 7f35e2c6158b69691ad3874c68799a3de5ba15c2b0824d4ea34d37513845dc44cb765c661536c9a348feea98c0c27c35c41f3196d2ddf6bf5bcecb73577e1af7 WHIRLPOOL 5b44307edc83df1a76e1085aa0f126840988a4d65111143ebed0d631cb1d12b8bf8743a3a2f89f8a8185ed8d3411d2f7e275b516e29159326e3bac01ab250912 -MISC metadata.xml 275 SHA256 d4338e211184f29f2d8bc5dc69ae429a5a24765e2ddb7f4a65f569caf4d56334 SHA512 10530d4363969b41088547627fcee3eba20029fe8b1345ca6948e972c52fa6651a06c8199f0da5b10a200c632147c15241f45e91498c088a7caa1f171e143f58 WHIRLPOOL cddc5df763fb27b471b80c73be660ff5e7e2c42e50690e0a161896760b49c2d1631090d46d97eaa161345214ac8bcd457bf9379c908fb6f9a40cf29f8f8bd465 +EBUILD inchi-1.04.ebuild 1977 SHA256 97d426cb6b0f122a33623b7c606651b7db4f9eb1190567b2438ab61899a2345e SHA512 6daad81a057705fa9e781e02e2b695d6cb6fc4d83b1238d33e0de8e0a46c46fec9b0e13f5622de29f312fbb9253b237bbe3510d805be8240f277ee3b587f29ed WHIRLPOOL 69014bc197911fc8fd72851b1cfa1f195241ab698c35492eed2998320f9d2d1606e2f5b765138a2dc392c7cf09b06e182adafac655545780c6a6f28f2d37a8f7 +MISC ChangeLog 1183 SHA256 7637849f1ad0fdeee8851996c5ad0db38df7bc24e52fdf969fd846f10d79410b SHA512 b39e3e5f9e32c2428b55afaf735733efbda1ea98ec232b4e2330af879acdd2aecbf71d028092221ed57dbcf9c95e51ec5644bfc083f4d98a60537209508b3556 WHIRLPOOL 8b6512650128f5f681e6a3ca3243e6e484ccdfc490a2e695d7c9871322d3c88668936ee9549253db9709012dce586ffcbbc6e90806f58700faf85ccf788ee97c +MISC metadata.xml 277 SHA256 610ac95474d170336153030089b6f2c5f561a688f539d6baafc610588dc527bd SHA512 646d9ab96ae8d542012012fb8f8a5e7102b1db02721a387a11538e5e3dfde4b0cae2d193b6dc142322224f24dfb2c4a50b01afc8d2264545f8d48b9d771d6898 WHIRLPOOL e5dd3573e87bd6daddde1cf35213db01b290b3de5eeeed4c812899bb237c5f19d11f8f5e50749f0e45926cf2c53695fa34fd892759fead7a52d0e14ed4f60581 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0 -iQIcBAEBCgAGBQJRJSaKAAoJELp701BxlEWfLvAQAIYAtcIFGUFpYgkxmqM+C6uv -XlEM49xr4NgGPQdG4mbCcMHLg0CZefB7R7UMXyuzZcpEYABYvPI4tXNBgnJRQu6K -YhsqitoMeiI0Q/I/vLWEHN+hUOK2WuXU+jvsNbKquCt8Z9eOAC6aAD4czt4s+sET -+U0lQm3f4fmRdsFcqJqbygL3yhOgwJmDgXNvWOd6J8IgE1gjhadFikErsEnMkTMo -l1GI8WImFtyvBF+n1ru539Gt7TSPRADKBzTgUHVLIkJnaWRxkWflAG5ae1nQnOjV -E1mKDZ2c9EGjNOImZoypwvUIbsP/6xZ9jkgTbu2Mx+zjE+6Mw2jrLd9YNWIz2nqA -fWppGhMs3Ai1okouP8kFWl9BVp6jCtVqRHaIV0d2FiQw3UmyO7XXs3BvbO8HgNGd -tNNKBDgV7AwvDjohQKjEcFrdYB3lU+wiH3DB1uJCbqDpqY9kTZAa6OETDAtMk9G/ -fRZzpsCqu0eRDTwDqu10u2mS7iBMuh40/kkfMFuDp7oukqYv45Zta1J16859hOON -YhJzL62vWx+8aqEldqrsPBs+3ztdWj7ybFdofqZSJUKp1OSXChmOIAq1PX0RAyzz -q6khNReC/ZrdfCa0iFARUUNHOwrF6WlGw6jzgVSSpZssRdH735Xhvsb0aNNQLYL7 -UlwjMuWdefigXg4vKcya -=eysn +iQJ8BAEBCgBmBQJUqULLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpDkP/30lYQZ73S5FUTq6KmCGMUU/ +3HHeu72eksSafWMhVxLOcn9pbkkCmy6PhOizUWR+CYTRfsigoXesbpvEf8FQcHLs +2XqRBixDOmK3DKEJBV8BN82TZcTAHH2smZ1ThSWWSelQlq9ql64Az53jMRyjnVBX +d5d7mn72mZMQrzoe82JGDKxZyKBPvI5spjKZ1SWLj/kgHT/5BioB2MZFaiUTgpsZ +F95KhtZnHSm0UYcD32aylO7upk5bYCtoVBY+wCGu3TZBMjhDnDVVcXFKhqsj9zkM +XYlV1zvkMcvXQ8aZTYqMKX/mTaZWVwpdLJJmw8G1ynVtup6375K1wAucI6nOj3nd +hzNkI7+Uk/v0bkh4iF9Jl9/8wEuQz9fZTi7K30e3lwY36FZMMmS/mjbDim6ewR1u +0JVoodInzrqvMcdK+Qb4EYVPNBY9M+KFvFqARQ8qAYOIrtqAj8wHypnuUQ5BhhaR +J4evloRWIBnFWS0CTo6hiHvMSxBIXzTIp0qF0JOQrE8GbO+ueN7ghzf1+0pBaolk +Q+di1YX2SMNBObDqhB4UFhpb29P5Sx5bXHTEr4dosQiL6voZSz5rpHkhEiXKoBDG +0CrF7N+cBGs8NImX/rxvhuGe769XWXi2/bdUOsaK6/QBlkLwGYB4cky0X4uw/vfX +KQoCngo5Pik5xbxIk+G+ +=6Z2b -----END PGP SIGNATURE----- diff --git a/sci-libs/inchi/inchi-1.03.ebuild b/sci-libs/inchi/inchi-1.03.ebuild deleted file mode 100644 index 7b52e922a6f2..000000000000 --- a/sci-libs/inchi/inchi-1.03.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 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.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 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} -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/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild index c953ad9f9a05..6580aea1c8c3 100644 --- a/sci-libs/inchi/inchi-1.04.ebuild +++ b/sci-libs/inchi/inchi-1.04.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 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.5 2013/02/20 19:42:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/inchi-1.04.ebuild,v 1.6 2015/01/04 13:37:37 jlec Exp $ -EAPI=4 +EAPI=5 inherit eutils toolchain-funcs @@ -44,17 +44,17 @@ src_compile() { ISLINUX=1 ) for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do - pushd ${dir} > /dev/null + pushd ${dir} > /dev/null emake \ "${common_opts[@]}" - popd + 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 + popd > /dev/null fi } @@ -66,10 +66,9 @@ src_install() { dodoc *.pdf readme.txt fi dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 - cd "${S}/INCHI_API/gcc_so_makefile/result" - rm *gz + cd "${S}/INCHI_API/gcc_so_makefile/result" || die + rm *gz || die dolib.so lib*so* use static-libs && dolib.a lib*a - insinto /usr/include - doins ../../inchi_main/inchi_api.h + doheader ../../inchi_main/inchi_api.h } diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml index f6b8d04f1abf..a168ded5a2e9 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> |