update of openvsiwtch to 2.0.0

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 172 insertions, 16 deletions

diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index b5355fbebd60..aee5b9d7162f 100644
--- a/net-misc/openvswitch/ChangeLog
+++ b/net-misc/openvswitch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvswitch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.13 2013/09/14 09:30:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.14 2013/11/11 02:58:44 prometheanfire Exp $
+
+*openvswitch-2.0.0 (11 Nov 2013)
+
+  11 Nov 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +openvswitch-2.0.0.ebuild:
+  update of openvsiwtch to 2.0.0
 
   14 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
   openvswitch-1.11.0.ebuild:
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 1e818d43be6c..0d3fccd19835 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -9,25 +9,27 @@ AUX ovsdb-server-r1 973 SHA256 2a9a3bd0277362fcdab62b7ea86ae2e488e099d9ed724dc27
 AUX ovsdb-server_conf 492 SHA256 15c508d134fed8cda13e2d394fc7c20b9868294a30e73a952ebffd31df129251 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa WHIRLPOOL 076bbaf28d36bc6a748ee38c5b574946e938a78de4ac2948894cb41f9b639d04d3427019d227fcd559252869794004c1f467f6dfb23f0ab60450450d2cd7973f
 DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da SHA512 9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459 WHIRLPOOL fa7bc71f0f17f789ed0dc1dce953e1399f56c7529d13a10761f90a3b40a210e511722dda99a502fa2ef8f74ccc6ea5e8c3392c408bf00a85b5824bfa96fc7f24
 DIST openvswitch-1.9.0.tar.gz 2351740 SHA256 825730db82c7b46a142f057a43345590c299e66704ef7a88d9ed4ffd0c3d6b64 SHA512 6368852aafa81f003a09108e973a37281a938ad36948aef96b0699c85a754c33fdb274e998ca804c8102a8cf0839e023633510d43a975cf355b10575bc024587 WHIRLPOOL d4c88aadfe8676d5aef24673051c34864dcc9b6bbc624e6396389fae7ffbb0518f213334ede034fe1c4894187fb001b8e389a11cd8d0bc253f5237696ab0b405
+DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1
 EBUILD openvswitch-1.11.0.ebuild 4507 SHA256 99ca5cefb1d5066bc3b787c82fdeab497bf776c9b28dbc169f914f244bd004fa SHA512 f63c1b25ee599ec9791067044adf9eec264d4a1c1d054ffaf91472e150e850dbb4b60b19bc6956b117678620e686d94e10bea2d141337f38026febe31f83b72b WHIRLPOOL 9ed49e7071363b49ebc9016187e449073c53f303e40a22a2fc8a0b41ca301727679a62fb18b56c945d62962c2d2f259661e0c1779c1bda627b4c5ac29d428450
 EBUILD openvswitch-1.9.0-r1.ebuild 4747 SHA256 b01ed29e5b58574754efa3f99df6fa63a65292e8f3459f2e93a6d130a2b1805e SHA512 244d71beefc523b9289fbf0bb374696c92807cc0e6d2b5b9717faa8270e556896bb2035c3c46a03bc67d76b6f9e6478a49475d09513165d6ae7fb3ae8c7062cc WHIRLPOOL 9ae2a3d5613f9491580a972411186c3cc47ca4c26f34a6e3ac55d28e0ca4b531598c3b270b70a850913bde1658bce6b4365d01cc4128d307b8d91b2b4293afc6
 EBUILD openvswitch-1.9.0.ebuild 4557 SHA256 115cd2d411919c6364ac2dc6966e9482acc9e0f6b7a7c4c7986c34b8b43c93d5 SHA512 f6b002d3246b72b6012e4c49ece8ef01d3c05c8bcfaafb3f941b0e1ca4da0a049e515725a34ea0833daa1f3c2372b9131021f45244cb3d14d96f17313d575d3d WHIRLPOOL 6fcbbc93ad528634e9cd51d0aecd558d0b5ec3a1e82b0f0bf0008a48558f7d07d3f8793e088f26d035486b6b299c3e92b0baac68036be38b2cc7152ed67c45cb
