Version bump to the GNS3 community release. All the hard patching work done by Jan Bednar in bug #365049; ported to EAPI=3.

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

4 files changed, 160 insertions, 7 deletions

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index 5b329f0859a9..7b92b9ded7d6 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/dynamips
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.4 2010/10/17 13:51:26 chainsaw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.5 2011/05/17 09:22:37 chainsaw Exp $
+
+*dynamips-0.2.8_rc3 (17 May 2011)
+
+  17 May 2011; Tony Vroon <chainsaw@gentoo.org> +dynamips-0.2.8_rc3.ebuild,
+  +files/dynamips-0.2.8_rc3-makefile.patch:
+  Version bump to the GNS3 community release. All the hard patching work done
+  by Jan Bednar in bug #365049; ported to EAPI=3.
 
   17 Oct 2010; <chainsaw@gentoo.org>
   files/dynamips-0.2.8_rc2-makefile.patch:
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index f4923fa8f573..c3287217d112 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX dynamips-0.2.8_rc2-makefile.patch 1773 RMD160 6799b87c9236d9fbbe585ae1938cacb438ad1572 SHA1 1dbf96a2accc93a418a14c6d50b8a84f1e746f0b SHA256 a56705bdd163a94100230229ea161457364520c58595fd26e8e9d4131e47a6f9
+AUX dynamips-0.2.8_rc3-makefile.patch 3057 RMD160 e794b35861d108db6cfc391731500aca6afbc3d3 SHA1 4837709a433dc785189719eb5b4bd45fbbb55038 SHA256 2881ccf2aad32e1adf3cd1f92e28f0671bdf9d79191a2c7bb887149bbc6615e6
 DIST dynamips-0.2.8-RC2.tar.gz 578935 RMD160 0447a4c0cf516bd2b63259881c7625e26d0d838f SHA1 349270690996a1e260b3eceb51ea90f94c25a59e SHA256 a8b377ce631119e285c401fdb7cb4d0bcc600a15508bdffcf337546957e252de
+DIST dynamips-0.2.8-RC3-community.tar.gz 818199 RMD160 bf53f4c987feb99db13c0e2098e7de81962dee05 SHA1 ed7138859e6bc381ae0cf0d2620b32099845847c SHA256 e808a50b6b9d24a90604885f90699f46b26a49e6ce9cf542aa288f135b2508ac
 EBUILD dynamips-0.2.8_rc2-r1.ebuild 1205 RMD160 43466906c210d7fe715d8272c66de35b2c9dafe6 SHA1 bf39e4bfa345f620d1bcc92f9bf70f4ce76aeec0 SHA256 fcf1f6aaa5a77f7d2927795a3faa737d120133f40081664980c8ca233f79ef0c
-MISC ChangeLog 1103 RMD160 7fc1c84886c202763ad8e19c873ac0c978c5a72b SHA1 3f388818651500c03e18e46c016447771c98cd86 SHA256 035b70c6524ca3ac2be59cca1623b266d0229fc2dd1489b6ae20f04229f082b2
+EBUILD dynamips-0.2.8_rc3.ebuild 1753 RMD160 64a0a9e490638be89cf8bcc18c4bde6b8ebd415b SHA1 c5d73bdc670214c849a44ebc17b15158fff32106 SHA256 33a8886a1bc0681477fb7eaf446f36b3a56a28bcb1ca3d3259c280cbfff825db
+MISC ChangeLog 1387 RMD160 565085e6c71d095f4f9c5512dc7034d6db20889b SHA1 4d9bc213bb28d39d8e6c085801387ab9c5865654 SHA256 23b492a3e28a8e002fcc6ac49133aef31193a33f7a781d0c4ae1d281ceb4fce9
 MISC metadata.xml 250 RMD160 6bbdc9d6d979eae6d4ec2a7f5294ef09611d9dbc SHA1 765762962967f3eb41eb2f6a74dec6b80e3d0cbe SHA256 8f7792a007816fa31c4b25268b5cf224c15ceef5dfef8bd45c56c70295cdc4e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAky6/2oACgkQp5vW4rUFj5rj1QCXdN19CnTd8jHV0fxY0yYLgMTm
