Version bump, wrt bug #511914, thanks to Aaron Bauman <aaron AT flappyport.com>. Drop old version

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 40 insertions, 109 deletions

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index a7e7de9a2183..0be991a60059 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/dynamips
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.12 2013/10/20 07:24:02 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.13 2014/06/13 18:10:46 pinkbyte Exp $
+
+*dynamips-0.2.12 (13 Jun 2014)
+
+  13 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -dynamips-0.2.8-r1.ebuild,
+  +dynamips-0.2.12.ebuild, -files/dynamips-0.2.8-makefile.patch,
+  +files/dynamips-0.2.12-makefile.patch:
+  Version bump, wrt bug #511914, thanks to Aaron Bauman <aaron AT
+  flappyport.com>. Drop old version
 
 *dynamips-0.2.10 (20 Oct 2013)
 
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index c598b6576170..6e8fd4fd12b4 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA256
 
 AUX dynamips-0.2.10-makefile.patch 1724 SHA256 2b3e04a4a4a9e6a8791f9ae15a50371e63c5f724745bedc9047943881a8fd131 SHA512 e74c67ee4f83dfd2cea75b98814a3284c7fd2d105b2498f4323a8d6cf30d4e08e478b7eff6a9b22e711308be2fd62ee26973d15f2b5382f015a69b8448e95aff WHIRLPOOL 79641a8f12898a8b883cd4e073d03e4821d1b30ec29b2e1731cb1cc52411154a049ca595dee840e5e2a14941495532ff97a2d6d3276faaba4b42282e02e24398
-AUX dynamips-0.2.8-makefile.patch 2639 SHA256 6c72cbb630e01bcd34b265b2208fda3b46d13afc9ea390e5828b5c9e8812669d SHA512 b50621391d20c1b652149b0844f09881bcc386d260ab3a07e700f82c3b438ee90c745507e1a9e3060d8bc6b3edb625f32d9e02fff12ba477d16ed0024c571279 WHIRLPOOL 7b99c98b7876e7fd27ef08045b00292a3c213e020c1f982a6c5bf7fe6ac07808b8286de647e6f9c0efc944225b18a67a81eabf10b1802ee02c27b62d49bc0aaa
+AUX dynamips-0.2.12-makefile.patch 458 SHA256 1ccdbd3f34ab61e66efd750d0508beeaebf7ba78408c93c572ee7ebe34a619ee SHA512 9f298052970a277221d9cf4a936290dcf832e633b72d860267128e898b882b3d84f6366a881ac736ba9e7c79639c3f429061c7c959f3d77121b36ff847eee91c WHIRLPOOL 1f0a821530fcda978a711392d1fbf09d42137d283d6443957ec9cc9eef8cf31f517ab383507013038aed8ff0c85d995ed2a55807add101d626dd8e1f2a4490e7
 DIST dynamips-0.2.10-source.zip 966018 SHA256 d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44 SHA512 41b1d5c22036e21ce9a518f117a64634a71deb0632777f813221ade14bafe6d84182224e28e67a676e87da677c83262a8ebe37fa6dee0290626c24e676341e35 WHIRLPOOL 0904214700b0f2e349a283189f65fcc21475b00690aa4a42aa17cbb837132b3a46f628dfd9dbb95e66a02078079baa372cc3baabbd3b3cbb582a4536e95895c8
-DIST dynamips-0.2.8-community.source.zip 959832 SHA256 e0735995cb2d634bb5b010e216c003e19975e819d3ebc1b6749470d0bde8240d SHA512 a7757d9c0eac76772cd6df39fd862e9cf5017fce55b3885b9877ce67580277c51b8d51dda458275a64197bea0c4db3a5ce32c68a229eb39b25bb42f0284b3efa WHIRLPOOL 8740b0c4fc1df24bf7b35f3909a3883ff398bab39584baf89364c50bdf9263739d45f77ab7df6349b2f1f582f833f5edc22c0e0e0a949bc34071830d988e7cd6
+DIST dynamips-0.2.12-source.zip 995877 SHA256 b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12 SHA512 08f388027e3234a44a75de77f30d6c96f0d881c4db60435a237f6ae6e3804872fda422ab11249f5c7283054f7d2d8466886dcd6056e59fc90802e67fa7cb8c55 WHIRLPOOL 2e627071914fe11ae20b7f00ba7b81b7bde95a008d84a1786e2f57ab07ec2a0d836218e72040b34f8badbefb289fceab2c5f7324bf5d5cfca0d433ed968dc6ae
 EBUILD dynamips-0.2.10.ebuild 1076 SHA256 02e457ccf319d47555a56d6e362a56f8c0a8e08ba55628ed50451881f7295ca1 SHA512 c4f9e9a15d7b61a7abd5e9f295655fb9076b47191c8509372be284cb63bf160433ae7393657f4c61304560a328710593b2c4e239672a685a0369af875b6ebf2a WHIRLPOOL 111f100d59ca6f1bd1bdb377f7cfe69e9ab29c05d04ef421a5b22c28e66cd3c456c14ebc8a10f96cbac80e8de516a3333c6c70e323cf945031e119fcfe74917f
