Fix dependency on dev-libs/elfutils, wrt bug #480940. Drop old revision

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

6 files changed, 24 insertions, 121 deletions

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index c37a6ae0b8c1..bcd2ea9d0fa9 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2013/07/15 15:58:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.10 2013/08/25 14:32:16 pinkbyte Exp $
+
+  25 Aug 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -dynamips-0.2.8_rc2-r1.ebuild, dynamips-0.2.8_rc3.ebuild,
+  dynamips-0.2.8.ebuild, -files/dynamips-0.2.8_rc2-makefile.patch:
+  Fix dependency on dev-libs/elfutils, wrt bug #480940. Drop old revision
 
   15 Jul 2013; Sergey Popov <pinkbyte@gentoo.org>
   +files/dynamips-0.2.8-makefile.patch:
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index 81fd2c602b9f..5eff730c0b53 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -2,24 +2,21 @@
 Hash: SHA256
 
 AUX dynamips-0.2.8-makefile.patch 2639 SHA256 6c72cbb630e01bcd34b265b2208fda3b46d13afc9ea390e5828b5c9e8812669d SHA512 b50621391d20c1b652149b0844f09881bcc386d260ab3a07e700f82c3b438ee90c745507e1a9e3060d8bc6b3edb625f32d9e02fff12ba477d16ed0024c571279 WHIRLPOOL 7b99c98b7876e7fd27ef08045b00292a3c213e020c1f982a6c5bf7fe6ac07808b8286de647e6f9c0efc944225b18a67a81eabf10b1802ee02c27b62d49bc0aaa
-AUX dynamips-0.2.8_rc2-makefile.patch 1773 SHA256 a56705bdd163a94100230229ea161457364520c58595fd26e8e9d4131e47a6f9 SHA512 a53e66895717715d9b2be9b5cadb08e825cae02e530f253e71097d7d64e9bca6a285d8653a2defaf9867caf96c0d2dc4e7c7a023a510fc1b13159e31e717c387 WHIRLPOOL 4d804d61531e45d0f2335e23b88cbce048446039f9af1e000733e52745822d14802000d7af05b7b7f5e5adafe699ff271eeebbe983b5d3619f8256ba029ab4d1
 AUX dynamips-0.2.8_rc3-makefile.patch 3057 SHA256 2881ccf2aad32e1adf3cd1f92e28f0671bdf9d79191a2c7bb887149bbc6615e6 SHA512 0e5a4184e935165490aa00bf825d2c4b99fc2b7771b6b2727b4e8f3e1d80dc8552ba5f240f7e4a3fee88a2bf0ed146f67c1ffab59c3d928d18e85724595c7513 WHIRLPOOL df651f0a655511f5b724b2fb83e6e5dc0018cfad2a2204f57bec0e14e7580cab81f4fbd9cd4e2ffd354f2018683a77528c74b0ccac06a662ad41aae6a30fb4e1
-DIST dynamips-0.2.8-RC2.tar.gz 578935 SHA256 a8b377ce631119e285c401fdb7cb4d0bcc600a15508bdffcf337546957e252de SHA512 288a87f988f08009fcccb6cfff4af84db8f90160021340add5e8491becefcbd74fe52ebe77d9a6c1262493f0d9341e3a34c5a80e8cfa713b9e6fb885dff7c5ff WHIRLPOOL 2abaa108e5258ad5726b20f7be27ccc7f316e91c2108e8cc1c521d1d22bcc7fe0c9321ed391f2574a48dd95caac1d7c6f882409ae61cc3974bff7548e60c8df9
 DIST dynamips-0.2.8-RC3-community.tar.gz 818199 SHA256 e808a50b6b9d24a90604885f90699f46b26a49e6ce9cf542aa288f135b2508ac SHA512 8c6eee6b69fef204a3ac4d54c40e915a37fd67edc3be9bd4070f4953abfe683fe6e0c2d65aad6946fb893345c08a7569c27fd183d3a8762e1128be3daf769762 WHIRLPOOL b2441b01a8151bf8f4cbf297e57ea44ec59c66066689e37e416f7a7734fa648ee7e829b7622c5aa658648cd7fddc83c0cca635e64b31fa6efbffa8549ff3781d
 DIST dynamips-0.2.8-community.source.zip 959832 SHA256 e0735995cb2d634bb5b010e216c003e19975e819d3ebc1b6749470d0bde8240d SHA512 a7757d9c0eac76772cd6df39fd862e9cf5017fce55b3885b9877ce67580277c51b8d51dda458275a64197bea0c4db3a5ce32c68a229eb39b25bb42f0284b3efa WHIRLPOOL 8740b0c4fc1df24bf7b35f3909a3883ff398bab39584baf89364c50bdf9263739d45f77ab7df6349b2f1f582f833f5edc22c0e0e0a949bc34071830d988e7cd6
