Version bump and proxy-maint (bug 416173, thanks Alex Buell), EAPI-4, respect LDFLAGS, ebuild cleanups.

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

6 files changed, 113 insertions, 13 deletions

diff --git a/app-emulation/simh/ChangeLog b/app-emulation/simh/ChangeLog
index 77af90699038..35a11451f8ee 100644
--- a/app-emulation/simh/ChangeLog
+++ b/app-emulation/simh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/simh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.15 2012/05/10 14:56:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.16 2012/05/19 09:52:52 xmw Exp $
+
+*simh-3.9.0 (19 May 2012)
+
+  19 May 2012; Michael Weber <xmw@gentoo.org> +simh-3.9.0.ebuild,
+  +files/simh-3.9.0-fix-mkdir-race.patch,
+  +files/simh-3.9.0-respect-FLAGS.patch, metadata.xml:
+  Version bump and proxy-maint (bug 416173, thanks Alex Buell), EAPI-4, respect
+  LDFLAGS, ebuild cleanups.
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -simh-3.5.2.ebuild,
   -simh-3.7.0.ebuild:
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index 784f9e931027..a60e907e13f4 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
+AUX simh-3.9.0-fix-mkdir-race.patch 324 RMD160 cbca66791c5676d856ac05825888b3ad24fd07c8 SHA1 2589c4c709552feeb7eaa9e00d0dc8dca54ff56e SHA256 2b61593be4ed5983382ebb406a0079a10fbf5932aae18d151495f0d888294c03
+AUX simh-3.9.0-respect-FLAGS.patch 336 RMD160 f53cf6dfb8ff78832b8e3797edc6c3d11ec00962 SHA1 267d82234ccbaf490d8711fe2557721a0c7e0dd5 SHA256 32b8f0bff0c3083911b688f00027b343a9a4b35819b09a4081295379f56be9bb
 DIST simhv33-0.zip 2153444 RMD160 778cc7836b4558b57f1b9ca54427f3d2e8da94a4 SHA1 99a021afe2fd8dfb32bb479e383347e2b883e0f9 SHA256 28fcdc8443f6e2460193eb6ed8d41be95d75226490926219a0dfd5028eaf051c
 DIST simhv38-1.zip 2954982 RMD160 f085c52ec92425f84f65b3f3605cb7aba8be7b32 SHA1 5eac2f8e50be11600727983e05072690a7066702 SHA256 4fe294fa5285b1d6d0bd69f60889c00e518ce2be5f00abc2bd4adfa8daa85b06
+DIST simhv39-0.zip 3103657 RMD160 a464e7d1fc6d58dd23a3ef623c3c018d5d60b050 SHA1 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb SHA256 e49b259b66ad6311ca9066dee3d3693cd915106a6938a52ed685cdbada8eda3b
 EBUILD simh-3.3.0.ebuild 1113 RMD160 b074564a005039434a04bf2d2cb702b8773f9f0b SHA1 da3776b4d48ae999b081634e3426e1bf71151278 SHA256 1f86ed3ace478ad1850c161a66a3590b3d6fc30f50cb0c4845030f1b77e6baaf
 EBUILD simh-3.8.1.ebuild 1323 RMD160 f5ea4f95347cbea0b98455a0d349688f69bac336 SHA1 02874d989a97df3711e56e6b05208d9694f14b4b SHA256 57138a959414a717ac8dcece5775ad2d95049bf56dc0c592537e441943013a73
