diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-11-28 07:01:35 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-11-28 07:01:35 +0000 |
| commit | 414df882d34ac94fff669ed9f60c30bb8ff94153 (patch) | |
| tree | a43aea311a11adb91b185f9890a00bf6f4ce5b07 /app-emulation | |
| parent | Keyworded for ~amd64-fbsd. See #529084. (diff) | |
| download | historical-414df882d34ac94fff669ed9f60c30bb8ff94153.tar.gz historical-414df882d34ac94fff669ed9f60c30bb8ff94153.tar.bz2 historical-414df882d34ac94fff669ed9f60c30bb8ff94153.zip | |
bump; build system has changed to cmake, patch to remove install_doc function from cmake, drop disused patch & oldest version, closes bug #527550
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/dynamips/ChangeLog | 11 | ||||
| -rw-r--r-- | app-emulation/dynamips/Manifest | 18 | ||||
| -rw-r--r-- | app-emulation/dynamips/dynamips-0.2.10.ebuild | 52 | ||||
| -rw-r--r-- | app-emulation/dynamips/dynamips-0.2.14.ebuild | 40 | ||||
| -rw-r--r-- | app-emulation/dynamips/files/0.2.14-docs.patch | 20 | ||||
| -rw-r--r-- | app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch | 52 |
6 files changed, 76 insertions, 117 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/Manifest b/app-emulation/dynamips/Manifest index e82022c1fb53..56e74ab60071 100644 --- a/app-emulation/dynamips/Manifest +++ b/app-emulation/dynamips/Manifest @@ -1,22 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX dynamips-0.2.10-makefile.patch 1724 SHA256 2b3e04a4a4a9e6a8791f9ae15a50371e63c5f724745bedc9047943881a8fd131 SHA512 e74c67ee4f83dfd2cea75b98814a3284c7fd2d105b2498f4323a8d6cf30d4e08e478b7eff6a9b22e711308be2fd62ee26973d15f2b5382f015a69b8448e95aff WHIRLPOOL 79641a8f12898a8b883cd4e073d03e4821d1b30ec29b2e1731cb1cc52411154a049ca595dee840e5e2a14941495532ff97a2d6d3276faaba4b42282e02e24398 +AUX 0.2.14-docs.patch 551 SHA256 e0828229fbafec8ca09c3097dc503d1bfbb0bebcdbb85e4bad8139e82125f8ed SHA512 31884a56bffd2bdfee76949ecc5c0d68fd10e30bea52315fbafb8e4c60b033f1baf2a380a67686af91b0ee49ae97f4012c778bf6f69d6dd583375d8f6b7e98de WHIRLPOOL ffdea34239ee1f74f121b43bd2f6e753fdbef19696efe893c47908dc8708cd6320cf5410fba104cf9fec4274d29b19db92bfdcf712241a14e8e4226f98267929 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.12-source.zip 995877 SHA256 b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12 SHA512 08f388027e3234a44a75de77f30d6c96f0d881c4db60435a237f6ae6e3804872fda422ab11249f5c7283054f7d2d8466886dcd6056e59fc90802e67fa7cb8c55 WHIRLPOOL 2e627071914fe11ae20b7f00ba7b81b7bde95a008d84a1786e2f57ab07ec2a0d836218e72040b34f8badbefb289fceab2c5f7324bf5d5cfca0d433ed968dc6ae -EBUILD dynamips-0.2.10.ebuild 1077 SHA256 6383073699c78cb0b61fb1283e00871c9f0984765600d11a80682ce12da0e4a3 SHA512 cfb98252c7b51dc123e1b18a0c34ace7e5f2e3300156bb9235411c5e7317484be28581b76b44452744c1ee9c77d27d4bc239923e36f65ebeaf2e0cec812c2de1 WHIRLPOOL fa609688e51b2fe759d3fff2b593ac1789edfff78dc9f2105e7a8008537a0f6863bf8d3f2bd7d480c229883ba2b36fba18afe192e1ebfe34a437aeb5589e0a5c +DIST dynamips-0.2.14-source.zip 961813 SHA256 ce77cf6e6e784142333d3b9dcc6c70ab7b1f676ff2a40b7d4fb738e14f01e789 SHA512 8c3d85998a61cae1e3e82501a00e886c954686f9a19a44acb7dee8b13911c0155ce2cdfecbdc41ed5d279266abdf77a5c3f2753fde12217b138313ffa46dabf8 WHIRLPOOL d20a78c701cdbb7f38c4e6f6848b5b3b0a80d8bef372cb13cc25c65d52652001e701f54d1e5a805e4279a4cf457f953387e7cbda124e9f4f57c8615296d8fc7e EBUILD dynamips-0.2.12.ebuild 1051 SHA256 544e3fbc3a1b5e2f118a1f7004098c9f0f33251102afe5778360f46ffee76cf7 SHA512 eace73f09a228bcea7366dbd5081966d7262edaa9385d2d36fdaee86c9b740e7cf17a4d2b3f7b86bded9dbdc3e06caf706f602be151b59d38e8b20c3f0285293 WHIRLPOOL 6220c4379979a42311dd377fa0276edec405a369363f1e1b706dba8ada5d97e553959471ae0c5988c53addcf855a022f55b8ee1612149163d4f9523665cb254a -MISC ChangeLog 3266 SHA256 0f8a287f54573166923d6864644a32a2115d043043f95939bf55f284f46d196e SHA512 6cf72c55aff6adf9a2851537db06b3be56d7811058f45c38d97e6a1cadcd44d4ee0d2250db4a7b2a9d5b047f4283f7f06d907c302d2984778848b1c4be13c838 WHIRLPOOL 8a8317a78b3a845b0ed42ebc125087535821852d405208730faa7f781ede859abd557d4a7dce50c42ba3afd5a0aa463947ba790b39bae11a1da7a6364feac08b +EBUILD dynamips-0.2.14.ebuild 957 SHA256 54e3abf3ff75d83991d39d850da88732cb0a1a455c921d1d6b122db32cb1b6ea SHA512 0f84c4b2871dcadf055ac5b8e2af82ce574157162621f22db935c6071ed887ab58677f900f14049bcd2966f922a812b4008118978edc0725cea9ac515f0f0ec3 WHIRLPOOL 3ced404ae9b4ee0011d216510019ace74a9fd4e5697a6c2ad91658294e8021ebc2d93a2646680d5ec8c83bfe06639e3cfc1e0e5c07a59f6b7b0f9282780963bc +MISC ChangeLog 3614 SHA256 91f689ab2c4fe2923d8a051715f14919baf309e40f8f509fafedd38ed4b22016 SHA512 736044d06203392685d1749e2cdebdbfa70c2e842107f17ddaa241db2e8cb5d0bb54e9ded66bb75d504397575f0dbfc1eea807d2168449769fd24af7f2b66388 WHIRLPOOL e5cf9583f3e29d85a6acdb3a692ab735df107fa9f0aaf05f6d1cfa28b0fa3c05dd4841e8efca93bf46b4088c31b945b416b464693b953a5939f367d31b3759b0 MISC metadata.xml 490 SHA256 4440c17eea35f8c8a7a6f638eb3e8e0d1bae1203fa8baad8a3b295a612c8d497 SHA512 1c0ea4687c88896c4504b653352fe47e95aa434e1031b876c4c2723d194e5c97bd0b1f6ea54f3595251a024f17d250a6ede41088813af872d2657b102bd7170a WHIRLPOOL 79f983dad82a92afc07efe8b8bfb7b27787c6ef69e1262508c80d5eeb9c1ee84ef1c7cf331bf25c74ed5fff8f3daa9e8af5cd57c313d8c10c0c19435c1da5ad5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUdiYsAAoJECo/aRed92677lQIAISpQ60Z7idnNtTnpFHrmrQj -SzDvjij3qP6Xe8WfdzZ2ungijDR9sLTLjAjsMIFj29rydRgIb+6uY/bqO1oPTpp0 -KqNeEzMGjhhrd3azp1quwyrQ9HUc2WD6dSIJ5wdxF3K7YSMER4NBmfcqTfUKLs/0 -DoCzZtgagRZNvFx9pP27Iv7JVncieRbcgliD1exgEf4wga1SFqRYzDZX0rPY2wR+ -wn4x+UqmCklh4ltitlP+vWtEgyAHPmRP73qQK8DMpPZyShlM0K5LikTegX9vAAhR -YetbP4yCnBugDGdptFTr+kiptJh4og6U2a3MaIBF3T6lIpxsrh9xOcxqmAEB1io= -=jlDv +iEYEAREIAAYFAlR4HcYACgkQso7CE7gHKw3XTwCeO2GvUo1Vz7hDL6EKKjoxWALX +GqsAoIPyfXAicvazRZJDoRsPLTkZWqdR +=ptQz -----END PGP SIGNATURE----- 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"
|