-EBUILD dynamips-0.2.8.ebuild 1084 SHA256 72f072bbc9aed07b9f28044c1b7ca3495495dcef5ead0a771158ed5aaebd5e7c SHA512 a790fd41f0b9d3001f7926bd32a3a3bd129e32d63c9f83cb07064b36da349dda3a6a43376e572677de5ed27745bed5816bf03eb309bcabfba6c2e3e66b42f782 WHIRLPOOL fe2d063e41ae83a028ada8c155fbe14f6cac0ce0e954195cf5af7e1f6903a8eb2cca5ec378f2b6b34c57e9f8a8b4bb14b367e1d77bf06d63f3d3b35f60eebff3
-EBUILD dynamips-0.2.8_rc2-r1.ebuild 1205 SHA256 fcf1f6aaa5a77f7d2927795a3faa737d120133f40081664980c8ca233f79ef0c SHA512 ff813567340074cfbbae33d30000b6c0e3a6373e3ba444687b1130c024db526704bce3ffcd7ee5bffbf3a7435ee7dc191592afa4b7abecc75fadb5fc3604082c WHIRLPOOL fed6954792882e03d541a5dc473453ed4688cd0d9e23afe998891c5b211bc338a9cfe4c3890a698f97616b602c4819c518c285de00edc4542836a3adbcad7f29
-EBUILD dynamips-0.2.8_rc3.ebuild 1706 SHA256 24bb7813dacec3b0be3edae035ac700410f07566eff4896d502a11fe8b633dc0 SHA512 87cd6c05cb566a7bfcb009c87b5e41dc97c0504d7bca40b593c3e352bb0919e13b9a04ac8789bae46434faec1b267f00f5d2d98741dd05d2fd5e47c0dc5fa38f WHIRLPOOL ab9a0db7b2c93e461ec28b806fd4fbac5e993c9617250024e60697c07350c7e18a174f4827a25a6d38c9113b20b140f282abddda32b51fb3f37367c59b32f9cb
-MISC ChangeLog 1945 SHA256 7a7fd254b97f2601fbffbaa871a77c0ad65647bff5bdeb46ef898025d926aa2a SHA512 44f7cb4b2a250b040c636947b07a2c8495404b4f6750eac7a8c694d4c60dfba5896956fd532c8bdddf7e8ded190ede3e2f42d4c28f816d54f677b18b2e14d4bd WHIRLPOOL 9e70bcc74ddaf186c51b4b0b8c2b5bb42322423cd338b9b92aa946809c8d897d3ccb4f6781e4abc67ff3e076d9795f4164975ff097c6c0f5a76b4e48ba4a6ca3
+EBUILD dynamips-0.2.8.ebuild 1100 SHA256 bbf66c07ed1ab75369f571d0c5cadb7904ce458d0d46ec02d799d54d03209434 SHA512 b7b41bca6c0c19cab2fd31d8effdbb5d9feb9e8594fc535722054e8200ce5ce6d1da69683696cdde0d6ad1600147b07a80422ad26da87b2660858cdaac8e553c WHIRLPOOL d5c2da6a3f53549030cf63b431d42c20ae85f95f7977d4b4aa8834b5b83d90c546c34d2bd74ffdade67b54892fbeab58b97114cc346933f4cfaa522ec589764a
+EBUILD dynamips-0.2.8_rc3.ebuild 1775 SHA256 c084a9b2c8fcabf311f4ea311fed56c37aec995a0dd5dacc5d99dad0484a8570 SHA512 326b0a1a66c39215096a74ecbddcec8ee0e3cf7b69e543ba6481683b537afbb676af555a5b6b01c86dbcc9c6b2831c7c1c30f4b79adea84723dbb626c4635a87 WHIRLPOOL 2bad699cf12ec09e47ea9191fe2427c61b7b94ca5fadd658dcc452c185d147796081cec75cec8a2965c4a4170b9bde4f187de847797da8c72a04732a497aa9ae
+MISC ChangeLog 2198 SHA256 4c27ca4be5921d357427bd192d7c222fc4703efc59bf79f759a86bc7c761158d SHA512 bff8e501397fe662dd06d127e0c73af947a2629b8e6370f483676b09a9919642682a3a4d39945c5fc46051c264bf8b32db712ad81d7b482bda0cce1b64a25f17 WHIRLPOOL 2fe79bafc3d815846a33ef206e057f757cbb52660caf2379d49e3adf54888e00a4e77ac4c6bf0ea8167074fde6acb774e92c79f68a2a095dd34ce374d8f1cc3b
 MISC metadata.xml 317 SHA256 8746edc9aae0113798d2e985befb7ea5e99b5822e660ff059b75784c727163a7 SHA512 11077591e3616bcafd58ca67976ba3c5b00748ff341ec3d04e473ec43666cbbaf90500814066b9d9cc15ea547b25c1d5038de1512bf403df927a7bca1cbc845d WHIRLPOOL fd726e4129625d250e4c03f1c3f7171a27f1e2fc1ac4b8534cc95ee1e80f51c2c0faf0afe61e2b6127100b63fa680afb6a0ad822bf026273dc5f9f756452a5cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR5BwLAAoJECo/aRed9267LKwH/1WU5AwAlG0tRFLDyaF9TIz8
