why not add 1.11.0 at the same time

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

3 files changed, 171 insertions, 15 deletions

diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index 67ec5cc808c3..7022e7b72415 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.10 2013/09/12 06:35:08 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.11 2013/09/12 06:41:28 prometheanfire Exp $
+
+*openvswitch-1.11.0 (12 Sep 2013)
+
+  12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +openvswitch-1.11.0.ebuild:
+  why not add 1.11.0 at the same time
 
 *openvswitch-1.9.0-r1 (12 Sep 2013)
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 5d33b833a27b..537e52afefd9 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -7,25 +7,27 @@ AUX ovs-vswitchd-r1 554 SHA256 ca809e55e4540b905aa2a1afea9624cd0a52c31d833db9ed2
 AUX ovs-vswitchd_conf 164 SHA256 438c58741562af201c816f0a72101b5abb0e75788369bb04ed57be28425e5f81 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439 WHIRLPOOL 3cf05adfa5f1bfecdf022442c26b100ae3e63db7a1837b441fcef46e8864103eb3e761735ad1d81ad5d105cbc978d12e96449edf70aef3eb7d310080ce50ce9a
 AUX ovsdb-server-r1 973 SHA256 2a9a3bd0277362fcdab62b7ea86ae2e488e099d9ed724dc27648136e5f5ed93c SHA512 4d031347b146cf82812cb0fc1ead944d6e29a9a8bd2afe603c4003b6f8c9d2f9d0c5f7e2ebdad456e7f5af4b01c756203cd96cc44db7be266bf94ac9bba188ff WHIRLPOOL fbda59478d40a3ad91f5e370217b1bb83577e670ea061b3554dbf2719982f56905730dea65626bda3b6601ab31926222bca4ea657480468d3db6037fbf7058a6
 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
+EBUILD openvswitch-1.11.0.ebuild 4745 SHA256 ebc9c624d358221b7be620c729da6458bda5c61d9963ad6428d37b1d7146eec3 SHA512 e5f5b23dada5936aa383f40e0cdb9734fb4a036f1c1fc6a90892dbdbb9dfd0466d42effcc43181154ffd0192b9b480f24ad78cbc2f263b0accc70c2fc1d1e929 WHIRLPOOL f08311d7c7b7e898aa9ba4c457feb1a5319a77e9c7ef89d1e1b9c43b3ed46168fc3660021d9829701ad6f8bd2cd325158eca30a870412df37bb669785c823245
 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 2639 SHA256 9d38be1ba14fbc7cfef31dbe24a8fc658922a3d9881368ab63301e824fcce508 SHA512 7be45532d3dc1edb8aaa5c995fedf4fd8aab6de44b83d5e27f014e7136b3b59d5ddfde4d5c6ea997880b2c78b0adb6372a8d9498f4a3be35cd78cae528af8a96 WHIRLPOOL 1473f8ffd0ec6a2b0e1e64390bb1fd23741e597568670d42740c792871757629bb87fdeb2df37b50c0cf70e44eda039d5649c2177fa6fe77196e9d5940311605
+MISC ChangeLog 2800 SHA256 f3dcae275beb10aeec444dd8a5b5c81577167d3375eb541f8415796940cf3a92 SHA512 b0f18930fa8d7e73cd2c80120853e5b436b3416950baaac2d95b71994b55ab1f9fb6b28b144c4db0bee6dc2715f9d927ebba892c89037495109d190092cc5245 WHIRLPOOL acff419467262aa3fbedbe86eb466fa366b7d097c99ffbfe3a921620666bb3de089df7de496667aaecec97b1546110c578de0a4f19e7bf967b15603db7250d36
 MISC metadata.xml 482 SHA256 e5f849ca599bb7ceada5ea0a66160b0bb9ff5ade3a8b00ea73db17b18675417a SHA512 6312ec26573f2439dae81ab69112534f03862f6d22d595c2d0eda9000f60280f0f14593d63287c289006c61805ff5058ac1460660401ad5d386cfde674098e4f WHIRLPOOL 16459036dbff9f36efc8a740da9638a3b03820f8eb4baf4d616e5d505ee37a527d104cf75f2565a16dc365db8a515dda5d3818477ad0dde42f69b53eaf2df3c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSMWDzAAoJECRx6z5ArFrDu6sP/35pz7MPUJtcMbsqsX7mNvBw
