Respect LDFLAGS wrt bug 336190. Thanks to Diego for the report. Fix implicit function declarations, quote S, add missing RDEPEND.

Package-Manager: portage-2.2_rc73/cvs/Linux x86_64

4 files changed, 49 insertions, 7 deletions

diff --git a/sci-chemistry/elem/ChangeLog b/sci-chemistry/elem/ChangeLog
index 22f1c83bb4c1..8495d7adfcad 100644
--- a/sci-chemistry/elem/ChangeLog
+++ b/sci-chemistry/elem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/elem
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/elem/ChangeLog,v 1.9 2006/10/05 21:13:41 gustavoz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/elem/ChangeLog,v 1.10 2010/09/06 12:44:01 xarthisius Exp $
+
+  06 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> elem-1.0.3-r1.ebuild,
+  +elem-1.0.3-r2.ebuild:
+  Respect LDFLAGS wrt bug 336190. Thanks to Diego for the report. Fix
+  implicit function declarations, quote S, add missing RDEPEND.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> elem-1.0.3-r1.ebuild:
   Stable on sparc
diff --git a/sci-chemistry/elem/Manifest b/sci-chemistry/elem/Manifest
index e08360d58dc4..b594259174b3 100644
--- a/sci-chemistry/elem/Manifest
+++ b/sci-chemistry/elem/Manifest
@@ -1,4 +1,5 @@
 DIST elem-src-1.0.3-Linux.tgz 58364 RMD160 c3c6e64f37ff10564fe569c2b8dbd624a610b1e7 SHA1 4932b03fbe219073d7eefddb167f49f712072004 SHA256 a570736165b939841a9dbf273110a6c01ddfd77559e5b020574aad8e3f5af296
-EBUILD elem-1.0.3-r1.ebuild 763 RMD160 dee6bbd8a544c84cb96313916495716b9dcdce5b SHA1 741d4638468510d39bcab4e7779e85af6c2e6d88 SHA256 bd038ac4a9a58d62842ff71ee02af8187081fc849a6acb12859c2fa08a4624d2
-MISC ChangeLog 2073 RMD160 e5c456d38793af8ba97613acc26ea796503a523f SHA1 e80e19eed4cf38e9c2479b2dde4c5bac77a93484 SHA256 672487fae2253087d3b3b089ab4a10f2ad90dfb403ddb7ab529eae25b4f15a2c
+EBUILD elem-1.0.3-r1.ebuild 786 RMD160 2d9aca4aadf066164dae896cc56a7eb10a2ebec6 SHA1 a97e03bfe6dd1b43c17b017200991dbe29908bec SHA256 8205a82bb24a3cc6c9b0797a937066d0bf7729813d5677a36f99adf9b9ff7b17
+EBUILD elem-1.0.3-r2.ebuild 919 RMD160 631d283b9ccb8fe008be07ce68b9b3da8bd8e579 SHA1 ed07357ef43c22885e092c77b1d27f3404576ba8 SHA256 74292d5660863e053915486e5ebfbd0b82f2b50bb29c1bdb455dc1b5708f972d
+MISC ChangeLog 2312 RMD160 02407290da92876573ab5eb2e40d57909589a861 SHA1 fabd0e4675954b6ebdcb3a231341f5e383c98d2c SHA256 30239c8e7345157b970e47adc5dfe4b9a0b7e3ce962fa4598d91b095029b5b87
 MISC metadata.xml 230 RMD160 2c8da160f3f5942fdc823263cf090099a1599009 SHA1 47728420c356a98d20dca24e1f0896a78f3777a8 SHA256 bc8c6f58ce6e0075edad50bf365a62659f062030ac0f93b105d192f8be182e6e
diff --git a/sci-chemistry/elem/elem-1.0.3-r1.ebuild b/sci-chemistry/elem/elem-1.0.3-r1.ebuild
index 9ff3e0ded10e..d17c4675c7de 100644
--- a/sci-chemistry/elem/elem-1.0.3-r1.ebuild
+++ b/sci-chemistry/elem/elem-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/elem/elem-1.0.3-r1.ebuild,v 1.6 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/elem/elem-1.0.3-r1.ebuild,v 1.7 2010/09/06 12:44:01 xarthisius Exp $
 
 inherit toolchain-funcs
 
@@ -13,10 +13,11 @@ SLOT="0"
 IUSE=""
 
 DEPEND="x11-libs/xforms"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -e 's:\(^LIBS = .*\):\1 -lXpm:' -i Makefile || die "sed failed"
 }
 
diff --git a/sci-chemistry/elem/elem-1.0.3-r2.ebuild b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..78522eef8235
--- /dev/null
+++ b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/elem/elem-1.0.3-r2.ebuild,v 1.3 2010/09/06 12:44:01 xarthisius Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="periodic table of the elements"
+HOMEPAGE="http://elem.sourceforge.net/"
+SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}-Linux.tgz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="x11-libs/xforms"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's:\(^LIBS = .*\):\1 -lXpm:' \
+		-e "s:\${FLAGS} -o elem:\$(LDFLAGS) &:" \
+		-i Makefile || die #336190
+	sed -e "/string.h/ i #include <stdlib.h>" \
+		-i elem_cb.c || die #implicit exit()
+}
+
+src_compile () {
+	emake COMPILER="$(tc-getCC)" FLAGS="${CFLAGS}" all || die "Build failed."
+}
+
+src_install () {
+	dobin elem elem-de elem-en || die
+	dohtml -r doc/* || die
+}