bump; build system has changed to cmake, patch to remove install_doc function from cmake, drop disused patch & oldest version, closes bug #527550

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

5 files changed, 69 insertions, 106 deletions

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index 25e26801de5d..bd787c546a66 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/dynamips
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.15 2014/11/26 19:12:42 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.16 2014/11/28 07:01:11 idella4 Exp $
+
+*dynamips-0.2.14 (28 Nov 2014)
+
+  28 Nov 2014; Ian Delaney <idella4@gentoo.org> +dynamips-0.2.14.ebuild,
+  +files/0.2.14-docs.patch, -dynamips-0.2.10.ebuild,
+  -files/dynamips-0.2.10-makefile.patch:
+  bump; build system has changed to cmake, patch to remove install_doc function
+  from cmake, drop disused patch & oldest version, closes bug #527550
 
   26 Nov 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Reassigning to new maintainer
@@ -79,4 +87,3 @@
   Initial commit, ebuild sourced from Sunrise overlay but modified slightly.
   With a warm thank you to Sergey Khalavchuck, Chad A. Simmons, Duncan
   Lockwood, Mark Silinio and "haad". Closes bug #154491.
-
diff --git a/app-emulation/dynamips/dynamips-0.2.10.ebuild b/app-emulation/dynamips/dynamips-0.2.10.ebuild
deleted file mode 100644
index e72ad48bde5d..000000000000
--- a/app-emulation/dynamips/dynamips-0.2.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.10.ebuild,v 1.2 2014/06/13 18:12:46 pinkbyte Exp $
-
-EAPI=5
-
-MY_P="${P}-source"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Cisco 7200/3600 Simulator"
-HOMEPAGE="http://www.gns3.net/dynamips/"
-SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/elfutils
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	# enable verbose build
-	sed -i \
-		-e 's/@$(CC)/$(CC)/g' \
-		stable/Makefile || die 'sed on stable/Makefile failed'
-	# respect compiler
-	tc-export CC
-
-	epatch_user
-}
-
-src_compile() {
-	if use amd64 || use x86; then
-		emake DYNAMIPS_ARCH="${ARCH}"
-	else
-		emake DYNAMIS_ARCH="nojit"
-	fi
-}
-
-src_install () {
-	newbin dynamips.stable dynamips
-	dobin stable/nvram_export
-	doman man/*
-	dodoc README README.hypervisor TODO
-}
diff --git a/app-emulation/dynamips/dynamips-0.2.14.ebuild b/app-emulation/dynamips/dynamips-0.2.14.ebuild
new file mode 100644
index 000000000000..ac555c4c960b
--- /dev/null
+++ b/app-emulation/dynamips/dynamips-0.2.14.ebuild
@@ -0,0 +1,40 @@
+# 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.14.ebuild,v 1.1 2014/11/28 07:01:11 idella4 Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Cisco 7200/3600 Simulator"
+HOMEPAGE="http://www.gns3.net/dynamips/"
+SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${P}-source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip
+	dev-libs/elfutils
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README RELEASE-NOTES )
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# patch CMakeLists to remove install_docs and use Portage instead
+	epatch "${FILESDIR}"/${PV}-docs.patch
+
+	# comment out DYNAMIPS_FLAGS to respect use set CFLAGS
+	sed -e 's:^set ( DYNAMIPS_FLAGS:#&:' -i cmake/dependencies.cmake || die
+}
+
+src_configure() {
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/app-emulation/dynamips/files/0.2.14-docs.patch b/app-emulation/dynamips/files/0.2.14-docs.patch
new file mode 100644
index 000000000000..1d744062e5b5
--- /dev/null
+++ b/app-emulation/dynamips/files/0.2.14-docs.patch
@@ -0,0 +1,20 @@
+--- CMakeLists-orig.txt	2014-11-28 14:51:14.375913296 +0900
++++ CMakeLists.txt	2014-11-28 14:52:09.579369288 +0900
+@@ -37,16 +37,6 @@
+ add_subdirectory ( stable )
+ add_subdirectory ( unstable )
+ 
+-install_docs (
+-   "ChangeLog"
+-   "COPYING"
+-   "MAINTAINERS"
+-   "README"
+-   "README.hypervisor"
+-   "RELEASE-NOTES"
+-   "TODO"
+-   )
+-
+ # uninstall target - leaves behind any directory created during install
+ set ( _templatefile "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" )
+ set ( _scriptfile "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" )
+
diff --git a/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch
deleted file mode 100644
index 89f22c2b6244..000000000000
--- a/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- stable/Makefile.orig	2013-10-20 11:17:50.242929187 +0400
-+++ stable/Makefile	2013-10-20 11:19:19.395936956 +0400
-@@ -3,12 +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?=amd64

--

--ifeq ($(DYNAMIPS_ARCH),ppc32)

--DYNAMIPS_ARCH=x86

--endif

-+DYNAMIPS_ARCH?=nojit

- 

- # Get include files from the current directory and from the common directory

- INCLUDE+=-I. -I../common

-@@ -47,7 +42,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) \

-@@ -72,7 +67,7 @@
- #   PCAP_LIB=-lpcap

-    OSNAME=Linux

-    CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)

--   LIBS=-L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)

-+   LIBS=$(LDFLAGS) -L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)

-    DESTDIR=/usr

- else

- ifeq ($(shell uname -s), Darwin)

-@@ -274,7 +269,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"

-@@ -282,7 +277,7 @@
- 

- nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o

- 	@echo "Linking $@"

--	@$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o

-+	@$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o

- 

- install: $(PROG) nvram_export$(BIN_EXT)

- 	@echo "Installing"