Revision bump to 3.8.1, bug 305523.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 246 insertions, 12 deletions

diff --git a/app-emulation/simh/ChangeLog b/app-emulation/simh/ChangeLog
index 65e253e37880..6508210f5550 100644
--- a/app-emulation/simh/ChangeLog
+++ b/app-emulation/simh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/simh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.12 2010/01/15 02:26:32 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.13 2010/11/21 03:57:46 mattst88 Exp $
+
+*simh-3.8.1 (21 Nov 2010)
+
+  21 Nov 2010; <mattst88@gentoo.org> +simh-3.8.1.ebuild,
+  +files/simh-3.8.1-asneeded.patch, +files/simh-3.8.1-makefile.patch:
+  Revision bump to 3.8.1, bug #305523.
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org> simh-3.7.0.ebuild:
   Add prefix keywords
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index a54f4de3eed2..cc5fc43b6594 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX makefile.patch 383 RMD160 90fc07b498c797a5b69bacfc0cb5c73b9ef2465b SHA1 d9e815a9610c8ddf8ada2826df3716a353e2d5c1 SHA256 89004ead180b37dc02a5e1121e61fd88b1c8cb9dbcc4b7ed13b72a3d1a69eb65
 AUX simh-3.7.0-asneeded.patch 5154 RMD160 bb8625b7bf9fe219b1149c2e916639ed50bf5df7 SHA1 6c1dfc14364b4c3157cbaaf3d0e54709e0ef4409 SHA256 c263c722db83e42480d5c074e1bd5cba696430941f9fd85aeaf756ce2a62d82f
+AUX simh-3.8.1-asneeded.patch 5201 RMD160 13d2db46bbb2b581110a50c14de90bdb9d175a70 SHA1 d17a74f5f34bb5460a637d38f0a1e92e0024d07d SHA256 e0cd06d2052df9e51ff9f4b06e66bf6ca49f59bacec65d4890319ad227a7e8cf
+AUX simh-3.8.1-makefile.patch 402 RMD160 f0193a8b082c4b4027ed19aaf03523701e134371 SHA1 001d619240394b847dc2162d9c0641ef6960bcb1 SHA256 18b124a5ffad265ef90ff7b4d94d147af589073d5f1f6e2dcd6221797f57831d
 DIST simhv33-0.zip 2153444 RMD160 778cc7836b4558b57f1b9ca54427f3d2e8da94a4 SHA1 99a021afe2fd8dfb32bb479e383347e2b883e0f9 SHA256 28fcdc8443f6e2460193eb6ed8d41be95d75226490926219a0dfd5028eaf051c
 DIST simhv35-2.zip 2259795 RMD160 27d3a95689aed7f0781137dbf158ba87716d04b3 SHA1 f0a3926ee0a4d0f275df3fa092f9982bd4521479 SHA256 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb
 DIST simhv37-0.zip 2362666 RMD160 7ecd3177d17c871a4b33fae13111fa0a19678511 SHA1 e24a777d98026dcb745c0a06203e9a96f4d0fc30 SHA256 23ae538b7607d231d9e64c170b7a4cc7b7c9d0c1c8bbd662c565ac0a56d15069
+DIST simhv38-1.zip 2954982 RMD160 f085c52ec92425f84f65b3f3605cb7aba8be7b32 SHA1 5eac2f8e50be11600727983e05072690a7066702 SHA256 4fe294fa5285b1d6d0bd69f60889c00e518ce2be5f00abc2bd4adfa8daa85b06
 EBUILD simh-3.3.0.ebuild 1113 RMD160 b074564a005039434a04bf2d2cb702b8773f9f0b SHA1 da3776b4d48ae999b081634e3426e1bf71151278 SHA256 1f86ed3ace478ad1850c161a66a3590b3d6fc30f50cb0c4845030f1b77e6baaf
 EBUILD simh-3.5.2.ebuild 1117 RMD160 6a489694541577042b09c2fdf5613104c367f84c SHA1 52195637bb51cf156d1d6f89866b626135e8e457 SHA256 bcd4137c676671a78747b67bceec611e861240b4eadc4e0061a9549b1dd4aea5
 EBUILD simh-3.7.0.ebuild 1312 RMD160 b600aba728978343b6dff195bd2eeb7d4e57dc13 SHA1 d8dfed29737f7950aea084634672ad33b39bb01d SHA256 5174a7d7799a3202125ca0ed03aeba6f2d24df24d7b2d079d74a9aade3cf3305
