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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 103 insertions, 3 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/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
+}