From: Sergey Popov <pinkbyte@gentoo.org>
Date: Fri, 28 Nov 2014 09:52:32 +0000 (+0000)
Subject: Revision bump: add use flag for building without IPv6 support, drop redundant functio... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f29cff9f731be4fc89fe5e3e9da3f908c78bdab;p=gentoo.git

Revision bump: add use flag for building without IPv6 support, drop redundant function definitions. Drop old revision

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

diff --git a/app-emulation/dynamips/ChangeLog b/app-emulation/dynamips/ChangeLog
index bd787c546a66..62a607dd5376 100644
--- a/app-emulation/dynamips/ChangeLog
+++ b/app-emulation/dynamips/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2014/11/28 07:01:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/ChangeLog,v 1.17 2014/11/28 09:52:31 pinkbyte Exp $
+
+*dynamips-0.2.14-r1 (28 Nov 2014)
+
+  28 Nov 2014; Sergey Popov <pinkbyte@gentoo.org> -dynamips-0.2.14.ebuild,
+  +dynamips-0.2.14-r1.ebuild:
+  Revision bump: add use flag for building without IPv6 support, drop redundant
+  function definitions. Drop old revision
 
 *dynamips-0.2.14 (28 Nov 2014)
 
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index 56e74ab60071..78ed88d666b0 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -6,13 +6,17 @@ AUX dynamips-0.2.12-makefile.patch 458 SHA256 1ccdbd3f34ab61e66efd750d0508beeaeb
 DIST dynamips-0.2.12-source.zip 995877 SHA256 b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12 SHA512 08f388027e3234a44a75de77f30d6c96f0d881c4db60435a237f6ae6e3804872fda422ab11249f5c7283054f7d2d8466886dcd6056e59fc90802e67fa7cb8c55 WHIRLPOOL 2e627071914fe11ae20b7f00ba7b81b7bde95a008d84a1786e2f57ab07ec2a0d836218e72040b34f8badbefb289fceab2c5f7324bf5d5cfca0d433ed968dc6ae
 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
-EBUILD dynamips-0.2.14.ebuild 957 SHA256 54e3abf3ff75d83991d39d850da88732cb0a1a455c921d1d6b122db32cb1b6ea SHA512 0f84c4b2871dcadf055ac5b8e2af82ce574157162621f22db935c6071ed887ab58677f900f14049bcd2966f922a812b4008118978edc0725cea9ac515f0f0ec3 WHIRLPOOL 3ced404ae9b4ee0011d216510019ace74a9fd4e5697a6c2ad91658294e8021ebc2d93a2646680d5ec8c83bfe06639e3cfc1e0e5c07a59f6b7b0f9282780963bc
-MISC ChangeLog 3614 SHA256 91f689ab2c4fe2923d8a051715f14919baf309e40f8f509fafedd38ed4b22016 SHA512 736044d06203392685d1749e2cdebdbfa70c2e842107f17ddaa241db2e8cb5d0bb54e9ded66bb75d504397575f0dbfc1eea807d2168449769fd24af7f2b66388 WHIRLPOOL e5cf9583f3e29d85a6acdb3a692ab735df107fa9f0aaf05f6d1cfa28b0fa3c05dd4841e8efca93bf46b4088c31b945b416b464693b953a5939f367d31b3759b0
+EBUILD dynamips-0.2.14-r1.ebuild 941 SHA256 08c8847c07bfd674173efc35885d57edab374d219ca09707d3557976afc1f1a7 SHA512 87a738fff9ad9561dc2558bfb0b6c2a757508b144511e8c203101905f788ba8693a80a698b046f9ea94975b7f5a75309a62d646bab545540a64cb6f6884d4df5 WHIRLPOOL 68fc19483a9d3280de850bdf2893b1ee3b6fef66281a1696bc604c27048764d947383113ca4e8538903a1153b39b6b285372900cfd44b22b191cedc914f05b54
+MISC ChangeLog 3878 SHA256 b8a6d55b972e2e5cf059d5d9581a942d43821295b1258b3c1ff5edbce9ec849d SHA512 e2bc2e5f5ab0db7a2687f4b180bc76aeb5a684115c9b9c269c790d53c8daeba785070aa78462bd6f673f992b80d8853534107531fa41703aa9378c5e4966751b WHIRLPOOL 2bbaeff9c2b4e9ddeaf3bd199ab6d7c04d5eafd892a734a4c4e098dba192bc03cbdeb736eae975018fe793023be258ac9921c5bc8ff3a711f795381d05fc1038
 MISC metadata.xml 490 SHA256 4440c17eea35f8c8a7a6f638eb3e8e0d1bae1203fa8baad8a3b295a612c8d497 SHA512 1c0ea4687c88896c4504b653352fe47e95aa434e1031b876c4c2723d194e5c97bd0b1f6ea54f3595251a024f17d250a6ede41088813af872d2657b102bd7170a WHIRLPOOL 79f983dad82a92afc07efe8b8bfb7b27787c6ef69e1262508c80d5eeb9c1ee84ef1c7cf331bf25c74ed5fff8f3daa9e8af5cd57c313d8c10c0c19435c1da5ad5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4HcYACgkQso7CE7gHKw3XTwCeO2GvUo1Vz7hDL6EKKjoxWALX
