gentoo resync : 18.03.2018

2 files changed, 0 insertions, 157 deletions

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 7559862392ad..1698010f07fd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -7,10 +7,8 @@ AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 544 BLAKE2B b406ef90df3988cdf4cf2870596471d98324bacdabdf9c517fdc30f6d59927894b310dc8d256fdc68c9d065a1c54c00035ec287d4970607cc2be1b2bf748bf17 SHA512 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.6.1.tar.gz 5399107 BLAKE2B a42e391e63c86559967ea08e425bca7a6968627ebf18fc6241c679ac011bd0688fe58124150ec48f96523bfb984aced980d011956a63d7c4df7da442ac1697fe SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39
 DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
-EBUILD openvswitch-2.6.1.ebuild 4543 BLAKE2B 0f09e27de8ebae5884357bcf3ba93edb42a9dcbcdde43ca79555fbee576e467b06386e03101cfee36919d0214737668cba0a13f5fd217afd0eed21e6d65ab624 SHA512 fd93d46f7177dac3dbad2040deca131f91aa96b99196d04bed648cc628c8808aa8203d25b4a97fa251b4212e24cac2535e9c73149101351a90949e5d8fe1b293
 EBUILD openvswitch-2.7.2-r1.ebuild 4422 BLAKE2B 1423a1804bb2f724c23f42c0d467e80474ed3e17c19f63ec40a3423cb94537e92f785fa537d99e5167bd78118af163c5d02c2dc40a27b43e3c620a4b84ce117c SHA512 b5188d793ec63d0e278dd827063ea4814255a8b817906d5b37396d16d3a45df3e032f59bd89ef8315090b1ae440c7c4d9341dafa295973826d00247bbdaa8ca7
 EBUILD openvswitch-2.7.2.ebuild 4369 BLAKE2B a2be186d00a4157e5260b8a2aafcf8a9cd2aba495b1ba08bb3487952137cb53ff720705a07ae0a9498bdd6ab2309f1436d85bf17c887c07c7402149f4125c260 SHA512 8d6e914fa089056522b676ef15e5664c04a9a2384cf7deb1f2b78672baa9e7b5f4e191dfb3afe1c877fbbe4346b9f7a3f91440db186aaa22ffe1f6cec4cfb86e
 EBUILD openvswitch-2.8.1.ebuild 4428 BLAKE2B dd63abdc7909e48c06dc625dc6ff9637ead926cd774ed0b35876115a8b738cdd58971a4a96c81c267178921bd75556f0d400f9be668d16141234737819cbcb2a SHA512 498f2f3e22a68ef1fc41a49ca275be5d683c96a02d30986c41e7738a788a1449172c9ceb8839c86a32d9971084dd2a790acc5af3a7f4714d0e54d1baf6787ab9
diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
deleted file mode 100644
index 3830839ab694..000000000000
--- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-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 +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-${PV}
-	dev-python/twisted-core
-	dev-python/twisted-conch
-	dev-python/twisted-web
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	#monitor ist statically enabled for bug 596206
-	#use monitor || export ovs_cv_python="no"
-	#pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_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 modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-		sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die
-		python_foreach_impl python_doscript utilities/"${SCRIPT}"
-	done
-
-	python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor
-
-	rm -r "${ED%/}"/usr/share/openvswitch/python || die
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-	# monitor is statically enabled for bug 596206
-	#if ! use monitor ; then
-	#	rm -r "${ED%/}"/usr/share/ovsdbmonitor || die
-	#fi
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	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
-
-	local pv
-	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="${EROOT%/}"/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)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}