Added new and significantly cleaned up revision which also fixes pre-stripping and LDFLAGS issues (see bug #241184).

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686

5 files changed, 92 insertions, 12 deletions

diff --git a/sci-chemistry/babel/ChangeLog b/sci-chemistry/babel/ChangeLog
index 377f9a3ef29f..829bcc3a784d 100644
--- a/sci-chemistry/babel/ChangeLog
+++ b/sci-chemistry/babel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/babel
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/ChangeLog,v 1.5 2007/04/28 16:43:58 swegener Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/ChangeLog,v 1.6 2008/10/19 14:53:11 markusle Exp $
+
+*babel-1.6-r1 (19 Oct 2008)
+
+  19 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/babel-1.6-makefile.patch, babel-1.6.ebuild, +babel-1.6-r1.ebuild:
+  Added new and significantly cleaned up revision which also fixes
+  pre-stripping and LDFLAGS issues (see bug #241184).
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> babel-1.6.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)
diff --git a/sci-chemistry/babel/Manifest b/sci-chemistry/babel/Manifest
index 6c37310c80d6..f8f68ffb5126 100644
--- a/sci-chemistry/babel/Manifest
+++ b/sci-chemistry/babel/Manifest
@@ -1,7 +1,9 @@
 AUX 10babel 27 RMD160 b63901d7aae926d444049c6fa6bac6a09faa6642 SHA1 35bdc79adecc8c2f050a104bec276e1504ef180e SHA256 9635640dab2a697d6a2fa5ea57d43181983de444c021d28e510deecd17a5034a
 AUX babel-1.6-gcc32.diff 549 RMD160 23a188f6a1f9d26b33644e8732c504ee6e9478d1 SHA1 a93852d0a4cb784fe84eda449619fa208d9f7665 SHA256 d6440085242797decf8fa791b74d7c2227c9e01789458a684b054bbfd6d8ce7f
 AUX babel-1.6-gentoo.diff 569 RMD160 031ee771d49346976531d8e2f799842e58589fbd SHA1 80e7be957fdf81debab0204f0d6859a85a1acf10 SHA256 ea7e08b550186358ac4ecfb935d24be339dd52f35119789160fb6aa3bc72a8d0
+AUX babel-1.6-makefile.patch 716 RMD160 59e300ca8ccd6314bc4b913bdb725e97abbc9bd7 SHA1 50e7601e8cbaafa73fedb37b0a76b71b02cf3f9e SHA256 3328dee8ca60a98667c3789899e741cca95aeefd7a67c1211840482ea38ad244
 DIST babel-1.6.tar.Z 242341 RMD160 4a6dbd960ed9eef2088e8b32e627ed563fb6ddab SHA1 a5439d19c696373772f0785474cc7b53226163f9 SHA256 132a800cfe0c15b47391c809481a7ca174bbd1402aac7486e0973da0fd4db948
-EBUILD babel-1.6.ebuild 919 RMD160 c7826ff55f8dbf6cb340643b30a3a7593779c90a SHA1 600344de91102ed545755d91264704e5e6f510c6 SHA256 22761fcb6bbaf7e79376a81ed8221a1a735cbcf89bccc9ada3a2faabacf40f5d
-MISC ChangeLog 1998 RMD160 db12205e6aca24e04b13c8836ead03ffb748ac9c SHA1 b97266e7e671eaffa4e945f50153220553199033 SHA256 ff545f149cd784a70f64a8b69891f92b19f3445d11543d4d1fdb3d8cd8cf8fba
+EBUILD babel-1.6-r1.ebuild 996 RMD160 bc690af9401f37be3d7fa9bc133421d9a36903b7 SHA1 c55b7a99583dd1ddac2151eea565e1b58861db68 SHA256 00ed89c9650027537ff2bac2cb91fefe2dd7d77bbaef4a8e5cd5f0cb598722de
+EBUILD babel-1.6.ebuild 930 RMD160 81c815d3c4e26b2521bb38e5588f2542d8fff126 SHA1 13a7d95715b23bba84e3f0d661871e34a8805fc1 SHA256 99d5b637c25f0b61861b3dde24d94cac851e5897acf4a2e9960ecfa254c2997f
+MISC ChangeLog 2277 RMD160 5f25afcf68e8ee73fa2bae592b021da28df1afbc SHA1 32b8c6c4b1cf97c1cbd52a9e65727e934a810b18 SHA256 b373382c095b50b9504ad326cf8a3d6e153b8555a9d3147ebb9b7ca3f7fe01b6
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/babel/babel-1.6-r1.ebuild b/sci-chemistry/babel/babel-1.6-r1.ebuild
new file mode 100644
index 000000000000..4d7c9e1420e7
--- /dev/null
+++ b/sci-chemistry/babel/babel-1.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6-r1.ebuild,v 1.1 2008/10/19 14:53:11 markusle Exp $
+
+inherit eutils
+
+DESCRIPTION="Babel is a program to interconvert file formats used in molecular modeling."
+
+SRC_URI="http://smog.com/chem/babel/files/${P}.tar.Z"
+HOMEPAGE="http://smog.com/chem/babel/"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+SLOT="0"
+LICENSE="as-is"
+IUSE=""
+
+#Doesn't really seem to depend on anything (?)
+DEPEND="!sci-chemistry/openbabel"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc32.diff
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	CC=$(tc-getCC) emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}"/usr/bin install || die
+
+	insinto /usr/share/${PN}
+	doins *.lis || die "Failed to install *.lis files"
+
+	doenvd "${FILESDIR}"/10babel || die "doenvd failed"
+	dodoc README.1ST || die "dodoc failed"
+}
diff --git a/sci-chemistry/babel/babel-1.6.ebuild b/sci-chemistry/babel/babel-1.6.ebuild
index c5b00a140629..4cef63df75d0 100644
--- a/sci-chemistry/babel/babel-1.6.ebuild
+++ b/sci-chemistry/babel/babel-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6.ebuild,v 1.4 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/babel/babel-1.6.ebuild,v 1.5 2008/10/19 14:53:11 markusle Exp $
 
 inherit eutils
 