-MISC ChangeLog 2176 RMD160 1857abe84ec964d5bb1f1a4a236b9d58f0635c0f SHA1 1c63fa547067dcb506dca65c79fe0f1fbb3a3d22 SHA256 3bcb664120cd0de8e7c0f4ef538cdfca713fe8989d8cf136dc21745998bd9df3
-MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
+EBUILD simh-3.9.0.ebuild 1466 RMD160 423b52f975b945358a59ca9ba71c719265e3c1ef SHA1 001a31534d37785a1798a50e25c630c7c15a408f SHA256 c4bd829408a23073f7d8379182fa2ffd54f3f71e99fc320a04137bfe82f8ce85
+MISC ChangeLog 2475 RMD160 9ba852a4c9f4d546e9d897c5a90e6a2481f364b5 SHA1 451ae1c1a834491e8d8c8ef168e4f3b72ae1f14c SHA256 e3e677bbcb01f5b2f38869cdaeb35e8224791d30aa6a7b1e0f48bc772c3253b1
+MISC metadata.xml 464 RMD160 12789a601d741b288bd3c984204a8ded0b1d8e3c SHA1 508dac038ccc5bf2c0485512bb6e630badd57d29 SHA256 91af9a0ed02ad19ff9942413e46c7025ceaa50301791b51d62acf563ed48c38e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPq9c7AAoJEOTDgjZ80txd4EcH/0TbP0RXdHe1KdYzVJwmKqAh
-uY+hmZwVt3FpU/u3wX1IADa9WomZccaUaRZA7yYaHYU8UsRAI6b95HscLcwl6a4B
-ydo9KiQkNlqo7tuapJpFFeUIQ2tYaWupEOJn9IVUKNJSrfNLNE3wEAoGtw/yFyl6
-xo/bYUlqXS/wuryW+7rnIz7IL9tu0QOhT53nBozUcPrtHryiNScqOQmNkbVnsKXT
-2Y5aIV8e7/9xJGkCfgvKwEU0gMYlnBxj+xubHLt17TV/wc/uXbN0BCEVzbWZgfGm
-kcKQSRKESPPx916xEM7DigYvlrb/nAbHIFI9ozVfFMAjcEqXuQ6kb/t1HL75ga0=
-=rw8Q
+iF4EAREIAAYFAk+3bWwACgkQknrdDGLu8JAV5QEAkRjLnRAUPcoKi9M4h0Zv8pWS
+5Pjryb2IMAeRbyNsbhEBAJWyU2DGqd7+ieteoM3wZNOP1EO/3DgPA20hzJ6lmo/I
+=913E
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch b/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch
new file mode 100644
index 000000000000..3a2aae35207c
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch
@@ -0,0 +1,11 @@
+--- simh-3.9.0/makefile
++++ simh-3.9.0/makefile
+@@ -249,7 +249,7 @@
+     NETWORK_OPT = $(NETWORK_CCDEFS)
+   endif
+   ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi))
+-    MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi
++    MKDIRBIN = mkdir -p BIN
+   endif
+ else
+   #Win32 Environments (via MinGW32)
diff --git a/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch b/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch
new file mode 100644
index 000000000000..0f7cd1d114ea
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch
@@ -0,0 +1,13 @@
+--- simh-3.9.0/makefile
++++ simh-3.9.0/makefile
+@@ -300,8 +300,8 @@
+   CFLAGS_O = -O0
+   BUILD_FEATURES = - debugging support
+ else
+-  CFLAGS_O = -O2
+-  LDFLAGS_O = 
++  CFLAGS_O ?= -O2
++  LDFLAGS_O ?= 
+   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
+   ifneq (3,$(GCC_MAJOR_VERSION))
+     ifeq (,$(GCC_OPTIMIZERS_CMD))
diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index f9d50da18d39..5380a02305af 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>alex.buell@munted.eu</email>
+		<name>Alex Buell</name>
+		<description>Proxy maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>CC him on bugs</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/simh/simh-3.9.0.ebuild b/app-emulation/simh/simh-3.9.0.ebuild
new file mode 100644
index 000000000000..b1437d9a54a3
--- /dev/null
+++ b/app-emulation/simh/simh-3.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0.ebuild,v 1.1 2012/05/19 09:52:52 xmw Exp $
+
+EAPI=4
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# convert makefile from dos format to unix format
+	edos2unix makefile
+
+	epatch "${FILESDIR}"/${P}-respect-FLAGS.patch \
+		"${FILESDIR}"/${P}-fix-mkdir-race.patch
+
+	# fix linking on Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -e 's/-lrt//g' \
+			-i makefile || die
+	fi
+}
+
+src_compile() {
+	export GCC="$(tc-getCC)"
+	export LDFLAGS_O="${LDFLAGS}"
+	export CFLAGS_O="${CFLAGS}"
+
+	local my_makeopts="USE_NETWORK=1"
+	if [ "$(gcc-major-version)" -le "4" -a "$(gcc-minor-version)" -lt "6" ] ; then
+		my_makeopts+=" NO_LTO=1"
+	fi
+
+	emake ${my_makeopts}
+}
+
+src_install() {
+	for BINFILE in BIN/* ; do
+		newbin ${BINFILE} "simh-${BINFILE}"
+	done
+
+	insinto /usr/share/simh
+	doins VAX/*.bin
+
+	dodoc *.txt */*.txt
+}