-MISC ChangeLog 1775 RMD160 80f16dc411a5ae7a38a913d13340b50846b4f535 SHA1 0a09a497768219f67a6354225c1b6dfda8ee814f SHA256 780cfbb383e3ddaf98c2f215479bfbc0fd2d5706215ae38204f6aea1d980c3e5
+EBUILD simh-3.8.1.ebuild 1321 RMD160 8cd0877764ddb2ee80042bf510f36b2131a40638 SHA1 51ab6ce654bfe8695024cd178aadab8ef9233d58 SHA256 f8cb74067d6500f76fd4604b5303176527a4ffa978ace18563e36de0b58591f7
+MISC ChangeLog 1973 RMD160 f268eeddb441994993d46f2b8c23df3c4f248ea1 SHA1 b9e4fc5f0283021f1ab4efaaa81e6db7313e066b SHA256 89b0670b54ac841136571c28aae4114d8d6bf2a10aa1c3b13a4bebca4a90356c
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktP0l4ACgkQOypDUo0oQOrEZQCgn5RP9zaUqmJpcLj3/wAsUUBN
-x/sAmwaFgYzM5eulrbf3+1nwrnvH/rWs
-=harV
------END PGP SIGNATURE-----
diff --git a/app-emulation/simh/files/simh-3.8.1-asneeded.patch b/app-emulation/simh/files/simh-3.8.1-asneeded.patch
new file mode 100644
index 000000000000..8843d3412a3b
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.8.1-asneeded.patch
@@ -0,0 +1,168 @@
+--- makefile.orig	2010-09-07 15:30:17.000000000 -0400
++++ makefile	2010-09-07 15:31:37.000000000 -0400
+@@ -12,7 +12,8 @@
+       OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+     endif
+   endif
+-  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
++  CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I . $(CFLAGS)
++  LIBS = -lm -lrt
+   ifeq ($(USE_NETWORK),)
+   else
+     NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
+@@ -274,129 +275,129 @@
+ pdp1 : ${BIN}pdp1${EXE}
+ 
+ ${BIN}pdp1${EXE} : ${PDP1} ${SIM}
+-	${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP1} ${SIM} ${PDP1_OPT} -o $@ $(LIBS)
+ 
+ pdp4 : ${BIN}pdp4${EXE}
+ 
+ ${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ $(LIBS)
+ 
+ pdp7 : ${BIN}pdp7${EXE}
+ 
+ ${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ $(LIBS)
+ 
+ pdp8 : ${BIN}pdp8${EXE}
+ 
+ ${BIN}pdp8${EXE} : ${PDP8} ${SIM}
+-	${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP8} ${SIM} ${PDP8_OPT} -o $@ $(LIBS)
+ 
+ pdp9 : ${BIN}pdp9${EXE}
+ 
+ ${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ $(LIBS)
+ 
+ pdp15 : ${BIN}pdp15${EXE}
+ 
+ ${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ $(LIBS)
+ 
+ pdp10 : ${BIN}pdp10${EXE}
+ 
+ ${BIN}pdp10${EXE} : ${PDP10} ${SIM}
+-	${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP10} ${SIM} ${PDP10_OPT} -o $@ $(LIBS)
+ 
+ pdp11 : ${BIN}pdp11${EXE}
+ 
+ ${BIN}pdp11${EXE} : ${PDP11} ${SIM}
+-	${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${PDP11} ${SIM} ${PDP11_OPT} -o $@ $(LIBS)
+ 
+ vax : ${BIN}vax${EXE}
+ 
+ ${BIN}vax${EXE} : ${VAX} ${SIM}
+-	${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${VAX} ${SIM} ${VAX_OPT} -o $@ $(LIBS)
+ 
+ vax780 : ${BIN}vax780${EXE}
+ 
+ ${BIN}vax780${EXE} : ${VAX780} ${SIM}
+-	${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${VAX780} ${SIM} ${VAX780_OPT} -o $@ $(LIBS)
+ 
+ nova : ${BIN}nova${EXE}
+ 
+ ${BIN}nova${EXE} : ${NOVA} ${SIM}
+-	${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${NOVA} ${SIM} ${NOVA_OPT} -o $@ $(LIBS)
+ 
+ eclipse : ${BIN}eclipse${EXE}
+ 
+ ${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
+-	${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ $(LIBS)
+ 
+ h316 : ${BIN}h316${EXE}
+ 
+ ${BIN}h316${EXE} : ${H316} ${SIM}
+-	${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${H316} ${SIM} ${H316_OPT} -o $@ $(LIBS)
+ 
+ hp2100 : ${BIN}hp2100${EXE}
+ 
+ ${BIN}hp2100${EXE} : ${HP2100} ${SIM}
+-	${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${HP2100} ${SIM} ${HP2100_OPT} -o $@ $(LIBS)
+ 
+ i1401 : ${BIN}i1401${EXE}
+ 
+ ${BIN}i1401${EXE} : ${I1401} ${SIM}
+-	${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${I1401} ${SIM} ${I1401_OPT} -o $@ $(LIBS)
+ 
+ i1620 : ${BIN}i1620${EXE}
+ 
+ ${BIN}i1620${EXE} : ${I1620} ${SIM}
+-	${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${I1620} ${SIM} ${I1620_OPT} -o $@ $(LIBS)
+ 
+ i7094 : ${BIN}i7094${EXE}
+ 
+ ${BIN}i7094${EXE} : ${I7094} ${SIM}
+-	${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${I7094} ${SIM} ${I7094_OPT} -o $@ $(LIBS)
+ 
+ ibm1130 : ${BIN}ibm1130${EXE}
+ 
+ ${BIN}ibm1130${EXE} : ${IBM1130}
+-	${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ $(LIBS)
+ 
+ s3 : ${BIN}s3${EXE}
+ 
+ ${BIN}s3${EXE} : ${S3} ${SIM}
+-	${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${S3} ${SIM} ${S3_OPT} -o $@ $(LIBS)
+ 
+ altair : ${BIN}altair${EXE}
+ 
+ ${BIN}altair${EXE} : ${ALTAIR} ${SIM}
+-	${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ $(LIBS)
+ 
+ altairz80 : ${BIN}altairz80${EXE}
+ 
+ ${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM} 
+-	${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ $(LIBS)
+ 
+ gri : ${BIN}gri${EXE}
+ 
+ ${BIN}gri${EXE} : ${GRI} ${SIM}
+-	${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${GRI} ${SIM} ${GRI_OPT} -o $@ $(LIBS)
+ 
+ lgp : ${BIN}lgp${EXE}
+ 
+ ${BIN}lgp${EXE} : ${LGP} ${SIM}
+-	${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${LGP} ${SIM} ${LGP_OPT} -o $@ $(LIBS)
+ 
+ id16 : ${BIN}id16${EXE}
+ 
+ ${BIN}id16${EXE} : ${ID16} ${SIM}
+-	${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${ID16} ${SIM} ${ID16_OPT} -o $@ $(LIBS)
+ 
+ id32 : ${BIN}id32${EXE}
+ 
+ ${BIN}id32${EXE} : ${ID32} ${SIM}
+-	${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${ID32} ${SIM} ${ID32_OPT} -o $@ $(LIBS)
+ 
+ sds : ${BIN}sds${EXE}
+ 
+ ${BIN}sds${EXE} : ${SDS} ${SIM}
+-	${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
++	${CC} $(LDFLAGS) ${SDS} ${SIM} ${SDS_OPT} -o $@ $(LIBS)
diff --git a/app-emulation/simh/files/simh-3.8.1-makefile.patch b/app-emulation/simh/files/simh-3.8.1-makefile.patch
new file mode 100644
index 000000000000..612a4afce2c9
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.8.1-makefile.patch
@@ -0,0 +1,11 @@
+--- makefile.orig	2010-09-07 15:05:01.000000000 -0400
++++ makefile	2010-09-07 15:05:19.000000000 -0400
+@@ -15,7 +15,7 @@
+   CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
+   ifeq ($(USE_NETWORK),)
+   else
+-    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
++    NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
+   endif
+ else
+   #Win32 Environments
diff --git a/app-emulation/simh/simh-3.8.1.ebuild b/app-emulation/simh/simh-3.8.1.ebuild
new file mode 100644
index 000000000000..c5b5104b4a30
--- /dev/null
+++ b/app-emulation/simh/simh-3.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.8.1.ebuild,v 1.1 2010/11/21 03:57:46 mattst88 Exp $
+
+inherit eutils toolchain-funcs versionator
+
+MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)"
+DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
+HOMEPAGE="http://simh.trailing-edge.com/"
+SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+MAKEOPTS="USE_NETWORK=1 ${MAKEOPTS}"
+
+src_unpack() {
+	mkdir "${WORKDIR}/BIN"
+	unpack ${A}
+
+	# convert makefile from dos format to unix format
+	edos2unix makefile
+
+	epatch "${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-asneeded.patch"
+
+	# fix linking on Darwin
+	[[ ${CHOST} == *-darwin* ]] && sed -i 's/-lrt//g' makefile
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "make failed"
+}
+
+src_install() {
+	cd "${S}/BIN"
+	for BINFILE in *; do
+		newbin ${BINFILE} "simh-${BINFILE}"
+	done
+
+	cd "${S}"
+	dodir /usr/share/simh
+	insinto /usr/share/simh
+	doins VAX/*.bin
+	dodoc *.txt */*.txt
+}