-GqsAoIPyfXAicvazRZJDoRsPLTkZWqdR
-=ptQz
+iQEcBAEBCAAGBQJUeEXfAAoJECo/aRed92674YgH/3ISiHSKgTJ8zWt7pka1ZYgH
+magPLMjYS6GZ0TG1YSGajwPb1G5Dhv1XHJS765qfQIFNV0cV2dwfVZlT0Nn1fH80
+pLO8ycj5+CynXbdGY3OBLur79L8a0/puIVTn4gxx3ryErl2Bm7ebJUQzAUPE2DuU
+KSWqLGLWaFfJh38i8FoLgqItKcuGmfj25riJI0SxYxzkyBhfOtzzOw1sOQF8KFqX
+g6doI9iPQ+ZOS/vTmTmT4PVRkEirp0lVKOd3GM6fVopoQuhxSZHmHnBgnOQfRnDz
+icA1f88BgYUUeX2kpBrKSFBoUO4n3go+XPXOOTJqGA94uARkP2rSWqi3rNMnHAo=
+=j8nj
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dynamips/dynamips-0.2.14.ebuild b/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild
similarity index 56%
rename from app-emulation/dynamips/dynamips-0.2.14.ebuild
rename to app-emulation/dynamips/dynamips-0.2.14-r1.ebuild
index ac555c4c960b..2fa16e53b08f 100644
--- a/app-emulation/dynamips/dynamips-0.2.14.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild,v 1.1 2014/11/28 09:52:31 pinkbyte Exp $
 
 EAPI=5
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="Cisco 7200/3600 Simulator"
 HOMEPAGE="http://www.gns3.net/dynamips/"
@@ -14,27 +14,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/unzip
-	dev-libs/elfutils
+IUSE="ipv6"
+
+RDEPEND="dev-libs/elfutils
 	net-libs/libpcap"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 DOCS=( ChangeLog README RELEASE-NOTES )
 
 S="${WORKDIR}"
 
+PATCHES=( "${FILESDIR}/${PV}-docs.patch" )
+
 src_prepare() {
-	# patch CMakeLists to remove install_docs and use Portage instead
-	epatch "${FILESDIR}"/${PV}-docs.patch
+	# comment out DYNAMIPS_FLAGS to respect CFLAGS
+	sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
 
-	# comment out DYNAMIPS_FLAGS to respect use set CFLAGS
-	sed -e 's:^set ( DYNAMIPS_FLAGS:#&:' -i cmake/dependencies.cmake || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable ipv6 IPV6)
+	)
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-}