[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2021-04-01 Thread Sam James
commit: d9bf4ffc7dbce29041e670e2462001998dd8c417
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  1 01:54:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  1 21:17:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9bf4ffc

app-emulation/spim: EAPI 7, MissingInherits (desktop)

Closes: https://bugs.gentoo.org/726562
Signed-off-by: Sam James  gentoo.org>

 app-emulation/spim/spim-8.0-r3.ebuild | 32 ++--
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/app-emulation/spim/spim-8.0-r3.ebuild 
b/app-emulation/spim/spim-8.0-r3.ebuild
index 2b2aacf0d76..05f6fcdf21f 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="MIPS Simulator"
 HOMEPAGE="http://spimsimulator.sourceforge.net/";
@@ -16,23 +17,26 @@ IUSE="doc X"
 RDEPEND="
X? (
media-fonts/font-adobe-100dpi
-   x11-libs/libXaw )
-"
-DEPEND="${RDEPEND}
-   X? (
-   x11-base/xorg-proto
-   x11-misc/imake
+   x11-libs/libXaw
)
+"
+DEPEND="
+   ${RDEPEND}
+   X? ( x11-base/xorg-proto )
+"
+BDEPEND="
sys-devel/bison
+   X? ( x11-misc/imake )
 "
+
 # test hangs forever, disabling it
 RESTRICT="test"
 
 src_prepare() {
-   # fix bugs 240005 and 243588
+   # fix bug #240005 and bug #243588
eapply "${FILESDIR}/${P}-r1-respect_env.patch"
 
-   #fix bug 330389
+   # fix bug #330389
sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
 
default
@@ -56,6 +60,10 @@ src_compile() {
fi
 }
 
+src_test() {
+   emake -C spim test
+}
+
 src_install() {
emake DESTDIR="${ED}" -C spim install
newman Documentation/spim.man spim.1
@@ -74,7 +82,3 @@ src_install() {
dodoc Documentation/TeX/{cycle,spim}.ps
fi
 }
-
-src_test() {
-   emake -C spim test
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2021-01-06 Thread Fabian Groffen
commit: 3bb380c5a4798b22f0da2022a8456d1239483c5d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 13:08:20 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 13:08:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb380c5

app-emulation/spim: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-emulation/spim/spim-8.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/spim/spim-8.0-r3.ebuild 
b/app-emulation/spim/spim-8.0-r3.ebuild
index 2717b50ee23..2b2aacf0d76 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2018-04-01 Thread Matt Turner
commit: 946b1b30ffb96ce7430f23f535b213255a16c9a0
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  1 23:39:39 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  1 23:39:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946b1b30

app-emulation/spim: Drop old

Closes: https://bugs.gentoo.org/649142

 app-emulation/spim/spim-8.0-r2.ebuild | 77 ---
 1 file changed, 77 deletions(-)

diff --git a/app-emulation/spim/spim-8.0-r2.ebuild 
b/app-emulation/spim/spim-8.0-r2.ebuild
deleted file mode 100644
index 6de0890b3f0..000
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/";
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc X"
-
-RDEPEND="X? ( media-fonts/font-adobe-100dpi
-   x11-libs/libXaw
-   x11-libs/libXp )"
-DEPEND="${RDEPEND}
-   X? ( x11-misc/imake
-   x11-proto/xproto )
-   >=sys-apps/sed-4
-   sys-devel/bison"
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-   # fix bugs 240005 and 243588
-   eapply "${FILESDIR}/${P}-r1-respect_env.patch"
-
-   #fix bug 330389
-   sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-
-   default
-}
-
-src_configure() {
-   tc-export CC
-   emake -C spim configuration
-
-   if use X; then
-   emake -C xspim configuration
-   fi
-}
-
-src_compile() {
-   emake DESTDIR="${EPREFIX}" -C spim
-
-   if use X; then
-   emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-   -C xspim -j1 xspim
-   fi
-}
-
-src_install() {
-   emake DESTDIR="${ED}" -C spim install
-   newman Documentation/spim.man spim.1
-
-   if use X; then
-   emake DESTDIR="${ED}" -C xspim install
-   newman Documentation/xspim.man xspim.1
-   fi
-
-   doicon "${FILESDIR}"/xspim.svg
-   make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-   dodoc Documentation/SPIM.html
-   dodoc ChangeLog Documentation/BLURB README VERSION
-   if use doc ; then
-   dodoc Documentation/TeX/{cycle,spim}.ps
-   fi
-}
-
-src_test() {
-   emake -C spim test
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2018-04-01 Thread Matt Turner
commit: 7d7edf68f6cbd3d72c9b94e5f56df44afc1e3823
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  1 23:39:16 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  1 23:39:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7edf68

app-emulation/spim-8.0-r3: x86 stable, bug 649142

 app-emulation/spim/spim-8.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/spim/spim-8.0-r3.ebuild 
b/app-emulation/spim/spim-8.0-r3.ebuild
index 59f7db32139..00776564c32 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2018-04-01 Thread Matt Turner
commit: 897a9e095ff5a88a68783b5b6d20559cf776e610
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  1 23:39:15 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  1 23:39:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897a9e09

app-emulation/spim-8.0-r3: amd64 stable, bug 649142

 app-emulation/spim/spim-8.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/spim/spim-8.0-r3.ebuild 
b/app-emulation/spim/spim-8.0-r3.ebuild
index 9fe7e6643e1..59f7db32139 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2018-04-01 Thread Matt Turner
commit: 35e01caba6fb82876c1a9e1b512ec049a6d76c96
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  1 23:35:56 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  1 23:35:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e01cab

app-emulation/spim: Drop stable ppc keywords

 app-emulation/spim/spim-8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/spim/spim-8.0-r2.ebuild 
b/app-emulation/spim/spim-8.0-r2.ebuild
index c50eac72bf8..6de0890b3f0 100644
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="X? ( media-fonts/font-adobe-100dpi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2018-03-01 Thread Pacho Ramos
commit: f0ae2e3b62c5fdcb8744ad258030550faf1849b3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Mar  1 18:21:02 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Mar  1 18:28:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ae2e3b

app-emulation/spim: x11-libs/libXp is not really needed

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-emulation/spim/spim-8.0-r3.ebuild | 78 +++
 1 file changed, 78 insertions(+)

diff --git a/app-emulation/spim/spim-8.0-r3.ebuild 
b/app-emulation/spim/spim-8.0-r3.ebuild
new file mode 100644
index 000..9fe7e6643e1
--- /dev/null
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="MIPS Simulator"
+HOMEPAGE="http://spimsimulator.sourceforge.net/";
+SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+IUSE="doc X"
+
+RDEPEND="
+   X? (
+   media-fonts/font-adobe-100dpi
+   x11-libs/libXaw )
+"
+DEPEND="${RDEPEND}
+   X? ( x11-misc/imake
+   x11-proto/xproto )
+   sys-devel/bison
+"
+# test hangs forever, disabling it
+RESTRICT="test"
+
+src_prepare() {
+   # fix bugs 240005 and 243588
+   eapply "${FILESDIR}/${P}-r1-respect_env.patch"
+
+   #fix bug 330389
+   sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
+
+   default
+}
+
+src_configure() {
+   tc-export CC
+   emake -C spim configuration
+
+   if use X; then
+   emake -C xspim configuration
+   fi
+}
+
+src_compile() {
+   emake DESTDIR="${EPREFIX}" -C spim
+
+   if use X; then
+   emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
+   -C xspim -j1 xspim
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${ED}" -C spim install
+   newman Documentation/spim.man spim.1
+
+   if use X; then
+   emake DESTDIR="${ED}" -C xspim install
+   newman Documentation/xspim.man xspim.1
+   fi
+
+   doicon "${FILESDIR}"/xspim.svg
+   make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
+
+   dodoc Documentation/SPIM.html
+   dodoc ChangeLog Documentation/BLURB README VERSION
+   if use doc ; then
+   dodoc Documentation/TeX/{cycle,spim}.ps
+   fi
+}
+
+src_test() {
+   emake -C spim test
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2017-12-17 Thread Mikle Kolyada
commit: 220d9ab2d24bab5fb119278963d8b2007939bdfa
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Dec 17 12:28:15 2017 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Dec 17 12:28:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220d9ab2

app-emulation/spim: remove old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-emulation/spim/spim-8.0-r1.ebuild | 75 ---
 1 file changed, 75 deletions(-)

diff --git a/app-emulation/spim/spim-8.0-r1.ebuild 
b/app-emulation/spim/spim-8.0-r1.ebuild
deleted file mode 100644
index afb39577ff4..000
--- a/app-emulation/spim/spim-8.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/";
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc X"
-
-RDEPEND="X? ( media-fonts/font-adobe-100dpi
-   x11-libs/libXaw
-   x11-libs/libXp )"
-DEPEND="${RDEPEND}
-   X? ( x11-misc/imake
-   x11-proto/xproto )
-   >=sys-apps/sed-4
-   sys-devel/bison"
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-   # fix bugs 240005 and 243588
-   epatch "${FILESDIR}/${PF}-respect_env.patch"
-
-   #fix bug 330389
-   sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-}
-
-src_configure() {
-   tc-export CC
-   emake -C spim configuration || die
-
-   if use X; then
-   emake -C xspim configuration || die
-   fi
-}
-
-src_compile() {
-   emake DESTDIR="${EPREFIX}" -C spim || die
-
-   if use X; then
-   emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-   -C xspim -j1 xspim || die
-   fi
-}
-
-src_install() {
-   emake DESTDIR="${ED}" -C spim install || die
-   newman Documentation/spim.man spim.1 || die
-
-   if use X; then
-   emake DESTDIR="${ED}" -C xspim install || die
-   newman Documentation/xspim.man xspim.1 || die
-   fi
-
-   doicon "${FILESDIR}"/xspim.svg || die
-   make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-   dohtml Documentation/SPIM.html || die
-   dodoc ChangeLog Documentation/BLURB README VERSION || die
-   if use doc ; then
-   dodoc Documentation/TeX/{cycle,spim}.ps || die
-   fi
-}
-
-src_test() {
-   emake -C spim test || die
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2017-12-16 Thread Tobias Klausmann
commit: 7460238b8ed8a6b9a138c9a6358bb6acc7630944
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Dec 16 14:18:11 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Dec 16 17:23:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7460238b

app-emulation/spim-8.0-r2: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/638650

 app-emulation/spim/spim-8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/spim/spim-8.0-r2.ebuild 
b/app-emulation/spim/spim-8.0-r2.ebuild
index 59443a28c92..c50eac72bf8 100644
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="X? ( media-fonts/font-adobe-100dpi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2017-11-26 Thread Sergei Trofimovich
commit: eeb78d57007daffb9a0d12edf1ae9844f9116834
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 26 11:25:42 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 26 12:17:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb78d57

app-emulation/spim: stable 8.0-r2 for ppc, bug #638650

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 app-emulation/spim/spim-8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/spim/spim-8.0-r2.ebuild 
b/app-emulation/spim/spim-8.0-r2.ebuild
index 4b8e0b1872d..186dc730441 100644
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="~amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="X? ( media-fonts/font-adobe-100dpi



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/, app-emulation/spim/files/

2017-06-11 Thread Andreas Hüttel
commit: cf64b2b19c3e1c49e58a24981d347e17c17ef81a
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jun 11 15:03:55 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Jun 11 15:15:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf64b2b1

app-emulation/spim: EAPI bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../spim/files/spim-8.0-r1-respect_env.patch   |  8 +--
 app-emulation/spim/spim-8.0-r2.ebuild  | 77 ++
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/app-emulation/spim/files/spim-8.0-r1-respect_env.patch 
b/app-emulation/spim/files/spim-8.0-r1-respect_env.patch
index c7c8925c4e5..2d2ca0cf0f3 100644
--- a/app-emulation/spim/files/spim-8.0-r1-respect_env.patch
+++ b/app-emulation/spim/files/spim-8.0-r1-respect_env.patch
@@ -1,5 +1,5 @@
 spim/Makefile  2010-08-01 22:14:53.352906061 +0200
-+++ spim/Makefile  2010-08-01 22:15:00.994905920 +0200
+--- a/spim/Makefile2010-08-01 22:14:53.352906061 +0200
 b/spim/Makefile2010-08-01 22:15:00.994905920 +0200
 @@ -66,13 +66,13 @@
  
  
@@ -92,8 +92,8 @@
  
  very-clean: clean
rm -f configuration
 xspim/Makefile 2010-08-01 22:14:53.351905921 +0200
-+++ xspim/Makefile 2010-08-01 22:26:08.361917058 +0200
+--- a/xspim/Makefile   2010-08-01 22:14:53.351905921 +0200
 b/xspim/Makefile   2010-08-01 22:26:08.361917058 +0200
 @@ -169,18 +169,18 @@
  
   VARDBDIR = $(VARDIR)/lib

diff --git a/app-emulation/spim/spim-8.0-r2.ebuild 
b/app-emulation/spim/spim-8.0-r2.ebuild
new file mode 100644
index 000..4b8e0b1872d
--- /dev/null
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MIPS Simulator"
+HOMEPAGE="http://spimsimulator.sourceforge.net/";
+SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+IUSE="doc X"
+
+RDEPEND="X? ( media-fonts/font-adobe-100dpi
+   x11-libs/libXaw
+   x11-libs/libXp )"
+DEPEND="${RDEPEND}
+   X? ( x11-misc/imake
+   x11-proto/xproto )
+   >=sys-apps/sed-4
+   sys-devel/bison"
+# test hangs forever, disabling it
+RESTRICT="test"
+
+src_prepare() {
+   # fix bugs 240005 and 243588
+   eapply "${FILESDIR}/${P}-r1-respect_env.patch"
+
+   #fix bug 330389
+   sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
+
+   default
+}
+
+src_configure() {
+   tc-export CC
+   emake -C spim configuration
+
+   if use X; then
+   emake -C xspim configuration
+   fi
+}
+
+src_compile() {
+   emake DESTDIR="${EPREFIX}" -C spim
+
+   if use X; then
+   emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
+   -C xspim -j1 xspim
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${ED}" -C spim install
+   newman Documentation/spim.man spim.1
+
+   if use X; then
+   emake DESTDIR="${ED}" -C xspim install
+   newman Documentation/xspim.man xspim.1
+   fi
+
+   doicon "${FILESDIR}"/xspim.svg
+   make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
+
+   dodoc Documentation/SPIM.html
+   dodoc ChangeLog Documentation/BLURB README VERSION
+   if use doc ; then
+   dodoc Documentation/TeX/{cycle,spim}.ps
+   fi
+}
+
+src_test() {
+   emake -C spim test
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/spim/

2016-02-01 Thread Hanno Boeck
commit: 4240f1b91cfa7e131af4b841fdf81e42f396b5d0
Author: Hanno  gentoo  org>
AuthorDate: Mon Feb  1 15:26:56 2016 +
Commit: Hanno Boeck  gentoo  org>
CommitDate: Mon Feb  1 15:27:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4240f1b9

app-emulation/spim: Disable test (hangs forever) and avoid invalid desktop file

Package-Manager: portage-2.2.27

 app-emulation/spim/spim-8.0-r1.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-emulation/spim/spim-8.0-r1.ebuild 
b/app-emulation/spim/spim-8.0-r1.ebuild
index f00ca7f..fb0b06b 100644
--- a/app-emulation/spim/spim-8.0-r1.ebuild
+++ b/app-emulation/spim/spim-8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
x11-proto/xproto )
>=sys-apps/sed-4
sys-devel/bison"
+# test hangs forever, disabling it
+RESTRICT="test"
 
 src_prepare() {
# fix bugs 240005 and 243588
@@ -60,8 +62,7 @@ src_install() {
fi
 
doicon "${FILESDIR}"/xspim.svg || die
-   make_desktop_entry xspim xSPIM xspim 
"ComputerScience;Science;Education" \
-   "Comment=Graphical MIPS32 Assembly language emulator"
+   make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
 
dohtml Documentation/SPIM.html || die
dodoc ChangeLog Documentation/BLURB README VERSION || die