-dWaKcLVuE4j3Dr7UgD8y7+HiII8GyvJx6sPulDZFEI5eBQYj4+21SS2NmdkxEmwc
-hHzKIaGMEr5F6wsGRmJ7538zQ7BvcHywNda5D2YYYDhRpi2KyVn9jjtVTdH5jihR
-F5sHdywArIxw2tW4vn/jrijNyqNy44160qExsiA8iB3tx6sH8/2xiy9jmd30OveH
-DOVmkpA52CszetSSBrh1CxYbA71UywJza7o/zc5F0vIZRRbM7ApvfOMjaYTtMYfJ
-iuVU4fbCFIXko/oIDyANz400lnCIC45jT1Mu1Emk0VENPjexL9wsGvqc7h0SSaI=
-=ZJvF
+iQEcBAEBCAAGBQJSGhV1AAoJECo/aRed9267R40IAMk7xYtBJbBJkD0UbugKjjyP
+GSB/K5RHOxUBxINinqvPx8pwZo8YxDX3lwZA3UH5xd+bRp4EIe/iQSUdhZ8rkezS
+vFnYbK7r4yPq1dO6QOH3nMxg4WCYFDE0iLMPGMPsNyMOefMfzVGcwSCgjRLM+W0+
+c9eaLOa6IyrHMrTzVGcg6j2rvb483BaexU8uLCBLLeFM9cIjgIFIVY4SSspo0gzp
+NVu0O7fJKMKPg207T3N0QfNO9GFmsLQ7cZfjCD0LURhN7V+ESwu/Z2RehvDD3h45
+Z/T6eiOk3pVftnJE8EExTFrMHi33O1sNtAD6BH+pIuHRWjPFYdFl19U7Qpv09YI=
+=QqcA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dynamips/dynamips-0.2.8.ebuild b/app-emulation/dynamips/dynamips-0.2.8.ebuild
index af66ae9d7ce1..2ebfe015bc26 100644
--- a/app-emulation/dynamips/dynamips-0.2.8.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/07/15 15:48:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.8.ebuild,v 1.2 2013/08/25 14:32:16 pinkbyte Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip
-	dev-libs/elfutils
+	dev-libs/elfutils[static-libs(+)]
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
diff --git a/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild b/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild
deleted file mode 100644
index 1e81331ec5dc..000000000000
--- a/app-emulation/dynamips/dynamips-0.2.8_rc2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 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_rc2-r1.ebuild,v 1.1 2010/10/17 12:58:02 chainsaw Exp $
-
-inherit eutils
-
-MY_P="${P/_rc/-RC}"
-
-DESCRIPTION="Cisco 7200/3600 Simulator"
-HOMEPAGE="http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator"
-SRC_URI="http://www.ipflow.utc.fr/${PN}/${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}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	if use amd64; then
-		sed -i \
-			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=amd64:g' \
-			Makefile || die "Failed to optimise for AMD64"
-	elif use amd64; then
-		sed -i \
-			-e 's:DYNAMIPS_ARCH?=nojit:DYNAMIPS_ARCH?=x86:g' \
-			Makefile || die "Failed to optimise for X86"
-	fi
-}
-
-src_install () {
-	dobin dynamips nvram_export \
-		|| die "Installing binaries failed"
-	doman dynamips.1 hypervisor_mode.7 nvram_export.1 \
-		|| die "Installing man pages failed"
-	dodoc ChangeLog TODO README README.hypervisor \
-		|| die "Installing docs failed"
-}
diff --git a/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild b/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild
index 09c7ba89fa1f..5a8c3be8e5fb 100644
--- a/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/05/05 02:58:28 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.8_rc3.ebuild,v 1.3 2013/08/25 14:32:16 pinkbyte Exp $
 
 EAPI=3
 inherit base