-EBUILD dynamips-0.2.8-r1.ebuild 1190 SHA256 20dce26e7a8947207ed5bae69231da8906aa7f52f8c5911e5de68ee326fad4cc SHA512 c080529a7405edcf3153003067985c256f5a166f2e47d37d71aff4fabc498fd7d32ed259d4beef249f252f6d48f5708858d0706db3e4ec78da93722fedebd12b WHIRLPOOL 04767adf9b6ae70867b8e7e1795ace95cc17087a04cf9ae46d23aebacf77717ef838b38d29661685884723a76e440684886a7da88223b5fefbe6e455e99d2bbe
-MISC ChangeLog 2699 SHA256 a4b87d8b11f1276d804bd4c4d0cc066e9645eff764ad85cbd1bb2c5fa355a075 SHA512 3c94198821412c29acfcf0d511c12f962d3d944f0fd63ff40ae2f709fc3061040619b5f57ed210ce8f1cfdac02b6a3c21289e28dd68d68bd665d6baf0ad2b62b WHIRLPOOL 3d2c105af2a9c9fa75dab6477813850338f4b2e9a1e45d989d774301335cf2ab3a1a9625de93e32c86d3ed844599163742b8d09e92dae0c9de160d66106e2cfd
+EBUILD dynamips-0.2.12.ebuild 1050 SHA256 39ee3580c529e535b6fda007574ca33fe9961455e04e9ac49717889739fbe92b SHA512 d508e6e786f24285412aa3c49dbdceaf3f2e6c5cea4126654729076df724a60633f5809775d4cb90ff5646752ecd939d9802c0ef4e1640831c4d812bdc6d8886 WHIRLPOOL 04b002c856d69621641e80fb41826322460cfc13e62a4e6e35816180edcf788cf69e78bf4d37ee8e8b1301e29c33d1276bbd914215139ce13a768eb630bc20b2
+MISC ChangeLog 3017 SHA256 4e59f6022bc1d8a6d7dd5785f0a5e6dd0afeea68b5f47c61295bb321da02233f SHA512 39c164188e42505ee10ce0bcf9a9e64f3b1e87503f4b91bc2c723af19d65ab7ae845c758712a064b2060a88e04710131bc2caa2898a7f7ff3c1c591981043060 WHIRLPOOL 6410084e2a0f741d625ebadb347a8c2abb6a25420d764638d2c2989c11ab403a615a7cb23c488e3a1e1fbe21d56768dc3b05fc47a8341c8d59a777dfd3143820
 MISC metadata.xml 317 SHA256 8746edc9aae0113798d2e985befb7ea5e99b5822e660ff059b75784c727163a7 SHA512 11077591e3616bcafd58ca67976ba3c5b00748ff341ec3d04e473ec43666cbbaf90500814066b9d9cc15ea547b25c1d5038de1512bf403df927a7bca1cbc845d WHIRLPOOL fd726e4129625d250e4c03f1c3f7171a27f1e2fc1ac4b8534cc95ee1e80f51c2c0faf0afe61e2b6127100b63fa680afb6a0ad822bf026273dc5f9f756452a5cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSY4UXAAoJECo/aRed9267QPsH/2mPruAoExwpHX932xyoaeYI