-MISC ChangeLog 3033 SHA256 07e9bf3b36397674c2ffadad3c921273d4887ce384d26cca076284658f597a36 SHA512 da82cc77cb6c91321470992e308342651b7793a4eca150560141ebd958cade20a90a56f269cc35b5796a9c0353ce395b2be5b5a5451698e7ad5f349f7cbb13bb WHIRLPOOL 6afddcba42e34efef0c97cbc3af151a061bc9ffa9edf7970142a7d57cc400e96fd7420ea9e54850101e6db346aa3f74702573ffbff5238b2434da273251ad853
+EBUILD openvswitch-2.0.0.ebuild 4691 SHA256 32a66a5f6faf52d017d2810cd6af21c64027ea78fd1f426574120f5f44a17bed SHA512 501533591bb735de4bc9679dc09dfc5758e57b3dbb0c63aede2cd595576294c10554dfdfd6f41f5f7d1f7b0b985503501ac723a674bf8fa21607ab3a30866898 WHIRLPOOL 840a7519920b880cff8cb75aa52538ccbf05ec62720e1aa5a2f7d92766e5d20762159e11cc1f323af912662f0d100e3a55ca64835e9336318ccd7e949091c70e
+MISC ChangeLog 3187 SHA256 58f9e0cc4d8d612c37951bee9f245482cd478f64d220d603006b0abfd007fde2 SHA512 988df6d1b2c84ebd3476417e4b6c5ffa3317b20ad364c0aed18fbe5c98a93ea194cae4ddf149ccb920c81492a5f3739ac7df9d69902b1f581ca422a04ae8e23a WHIRLPOOL 64503a0058d11226b3a0862b893864ec4509922c619d2001448ddd8e4214b196b517a1bddaff769e0dbbe548a56e215dfd88479989cbe5d911422149c1eb0046
 MISC metadata.xml 550 SHA256 73d17e0623524a9e95d3c4c2c34a29559d29a9dd0786ff4f98969b34949bc440 SHA512 c76de2feb5eac06781f42d74654e107200d5fd8f5377fd3af71559826c7263e837e42ca923811931cd9f86f68279085dd9e15796ee99033edd3ba0ccec2618f5 WHIRLPOOL 6919b71b9691b6659dd3b319d162cfb973cf25a15c3bbd01233c0842c6cd3e54c043f14f8b5da92a455a718f0dc25daa393e6f172266d66d1af2a15fa45c4df4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSNC0jAAoJECRx6z5ArFrDNf0QAMnhnQZKkfJK3kftEs7lGIo3