-MgCguqN7qn+zqZ6tbNbpMYojy4ibBnY=
-=rdZc
+iEYEARECAAYFAk3SPloACgkQp5vW4rUFj5pzyACeJ4s9wwCjgnSEs5Eii2bE+z9C
+FIoAoLUoUli4w2kAn5fVn9ovONXj38c5
+=fQ7o
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild b/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild
new file mode 100644
index 000000000000..2f7798539e1d
--- /dev/null
+++ b/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild,v 1.1 2011/05/17 09:22:37 chainsaw Exp $
+
+EAPI=3
+inherit base
+
+MY_P="${P/_rc/-RC}-community"
+MY_PV="${PV/_rc/-RC}-community"
+
+DESCRIPTION="Cisco 7200/3600 Simulator"
+HOMEPAGE="http://www.gns3.net/content/dynamips-028-rc3-community-version-released"
+SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-libs/elfutils
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	if use amd64; then
+		ebegin "Adjusting Makefiles for AMD64"
+		sed -i \
+			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=amd64:g' \
+			Makefile || die "Failed to optimise for AMD64; stage 1"
+		sed -i \
+			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=amd64:g' \
+			stable/Makefile || die "Failed to optimise for AMD64; stage 2"
+		eend $?
+	elif use x86; then
+		ebegin "Adjusting Makefiles for X86"
+		sed -i \
+			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=x86:g' \
+			Makefile || die "Failed to optimise for X86; stage 1"
+		sed -i \
+			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=x86:g' \
+			stable/Makefile || die "Failed to optimise for X86; stage 2"
+		eend $?
+	fi
+}
+
+src_install () {
+	newbin dynamips.stable dynamips \
+		|| die "Installing main binary failed"
+	dobin stable/nvram_export \
+		|| die "Installing support binaries failed"
+	doman dynamips.1 hypervisor_mode.7 nvram_export.1 \
+		|| die "Installing man pages failed"
+	dodoc TODO README README.community README.hypervisor \
+		|| die "Installing docs failed"
+}
diff --git a/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch
new file mode 100644
index 000000000000..ad74cfa25007
--- /dev/null
+++ b/app-emulation/dynamips/files/dynamips-0.2.8_rc3-makefile.patch
@@ -0,0 +1,83 @@
+diff -uNr dynamips-0.2.8-RC3-community.ORIG//Makefile dynamips-0.2.8-RC3-community/Makefile
+--- dynamips-0.2.8-RC3-community.ORIG//Makefile	2011-05-17 10:12:54.777002689 +0100
++++ dynamips-0.2.8-RC3-community/Makefile	2011-05-17 10:13:22.408002704 +0100
+@@ -5,7 +5,7 @@
+ #   - Use "amd64" for a build on x86_64 (64-bits)
+ #   - Use "ppc32" for a build on powerpc (32-bits)
+ #   - Use "nojit" for unsupported architectures.
+-export DYNAMIPS_ARCH?=x86
++export DYNAMIPS_ARCH?=nojit
+ 
+ # Do you want to use lib (for 32 bit compiling) or lib64
+ export DYNAMIPS_LIB?=lib
+diff -uNr dynamips-0.2.8-RC3-community.ORIG//stable/Makefile dynamips-0.2.8-RC3-community/stable/Makefile
+--- dynamips-0.2.8-RC3-community.ORIG//stable/Makefile	2011-05-17 10:12:54.776002689 +0100
++++ dynamips-0.2.8-RC3-community/stable/Makefile	2011-05-17 10:15:53.143002781 +0100
+@@ -3,13 +3,9 @@
+ 
+ # Replace x86 by amd64 for a build on x86_64.
+ # Use "nojit" for architectures that are not x86 or x86_64.
+-DYNAMIPS_ARCH?=x86
++DYNAMIPS_ARCH?=nojit
+ #DYNAMIPS_ARCH?=amd64
+ 
+-ifeq ($(DYNAMIPS_ARCH),ppc32)
+-DYNAMIPS_ARCH=x86
+-endif
+-
+ # Do you want to use lib (for 32 bit compiling) or lib64
+ DYNAMIPS_LIB?=lib
+ 
+@@ -51,7 +47,7 @@
+ PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
+ OSNAME=unknown
+ 
+-CFLAGS+= $(INCLUDE) -Wall -O3 -fomit-frame-pointer \
++CFLAGS+= $(INCLUDE) -Wall -Wno-strict-aliasing \
+ 	-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
+ 	-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
+ 	-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
+@@ -247,19 +243,19 @@
+ $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \
+ 	$(LEX_C) $(C_OBJS) $(A_OBJS)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
++	@$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
+ 
+ udp_send$(BIN_EXT): udp_send.c net.c crc.c
+ 	@echo "Linking $@"
+-	@$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS)
++	@$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS)
+ 
+ udp_recv$(BIN_EXT): udp_recv.c net.c crc.c
+ 	@echo "Linking $@"
+-	@$(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
++	@$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
+ 
+ rom2c$(BIN_EXT): rom2c.c
+ 	@echo "Linking $@"
+-	@$(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS)
++	@$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ $< $(LIBS)
+ 
+ mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode
+ 	@./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
+@@ -269,15 +265,17 @@
+ 
+ asmdefs$(BIN_EXT): asmdefs.c mips64.h
+ 	@echo "Linking $@"
+-	@$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
++	@$(CC) -Wall $(LDFLAGS) $(CFLAGS) -o $@ asmdefs.c
+ 
+ asmdefs.h: asmdefs$(BIN_EXT)
+ 	@echo "Building assembly definitions header file"
+ 	@./asmdefs
+ 
++dev_rom.o: mips64_microcode_dump.inc ppc32_microcode_dump.inc
++
+ nvram_export$(BIN_EXT): nvram_export.c
+ 	@echo "Linking $@"
+-	@$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ $<
++	@$(CC) $(LDFLAGS) -Wall $(CFLAGS) $(INCLUDE) -o $@ ../common/nvram_export.c
+ 
+ install: $(PROG) nvram_export
+ 	@echo "Installing"