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

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 14 insertions, 108 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/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"