-nfBlTX2AQUXu71WISu3zOES502DcfPmqP9ymU+Ggy9BdBRlw9nS94ROGghfttL5F
-cCHn4ZLqIYqsQwGJZgYWIzbXUN6u8n4deCAkPYQBp+nO1ph4G4fsOXk7V1htKdph
-2xUzq5n3ix1KubF7OxReg3XR11jw8SCp5J0zNbnO9mx6W4j21aS3HTij/Y70CoEs
-Qwg/pbQXfsCChJ/82wQaPsLW5ujBox7KzqI7tFLwg68cED3eUla6Gxsvzt8ihf5q
-iTPbRAq/UTMX20c22JQ2WgMAFVSeMz5+44learabl+p7wVbClQLGRSjmN2gom0aS
-z6IVZTICeBPZswDj+5SHbKUWmhjkltx4FxxLdHx9wVCaq0tunvNYJqrIFVSPDPOm
-n9iz9m1F73IZ1wnPrke53gPmn/OP9iuyx/ThFGdGTXnDU3C3mwWIuI99i3kn4Mqq
-UX8N5v7RTcz07SVTe1MwE2K74aFtHB5HHx7OE/owd4ws6/GL89gSv1dw8y/ayxwV
-9a80Hqc8K5vuMfFOH+h+RM/5K+kHjRmdAFfcAox8Z2Ox9c3a/aP+1EP7ZIunjVHc
-xf09+wq/LG2thY8CVnc/fI7DCfqxGX/wpDwjkpUEyEWFvaA7c4EFkU0uu4EIygm6
-Q5I5m6lW3Hxpo0ZyaVLU
-=N13l
+iQIcBAEBCAAGBQJSgEhxAAoJECRx6z5ArFrDqyMP/0IPXZfx1g2Kd+6kQCfZpqZc
+58aVRjNC3/zjoGDIKvMoHlvxqjT21TrlFsmV7J9gOxcxd9vf+J5qb5sztx+gzZwI
+nwYr9sc2WVMgQLdz6JcnijCuzBszmlqUQ5jp7/UtiLjermgKuMp2GqSa4D56WumC
+/oaWAFtzy9Cvow2KxQ6ayGFLD4Qr0F5WQD+lkNWqz86xyh6ZywxoSH1ANAo53GjY
+t/PS6ZkIrYasLeJFUQDpoKIrnQnNaFtsX8laLIvP83aSf+bPeX0K7ka+hxlSmq4x
+7IL6u2yHnGvflSul+94+TPAMRaZ8PpnhZxahODhN79UwWR2OZ8AB8THLGnDEd7/J
+jCNV+UJnFjnk4AxxhS9gboEaRaorvsWOqywqiQyydmzIiICEoUamxFZUtKNE4sSe
+PLhAG8A46yn+rD3xPLUjgNXioA7ichGeg/enTDRht4J0djKkz6olcoZpgSll63SX
+d8/eg1tma3F0i2tSFUrRNfA+NHwZsv+UC48WOoQXWu/I7gU9fcEc/bokL6wHZu0z
+bEkgzx3dk3q9/bdSjeG6sfWfwMJjPNEojd13yB62Ub4qPX52buF3dX1GDiRmhaMv
+262+OPsKYPa1NjKYUjqp6ZZd9s+CsCEPvMVZBxxT6PsILrdeSCEhoBpIQC3EKSI1
+WoZ2gHYzj5mfvC5jluVq
+=eibP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvswitch/openvswitch-2.0.0.ebuild b/net-misc/openvswitch/openvswitch-2.0.0.ebuild
new file mode 100644
index 000000000000..c44268903653
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.0.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.0.0.ebuild,v 1.1 2013/11/11 02:58:44 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info linux-mod python-single-r1
+
+DESCRIPTION="Production quality, multilayer virtual switch."
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug modules monitor +pyside +ssl"
+
+RDEPEND=">=sys-apps/openrc-0.10.5
+	ssl? ( dev-libs/openssl )
+	monitor? (
+		${PYTHON_DEPS}
+		dev-python/twisted-core
+		dev-python/twisted-conch
+		dev-python/twisted-web
+		pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )
+		!pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		net-zope/zope-interface[${PYTHON_USEDEP}] )
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="brcompat(net:${S}/datapath/linux) openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+	kernel_is ge 2 6 32 || die "Linux >=2.6.32 and <3.10 required"
+	kernel_is lt 3 11 || die "Linux >=2.6.18 and <3.11 required"
+	use monitor && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+}
+src_configure() {
+	set_arch_to_kernel
+	use monitor || export ovs_cv_python="no"
+	use pyside || export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KERNEL_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use monitor && python_fix_shebang \
+		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
+		utilities/bugtool/ovs-bugtool \
+		ovsdb/ovsdbmonitor/ovsdbmonitor
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	if use monitor ; then
+		python_domodule "${ED}"/usr/share/openvswitch/python/*
+		rm -r "${ED}/usr/share/openvswitch/python"
+		python_optimize "${ED}/usr/share/ovsdbmonitor"
+	fi
+	# not working without the brcompat_mod kernel module which did not get
+	# included in the kernel and we can't build it anymore
+	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}/var/run"
+	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
+	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
+
+	newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
+	if [ -e "${db}" ] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
+	fi
+}