[gentoo-commits] proj/sci:master commit in: sci-libs/inchi/, sci-libs/inchi/files/

["Justin Lecher" <jlec@gentoo.org>]

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
 }