commit:     02340d7eb201e301e4454563e97b706f5e938924
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 15:32:18 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 15:34:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02340d7e

net-misc/openvswitch: remove 2.6.1 for bug 620200

Bug: https://bugs.gentoo.org/620200
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/openvswitch/Manifest                 |   1 -
 net-misc/openvswitch/openvswitch-2.6.1.ebuild | 155 --------------------------
 2 files changed, 156 deletions(-)

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index db2b9ed6d53..bccf494b887 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,3 +1,2 @@
-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

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 3830839ab69..00000000000
--- 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
-}

Reply via email to