diff options
| author |   Reinis Danne <rei4dan@gmail.com> | 2009-02-22 11:38:18 +0200 |
|---|---|---|
| committer | Reinis Danne <rei4dan@gmail.com> | 2009-02-22 11:41:53 +0200 |
| commit | 7abd776365114ba41ea8122a6c31d8524e71620f (patch) | |
| tree | 49fbfd2f3d1e70a932fa822acc9e1cf63d8fcdf7 /sci-chemistry/stdinchi | |
| parent | Merge branch 'master' of git+ssh://git@git.overlays.gentoo.org/proj/sci (diff) | |
| download | sci-7abd776365114ba41ea8122a6c31d8524e71620f.tar.gz sci-7abd776365114ba41ea8122a6c31d8524e71620f.tar.bz2 sci-7abd776365114ba41ea8122a6c31d8524e71620f.zip | |
sci-chemistry/stdinchi: Add doc use, fix prestriped files, make honor CFLAGS
Diffstat (limited to 'sci-chemistry/stdinchi')
| -rw-r--r-- | sci-chemistry/stdinchi/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-chemistry/stdinchi/Manifest | 6 | ||||
| -rw-r--r-- | sci-chemistry/stdinchi/files/stdinchi-1.02-makefile.patch | 20 | ||||
| -rw-r--r-- | sci-chemistry/stdinchi/stdinchi-1.02.ebuild | 21 |
4 files changed, 46 insertions, 5 deletions
diff --git a/sci-chemistry/stdinchi/ChangeLog b/sci-chemistry/stdinchi/ChangeLog index 9ee993749..89e98cb8e 100644 --- a/sci-chemistry/stdinchi/ChangeLog +++ b/sci-chemistry/stdinchi/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Feb 2009; Reinis Danne <rei4dan@gmail.com> + +files/stdinchi-1.02-makefile.patch, stdinchi-1.02.ebuild: + Add doc use, fix prestriped files and make honor CFLAGS + *stdinchi-1.02 (21 Feb 2009) 21 Feb 2009; Reinis Danne <rei4dan@gmail.com> +metadata.xml, diff --git a/sci-chemistry/stdinchi/Manifest b/sci-chemistry/stdinchi/Manifest index 94395f13b..6dde674dd 100644 --- a/sci-chemistry/stdinchi/Manifest +++ b/sci-chemistry/stdinchi/Manifest @@ -1,4 +1,6 @@ +AUX stdinchi-1.02-makefile.patch 1136 RMD160 a1498d975d8bd05d617dd968be8696f533d4881a SHA1 180a0fefec5ab8d0c60e931a77afcc2805f32bcd SHA256 bf5bc60eeabc9c8d99b0592d678354d9264ba9310ad2fb71bb9fc6e9619f7781 DIST STDINCHI-1-API.zip 5714027 RMD160 02381c995b837a9bfe2eceadf3b5b9f5d7328360 SHA1 8545bc26004db435edc56e58c2f74d9b424c0e26 SHA256 befa59c87b19a0249b84525a98ed574886acf890d8431b6587225eff221a1777 -EBUILD stdinchi-1.02.ebuild 616 RMD160 cf86b3aaddc518d917a1764e42cc72fae9853a0c SHA1 9268dc6c1a6ccdb6511c0cd019748a0ca2f820f3 SHA256 f208045c1a2eda8f1fea28aebeff3fa298d42552112695371fc998b9a2e22bcb -MISC ChangeLog 279 RMD160 f6497893e2649594ad0c4fcfd0fc86383e676985 SHA1 1a1db6edf2536bf6aea9bc58a0cdcd7fb758c6be SHA256 cd9239671932cf50d9a66493bbac4f4b4f91fe81233da6b17abf89da96832e00 +DIST STDINCHI-1-DOC.zip 7202605 RMD160 54b1ddffa83a637001579abebe6e40422fce70db SHA1 805368a75199342f036b7c9124de3b13c9d35c9a SHA256 284f0e48e75634b11e932bf2672217c1f00cd5cb018a5c9bbb09635c9c5ea120 +EBUILD stdinchi-1.02.ebuild 997 RMD160 1c985ccc2e0db70a01b691578f1581e3f0fc310c SHA1 7e407267489c138333a760691776d9673f2c8edd SHA256 c426d77ed519be976a4990a427f1aa2b52fc26aa16cddc0851b60c0407429865 +MISC ChangeLog 447 RMD160 e01fc81e825e0d2b323cff01ed67786706fe763d SHA1 86d614613b090e3fd478ece32c31e15ae032d0ce SHA256 95e7f6dedc1d9fc65c55bc0311c48085f20865213314ecbbaecd01486a7929fb MISC metadata.xml 271 RMD160 4b6b3ca5dc0ddb26b9da1ff4f9c9ce55a378ab6a SHA1 7b9808279e763a6220ad50ce807fc9f866278bbf SHA256 1df2ac38911948fb6b621ddf04a327c52b7415cf420296096e7f21a5ca6678ad diff --git a/sci-chemistry/stdinchi/files/stdinchi-1.02-makefile.patch b/sci-chemistry/stdinchi/files/stdinchi-1.02-makefile.patch new file mode 100644 index 000000000..fe05361e0 --- /dev/null +++ b/sci-chemistry/stdinchi/files/stdinchi-1.02-makefile.patch @@ -0,0 +1,20 @@ +--- makefile.orig 2009-02-22 02:56:49.000000000 +0200 ++++ makefile 2009-02-22 03:07:49.000000000 +0200 +@@ -21,7 +21,7 @@ +
+ # === Linker to create Main program =====
+ ifndef LINKER
+- LINKER = gcc -s
++ LINKER = gcc
+ endif
+
+ # === C Compiler ===============
+@@ -31,7 +31,7 @@ +
+ # === C Compiler Options =======
+ ifndef C_OPTIONS
+- C_OPTIONS = $(P_INCL) -ansi -O3 -c
++ C_OPTIONS = $(P_INCL) -ansi ${CFLAGS} -c
+ # C_OPTIONS = $(P_INCL) -ansi -O1 -fsigned-char -ffunction-sections -fexpensive-optimizations -fstack-check -fexceptions -Wall -pedantic -Wbad-function-cast -Wreturn-type -Wformat -Wuninitialized -Wcast-align -Wshadow -Wunused -Wunused-value -Wunused-variable -Wunused-function -Wunused-parameter -Wunused-label -Wcomment -Wcast-qual -Wconversion -Wimplicit-function-dec -Wimplicit-int -Wmissing-braces -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wsign-compare -Wfloat-equal -Wstrict-prototypes -Wwrite-strings -Wundef -Waggregate-return -Wchar-subscripts -Wformat-nonliteral -Wnested-externs -Wsequence-point -Wpointer-arith -m32 -mfancy-math-387 -mieee-fp -mno-soft-float -c
+ endif
+
diff --git a/sci-chemistry/stdinchi/stdinchi-1.02.ebuild b/sci-chemistry/stdinchi/stdinchi-1.02.ebuild index 069311e85..3cb969322 100644 --- a/sci-chemistry/stdinchi/stdinchi-1.02.ebuild +++ b/sci-chemistry/stdinchi/stdinchi-1.02.ebuild @@ -2,14 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +inherit eutils + DESCRIPTION="A program for generating standard InChI and InChIKeys" HOMEPAGE="http://www.iupac.org/inchi/" -SRC_URI="http://www.iupac.org/inchi/download/STDINCHI-1-API.zip" +SRC_URI="http://www.iupac.org/inchi/download/STDINCHI-1-API.zip + doc? ( http://www.iupac.org/inchi/download/STDINCHI-1-DOC.zip )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="" +IUSE="doc" DEPEND="app-arch/unzip" RDEPEND="" @@ -18,6 +21,8 @@ src_unpack() { unpack ${A} S="${WORKDIR}/STDINCHI-1-API/STDINCHI/gcc_makefile" cd "${S}" + + epatch "${FILESDIR}/${P}-makefile.patch" || die "Failed to apply ${P}-makefile.patch" } src_compile() { @@ -26,5 +31,15 @@ src_compile() { src_install() { dobin stdinchi-1 - dodoc ../../LICENSE ../../readme.txt ../../readme2.txt + cd ../.. + dodoc readme.txt readme2.txt + if use doc ; then + cd "${WORKDIR}/STDINCHI-1-DOC/" + docinto doc + dodoc *.pdf readme.txt + docinto doc/DOC-101 + dodoc DOC-101/*.pdf DOC-101/readme.txt + docinto doc/DOC-102B + dodoc DOC-102B/*.pdf DOC-102B/readme.txt + fi } |