-cfknkz+Icwbf1I7gpLQ3/X6EAiTV1lZ8n5bbNjIv1DjpPd0GEWUvwC6xtM+M7uyr
-/nkkj5FE6uMRDykFr4BFH6dFVXh94otJS94DLXIhwuo+E49SPXjI1SuH1k3Rc2U9
-tp1ue0x9Iy/fpG0t7oYgKxuQ1Iraamh0AJS4RXzusFpk/Gang+2xxdwhwVOmUWDq
-N/VviDOu9KwOqDqNBVbtCeawjbLUw05tc0v0uPSnzZSOhFf0bxIAmPzPtS0Nf9YW
-BJNHtQbNXRzwfyUKOlKOOnqhfmavC3XSgUIp58Nco54UoxQqRD0pajnPkUQbydQk
-urqb+AcEGTJpqkWhn+uVkW/S5ATu+yqDrQ2Wh3A7uwdb1/NY0AlVA/qVzyhlvXiJ
-LfytQG86mM7nKjs1i5RyizR9XLQKCZ7YyJozEyP7jSd+4V00kzvGGxKvVYmXf70u
-coC4C8d3l61UOkxEH4P5WzqnQrEsbJmL63ssPRU/D71Nm7WrxgNwVpE9BNiSE1V+
-YOUNzrz95A4CzYxOJDte30oaNWBvQCgrIXwY1RcTQ7YnhLMMLfin3oj5WQhvtsPD
-hNtZ3wRRzf9/lyjormv+V5A3VGWjVMju7nQpvpUtEEiHCGpPkE3bionzmXnH7The
-btaM+LkqRce4im8Iuvhp
-=TYsj
+iQIcBAEBCAAGBQJSMWJvAAoJECRx6z5ArFrDNLIP/RsUaBh2ZxXt5f6ZEWYYxhof
+pOLEslc0DXsCXAZjFBZlfN0PeTsazOnj/htjTs/N3tvnt2EwutWcfkC0wtXGbHqx
+bRMZPAmL49eNzYAn9JajR0hmNlG/uNFa0zVjdppPUPW2Z57DdPPmZfqVU+LqOpd7
+z1Ougg7zJ5YY9odQFH2SK6AqUDP4MASPw7FMvwhnDtmZvCOdS0tgJLDPPjMK8VG0
+NOHiSmZ4aWub8l+VGgXJFKsdqohQepcGe6DhLXb1Yh2pvnAOWPdkrgJ2XnQluzW+
+JJSUixNSxrbOUapIVG3jZl0ERpwHpHlh+b9JZQU0Z/k93Gky3TG8FLSHu7PrXUO4
+9BHFjlqcuA6wEDePHa38SDyV1HzdQJXLW1hU4wG/QQYdR6tgKyvsqo5n/5uKfDWX
+KpplEIQ9Svk7hmAAJ90hmY/hMtY4N6bilMbJoFeDE0ER4HvMmQBD22pZE3Xfe8PQ
+rwpENJhiOGgqATLMSFWfOU9MqWinptFyVjkmWXoG5c/UVc4lKI6vjPjkGy5reH9y
+vto9r6S5WwzqNpNKly1UJjjRIZvbT1cfosnlgYBdUfm/lSIDnHD+NRiDiDLqdzM4
+A5ZRobcNosH4va3Jp9QaxNzNXznu/7Z4vo4byq/cX4Idg3VwDJF+CEwNZKCKprfo
+0nG9pwsBrShnytYHRXtf
+=yWxX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvswitch/openvswitch-1.11.0.ebuild b/net-misc/openvswitch/openvswitch-1.11.0.ebuild
new file mode 100644
index 000000000000..1b15f51060f7
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-1.11.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-1.11.0.ebuild,v 1.1 2013/09/12 06:41:28 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[${PYTHON_USEDEP}]
+		dev-python/twisted-conch[${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+		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 18 || die "Linux >=2.6.18 and <3.2.9 required"
+	kernel_is lt 3 9 || die "Linux >=2.6.18 and <3.9 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
+}