@@ -16,7 +16,10 @@ LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="dev-libs/elfutils
+DEPEND="|| (
+		<dev-libs/elfutils-0.154-r1
+		>=dev-libs/elfutils-0.154-r1[static-libs]
+	)
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
diff --git a/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch
deleted file mode 100644
index 1d19f4522a25..000000000000
--- a/app-emulation/dynamips/files/dynamips-0.2.8_rc2-makefile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -uNr dynamips-0.2.8-RC2.ORIG//Makefile dynamips-0.2.8-RC2/Makefile
---- dynamips-0.2.8-RC2.ORIG//Makefile	2010-10-17 13:50:01.000000000 +0100
-+++ dynamips-0.2.8-RC2/Makefile	2010-10-17 13:50:57.000000000 +0100
-@@ -3,7 +3,7 @@
- 
- # 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
- 
- # Change this to 0 if your system doesn't support RFC 2553 extensions
- HAS_RFC2553?=1
-@@ -13,7 +13,7 @@
- HAS_PCAP?=1
- 
- # Change this to 1 if your system has posix_memalign
--HAS_POSIX_MEMALIGN?=0
-+HAS_POSIX_MEMALIGN?=1
- 
- # Current dynamips release
- VERSION_TRAIN=0.2.8
-@@ -35,7 +35,7 @@
- MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS_ARCH)_trans.h\"
- PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
- 
--CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
-+CFLAGS+=-g -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) \
-@@ -215,10 +215,9 @@
- .PHONY: all
- all: $(PROG) nvram_export
- 
--$(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \
--	$(LEX_C) $(C_OBJS) $(A_OBJS)
-+$(PROG): $(LEX_C) $(C_OBJS) $(A_OBJS)
- 	@echo "Linking $@"
--	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
-+	@$(CC) $(LDFLAGS) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
- 
- udp_send$(BIN_EXT): udp_send.c net.c crc.c
- 	@echo "Linking $@"
-@@ -246,9 +245,11 @@
- 	@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) -o $@ nvram_export.c
-+	@$(CC) $(LDFLAGS) -Wall $(CFLAGS) -o $@ nvram_export.c
- 
- install: $(PROG) nvram_export
- 	@echo "Installing"