@@ -20,10 +20,10 @@ DEPEND="!sci-chemistry/openbabel"
 src_unpack() {
 
 	unpack ${P}.tar.Z
-	cd ${S}
+	cd "${S}"
 #Patch the Makefile for gentoo-isms
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-gcc32.diff
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-gcc32.diff
 
 }
 
@@ -35,12 +35,12 @@ src_compile() {
 
 src_install () {
 
-	make DESTDIR=${D}/usr/bin install || die
+	make DESTDIR="${D}"/usr/bin install || die
 
 	insinto /usr/share/${PN}
-	doins ${S}/*.lis
+	doins "${S}"/*.lis
 
-	doenvd ${FILESDIR}/10babel
+	doenvd "${FILESDIR}"/10babel
 
 	dodoc README.1ST
 
diff --git a/sci-chemistry/babel/files/babel-1.6-makefile.patch b/sci-chemistry/babel/files/babel-1.6-makefile.patch
new file mode 100644
index 000000000000..33b158d1b2cf
--- /dev/null
+++ b/sci-chemistry/babel/files/babel-1.6-makefile.patch
@@ -0,0 +1,33 @@
+diff -Naur babel-1.6/Makefile babel-1.6.new/Makefile
+--- babel-1.6/Makefile	1997-01-21 10:53:05.000000000 -0500
++++ babel-1.6.new/Makefile	2008-10-19 10:41:42.000000000 -0400
+@@ -1,12 +1,16 @@
+-CFLAGS        = -O 
++#Commented out to pull CFLAGS from make.conf
++#CFLAGS        = -O 
+ 
+ LIBFLAGS      = -O -DLIBRARY 
+ 
+-CC	      = cc
++#Probably not necessary to specify gcc
++#CC	      = gcc
+ 
+ PROGRAM	      = babel
+ 
+-LDFLAGS	      =
++DEST          = ${DESTDIR}/$(PROGRAM)
++
++#LDFLAGS	      =
+ 
+ LIBS	      =
+ 
+@@ -334,7 +338,8 @@
+ index:;		ctags -wx $(HDRS) $(SRCS)
+ 
+ install:	$(PROGRAM)
+-		install -s $(PROGRAM) $(DEST)
++		install -d ${DESTDIR}
++		install $(PROGRAM) $(DEST)
+ 
+ print:;		$(PRINT) $(HDRS) $(SRCS)
+