Version bump. Remove old

(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)

3 files changed, 17 insertions, 61 deletions

diff --git a/sci-electronics/irsim/ChangeLog b/sci-electronics/irsim/ChangeLog
index e0056362a038..f94e62117670 100644
--- a/sci-electronics/irsim/ChangeLog
+++ b/sci-electronics/irsim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/irsim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/irsim/ChangeLog,v 1.3 2013/01/21 09:28:16 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/irsim/ChangeLog,v 1.4 2014/08/12 04:30:10 tomjbe Exp $
+
+*irsim-9.7.87 (12 Aug 2014)
+
+  12 Aug 2014; Thomas Beierlein <tomjbe@gentoo.org> -irsim-9.7.72.ebuild,
+  -irsim-9.7.74.ebuild, +irsim-9.7.87.ebuild:
+  Version bump. Remove old
 
 *irsim-9.7.79 (21 Jan 2013)
 
diff --git a/sci-electronics/irsim/irsim-9.7.72.ebuild b/sci-electronics/irsim/irsim-9.7.72.ebuild
deleted file mode 100644
index 7f4119d544ef..000000000000
--- a/sci-electronics/irsim/irsim-9.7.72.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/irsim/irsim-9.7.72.ebuild,v 1.1 2011/04/26 18:07:29 tomjbe Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="IRSIM is a \"switch-level\" simulator"
-HOMEPAGE="http://opencircuitdesign.com/irsim/"
-SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=" dev-lang/tcl
-	dev-lang/tk"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_prepare() {
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
-	CPP="cpp" econf --libdir=/usr/share
-	cd ..
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die
-	dodoc README || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You will probably need to add to your ~/.Xdefaults"
-	einfo "the following line:"
-	einfo "irsim.background: black"
-	einfo
-	einfo "This is needed because Gentoo from default sets a"
-	einfo "grey background which makes impossible to see the"
-	einfo "simulation (white line on light gray background)."
-	einfo
-}
diff --git a/sci-electronics/irsim/irsim-9.7.74.ebuild b/sci-electronics/irsim/irsim-9.7.87.ebuild
index 5d44db510be2..147a839bc295 100644
--- a/sci-electronics/irsim/irsim-9.7.74.ebuild
+++ b/sci-electronics/irsim/irsim-9.7.87.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/irsim/irsim-9.7.74.ebuild,v 1.1 2012/06/13 13:07:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/irsim/irsim-9.7.87.ebuild,v 1.1 2014/08/12 04:30:10 tomjbe Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="IRSIM is a \"switch-level\" simulator"
 HOMEPAGE="http://opencircuitdesign.com/irsim/"
@@ -21,20 +21,20 @@ DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
 src_prepare() {
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
 	epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch
 }
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
 	cd scripts
-	CPP="cpp" econf --libdir=/usr/share
-	cd ..
+	#tc-export CPP
+	econf
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die
-	dodoc README || die
+	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
+	dodoc README
 }
 
 pkg_postinst() {