-vE2a/p3rEwTnU41pwf4V8CK4LOPZKG1Ywr9LSvsnuKJhk+jSlGopHYJ3lL6QngUv
-fvvC0J6YDIzRssaxHWo9KT2AK7sPclkdMyS+J4DCeA5p2LA3Us1UqQ8g40x9LVZ/
-BzyG4FkHX2BiAiCZLJiFwmTUY9k+gPfiP5YiNGieuZEMdjYG77xHSn3Hw01igK+B
-eao80Rc/Nxlsc9oyrhr+EIC/0QDHdK64atYXQB51snH1B6M2J8z3D7eN2DztoRP8
-y3P8r3FHG5NlN2bOm5fHcf135/wZHoomdEKdLhymarJki1G/Z5BYwnEguUTU1rY=
-=NQ8j
+iQEcBAEBCAAGBQJTmz6nAAoJECo/aRed9267OTsH/iQIFEk1QIF9dt9vMRbctSqO
+M/CfPEE9ImSm+ITNDEs/2JDgYYycxEJXgMm7RtCqfQ2ysYLohhJ0ogL+wJZql0zn
+zg8F1bTHqpuS2lSFQ+82d6Myqac5IZygc/vrm7v2pL+qWhbcr3ORfYvjBpKJcgW3
+/o2qf2J+aM7swhSYv7fcJWcwYjl0z76qHFai16bT89glvhcqP5YGZo4H4uiFHWY6
+a8aroDzSaPcgOGZMFY8xQfflN68xlmdRhA0JZDnJgGiGVX600vUcPp7bgGujalnD
+aSrOjlF3KHuArV7bmTdnlbi6ivKpohVPxr3B+njtxEhlwslY1cntORgDI5ZpkX8=
+=PuGJ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dynamips/dynamips-0.2.8-r1.ebuild b/app-emulation/dynamips/dynamips-0.2.12.ebuild
index 9441bbb547ba..be898dc691d9 100644
--- a/app-emulation/dynamips/dynamips-0.2.8-r1.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.12.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2013/08/25 14:51:00 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.12.ebuild,v 1.1 2014/06/13 18:10:46 pinkbyte Exp $
 
 EAPI=5
 
 inherit eutils toolchain-funcs
 
-MY_PV="${PV/_rc/-RC}-community"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="Cisco 7200/3600 Simulator"
 HOMEPAGE="http://www.gns3.net/dynamips/"
-SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${MY_PV}/${MY_P}.source.zip"
+SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${P}-source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,18 +19,13 @@ DEPEND="app-arch/unzip
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.patch"
 
 	# enable verbose build
-	# do not link to libelf statically
 	sed -i \
 		-e 's/@$(CC)/$(CC)/g' \
-		-e 's:/usr/$(DYNAMIPS_LIB)/libelf.a:-lelf:' \
-		stable/Makefile || die 'sed on Makefile failed'
-	sed -i -e
+		stable/Makefile || die 'sed on stable/Makefile failed'
 	# respect compiler
 	tc-export CC
 
@@ -44,13 +36,13 @@ src_compile() {
 	if use amd64 || use x86; then
 		emake DYNAMIPS_ARCH="${ARCH}"
 	else
-		emake
+		emake DYNAMIS_ARCH="nojit"
 	fi
 }
 
 src_install () {
 	newbin dynamips.stable dynamips
-	dobin stable/nvram_export
+	newbin nvram_export.stable nvram_export
 	doman man/*
-	dodoc TODO README README.hypervisor
+	dodoc README README.hypervisor TODO
 }
diff --git a/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch
new file mode 100644
index 000000000000..431f2df8ac74
--- /dev/null
+++ b/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch
@@ -0,0 +1,11 @@
+--- stable/origMakefile	2014-03-27 18:17:28.000000000 -0400
++++ stable/Makefile	2014-05-30 18:07:28.164255039 -0400
+@@ -19,7 +19,7 @@
+ PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
+ OSNAME=unknown
+ 
+-CFLAGS+= $(INCLUDE) -Wall -O2 -fomit-frame-pointer \
++CFLAGS+= $(INCLUDE) -Wall \
+ 	-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) \
diff --git a/app-emulation/dynamips/files/dynamips-0.2.8-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.8-makefile.patch
deleted file mode 100644
index 74cf6bab6dfd..000000000000
--- a/app-emulation/dynamips/files/dynamips-0.2.8-makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- Makefile.orig	2013-07-15 19:11:55.048999907 +0400
-+++ Makefile	2013-07-15 19:12:14.256001068 +0400
-@@ -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
-
---- stable/Makefile.orig	2013-07-04 06:03:34.000000000 +0400
-+++ stable/Makefile	2013-07-15 19:15:04.000000000 +0400
-@@ -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 -O2 -fomit-frame-pointer \
-+CFLAGS+= $(INCLUDE) -Wall \
- 	-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 $(CFLAGS) $(LDFLAGS) -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 $(CFLAGS) $(LDFLAGS) -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 $(CFLAGS) $(LDFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
- 
- rom2c$(BIN_EXT): rom2c.c
- 	@echo "Linking $@"
--	@$(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS)
-+	@$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
- 
- mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode
- 	@./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
-@@ -272,7 +268,7 @@
- 
- asmdefs$(BIN_EXT): asmdefs.c mips64.h
- 	@echo "Linking $@"
--	@$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
-+	@$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o $@ asmdefs.c
- 
- asmdefs.h: asmdefs$(BIN_EXT)
- 	@echo "Building assembly definitions header file"
-@@ -280,7 +276,7 @@
- 
- nvram_export$(BIN_EXT): nvram_export.c
- 	@echo "Linking $@"
--	@$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ $<
-+	@$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ $<
- 
- install: $(PROG) nvram_export
- 	@echo "Installing"