Fixing #70057, using CFLAGS and toolchain-funcs getCC now.

6 files changed, 46 insertions, 42 deletions

diff --git a/app-sci/elem/ChangeLog b/app-sci/elem/ChangeLog
index ddaf1c79e9d1..c8558355148c 100644
--- a/app-sci/elem/ChangeLog
+++ b/app-sci/elem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/elem
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/elem/ChangeLog,v 1.7 2004/07/01 19:38:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/elem/ChangeLog,v 1.8 2004/11/08 11:40:47 phosphan Exp $
+
+*elem-1.0.3-r1 (08 Nov 2004)
+
+  08 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> -elem-1.0.1.ebuild,
+  +elem-1.0.3-r1.ebuild:
+  Now explicitly links with libXpm (bug #70057), uses user-defined CFLAGS and
+  gets the compiler name via toolchain-funcs.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> elem-1.0.1.ebuild,
   elem-1.0.3.ebuild:
diff --git a/app-sci/elem/Manifest b/app-sci/elem/Manifest
index db59c0404149..8acbfe08412e 100644
--- a/app-sci/elem/Manifest
+++ b/app-sci/elem/Manifest
@@ -1,6 +1,6 @@
 MD5 b2d4d22245b4b18baf584bdf78193321 elem-1.0.3.ebuild 594
-MD5 792865644b3fdff5331c8543e3564b63 elem-1.0.1.ebuild 763
-MD5 eebf9704973f7cb6d809ad9006fad2ed ChangeLog 829
+MD5 cf1e51090066e0cae1a1be4bd0cf6fbd elem-1.0.3-r1.ebuild 773
+MD5 dbb7cfc1ff6c56ddba81dc64f55fcb83 ChangeLog 1080
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 686a59fe4ed3cf4f51b63f52f27bf49f files/digest-elem-1.0.1 62
+MD5 2aff871a57515123e5580c4530d20c6e files/digest-elem-1.0.3-r1 68
 MD5 2aff871a57515123e5580c4530d20c6e files/digest-elem-1.0.3 68
diff --git a/app-sci/elem/elem-1.0.1.ebuild b/app-sci/elem/elem-1.0.1.ebuild
deleted file mode 100644
index 5371c0293569..000000000000
--- a/app-sci/elem/elem-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/elem/elem-1.0.1.ebuild,v 1.6 2004/07/01 11:50:56 eradicator Exp $
-
-DESCRIPTION="periodic table of the elements"
-HOMEPAGE="http://elem.sourceforge.net/"
-SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}.tgz"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="virtual/x11
-	virtual/libc
-	x11-libs/xforms"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	einfo "Modifying Makefile..."
-	sed -i -e 's:^LIBS.*:\0 -lXpm:' Makefile
-}
-
-src_compile () {
-	emake all || die "Build failed."
-}
-
-src_install () {
-	into /usr
-	dobin elem elem-de elem-en
-	dohtml -r doc/*
-}
-
diff --git a/app-sci/elem/elem-1.0.3-r1.ebuild b/app-sci/elem/elem-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..60135781df52
--- /dev/null
+++ b/app-sci/elem/elem-1.0.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/elem/elem-1.0.3-r1.ebuild,v 1.1 2004/11/08 11:40:47 phosphan 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="~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/x11
+	virtual/libc
+	x11-libs/xforms"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -e 's:\(^LIBS = .*\):\1 -lXpm:' -i Makefile || die "sed failed"
+}
+
+src_compile () {
+	emake COMPILER="$(tc-getCC)" FLAGS="${CFLAGS}" all || die "Build failed."
+}
+
+src_install () {
+	into /usr
+	dobin elem elem-de elem-en
+	dohtml -r doc/*
+}
+
diff --git a/app-sci/elem/files/digest-elem-1.0.1 b/app-sci/elem/files/digest-elem-1.0.1
deleted file mode 100644
index d58e886412c3..000000000000
--- a/app-sci/elem/files/digest-elem-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8dfa3869a265d34c88ae995b9de010a3 elem-src-1.0.1.tgz 54001
diff --git a/app-sci/elem/files/digest-elem-1.0.3-r1 b/app-sci/elem/files/digest-elem-1.0.3-r1
new file mode 100644
index 000000000000..a8318de43361
--- /dev/null
+++ b/app-sci/elem/files/digest-elem-1.0.3-r1
@@ -0,0 +1 @@
+MD5 7fb16c092430380d08772bd82ca590cb elem-src-1.0.3-Linux.tgz 58364