[gentoo-commits] repo/gentoo:master commit in: profiles/, net-vpn/miredo/files/, profiles/updates/, net-vpn/miredo/

[Michał Górny]

commit:     528ab771abdd0d7d44ce80f970bb601ae3f927a8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 16:21:46 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 16:22:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528ab771

net-vpn/miredo: Remove last-rited pkg

Bug: https://bugs.gentoo.org/642568

 net-vpn/miredo/Manifest                            |  2 -
 .../files/miredo-1.2.5-configure-libcap.diff       | 33 ------------
 net-vpn/miredo/files/miredo-1.2.5-ip-path.patch    | 28 ----------
 net-vpn/miredo/files/miredo.conf.2                 |  2 -
 net-vpn/miredo/files/miredo.rc.2                   | 13 -----
 net-vpn/miredo/metadata.xml                        | 14 -----
 net-vpn/miredo/miredo-1.2.5-r2.ebuild              | 60 ----------------------
 net-vpn/miredo/miredo-1.2.6.ebuild                 | 60 ----------------------
 profiles/package.mask                              |  5 --
 profiles/updates/1Q-2017                           |  1 -
 10 files changed, 218 deletions(-)

diff --git a/net-vpn/miredo/Manifest b/net-vpn/miredo/Manifest
deleted file mode 100644
index c29f4fc5a62..00000000000
--- a/net-vpn/miredo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST miredo-1.2.5.tar.xz 474236 BLAKE2B 8766771c950ada7b172287595a93a4a14aec75d256d0b4e862097edad06faf805423de99ade00e796d3e91c130d6e069fa381abe7a49db80e5f8ed16fbfdf9c1 SHA512 94bc71b7093783ad103a0aceb95ad3de1739e4ec1d763b3c6cea9bb1768f55359448957f623ee3f966955c555bb9f71ff0216d9d4e8d2ff244bb058731702c70
-DIST miredo-1.2.6.tar.xz 477668 BLAKE2B ca6ddc90badcaed16e3925c4e67c0770bdcb909a97ddf48d8f6ee3c27ad6a7078c33edf94f6e491a4d7bab02b7b35a6006a778248fa0fd86efec973e56695c5d SHA512 9cbc604aecde566f921834a220be7675981e1c603cbcc81c3e2e9c58fdcdae2e78ec6ffc180939d5b8f6d7598ba3967270532b2c0c04de8b688a86c436719caf

diff --git a/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
deleted file mode 100644
index cffdbf1e562..00000000000
--- a/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac.ori	2012-06-14 21:55:13.756603416 +0200
-+++ configure.ac	2012-06-14 23:12:01.425399836 +0200
-@@ -150,16 +150,23 @@
- 
- # POSIX capabilities
- LIBCAP=""
--AC_CHECK_HEADERS([sys/capability.h], [
--	AC_CHECK_LIB(cap, cap_set_proc, [
--		LIBCAP="-lcap"
--		AC_DEFINE(HAVE_LIBCAP, 1,
--			  [Define to 1 if you have the `cap' library (-lcap).])
--	])
-+AC_ARG_WITH(libcap,
-+  AS_HELP_STRING([--with-libcap], [enable POSIX 1003.1e capabilities]),
-+    with_libcap=$withval,
-+    with_libcap=auto)
-+AC_MSG_CHECKING([whether to enable POSIX 1003.1e capabilities])
-+AC_MSG_RESULT($with_libcap)
-+
-+AS_IF([test "x$with_libcap" != "xno"], [
-+  AC_CHECK_HEADERS([sys/capability.h])
-+  AC_CHECK_LIB(cap, cap_set_proc, [
-+    LIBCAP="-lcap"
-+    AC_DEFINE(HAVE_LIBCAP, 1,
-+      [Define to 1 if you have the cap library (-lcap).])
-+  ])
- ])
- AC_SUBST(LIBCAP)
- 
--
- # Judy
- AC_ARG_WITH(Judy,
- 	    [AS_HELP_STRING(--with-Judy,

diff --git a/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
deleted file mode 100644
index 1d7b0fc39f6..00000000000
--- a/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: miredo-1.2.5/misc/client-hook.iproute
-===================================================================
---- miredo-1.2.5.orig/misc/client-hook.iproute
-+++ miredo-1.2.5/misc/client-hook.iproute
-@@ -5,7 +5,10 @@
- # Distributed under the terms of the GNU General Public License version 2.
- 
- # Linux iproute2 path:
--IP="/sbin/ip"
-+IP="ip"
-+
-+test -x "/sbin/ip" && IP=/sbin/ip
-+test -x "/bin/ip" && IP=/bin/ip
- 
- # Linux default route default metric is 1024
- # (we put 1029 so that Teredo is used as a last resort):
-@@ -23,11 +26,6 @@ PRIO=32765
- # (default: specified by the Teredo server, or 1280)
- #MTU=1400
- 
--if ! test -x "$IP"; then
--	echo "$0: iproute2 is required! Please install it." >&2
--	exit 1
--fi
--
- # Nothing to do with destroy event
- if test "$STATE" = "destroy"; then exit 0; fi
- 

diff --git a/net-vpn/miredo/files/miredo.conf.2 b/net-vpn/miredo/files/miredo.conf.2
deleted file mode 100644
index f4ef08a2311..00000000000
--- a/net-vpn/miredo/files/miredo.conf.2
+++ /dev/null
@@ -1,2 +0,0 @@
-# Options to pass to the daemon
-EXTRA_OPTS=""

diff --git a/net-vpn/miredo/files/miredo.rc.2 b/net-vpn/miredo/files/miredo.rc.2
deleted file mode 100644
index c0ae6d0d149..00000000000
--- a/net-vpn/miredo/files/miredo.rc.2
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after net modules
-	use dns logger
-}
-
-command=/usr/sbin/${SVCNAME}
-command_args="${MIREDO_OPTS}"
-pidfile=/var/run/${SVCNAME}.pid

diff --git a/net-vpn/miredo/metadata.xml b/net-vpn/miredo/metadata.xml
deleted file mode 100644
index 52ee8970cb9..00000000000
--- a/net-vpn/miredo/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>xmw@g.o</email>
-  <name>Michael Weber</name>
-</maintainer>
-<longdescription lang="en">
-Miredo is an open-source Teredo IPv6 tunneling software, for Linux and the 
-BSD operating systems. It includes functional implementations of all 
-components of the Teredo specification (client, relay and server). It is 
-meant to provide IPv6 connectivity even from behind NAT devices.
-</longdescription>
-</pkgmetadata>

diff --git a/net-vpn/miredo/miredo-1.2.5-r2.ebuild b/net-vpn/miredo/miredo-1.2.5-r2.ebuild
deleted file mode 100644
index 74773d853de..00000000000
--- a/net-vpn/miredo/miredo-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils linux-info user
-
-DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software"
-HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps"
-
-RDEPEND="sys-apps/iproute2
-	dev-libs/judy
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-CONFIG_CHECK="~IPV6" #318777
-
-#tries to connect to external networks (#339180)
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure-libcap.diff
-	epatch "${FILESDIR}"/${P}-ip-path.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-miredo-user \
-		--localstatedir=/var \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/miredo.rc.2 miredo
-	newconfd "${FILESDIR}"/miredo.conf.2 miredo
-	newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
-	newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
-
-	insinto /etc/miredo
-	doins misc/miredo-server.conf
-}
-
-pkg_preinst() {
-	enewgroup miredo
-	enewuser miredo -1 -1 /var/empty miredo
-}

diff --git a/net-vpn/miredo/miredo-1.2.6.ebuild b/net-vpn/miredo/miredo-1.2.6.ebuild
deleted file mode 100644
index 63494b5abd3..00000000000
--- a/net-vpn/miredo/miredo-1.2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils linux-info user
-
-DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software"
-HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps"
-
-RDEPEND="sys-apps/iproute2
-	dev-libs/judy
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-CONFIG_CHECK="~IPV6" #318777
-
-#tries to connect to external networks (#339180)
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.5-configure-libcap.diff
-	epatch "${FILESDIR}"/${PN}-1.2.5-ip-path.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-miredo-user \
-		--localstatedir=/var \
-		$(use_with caps libcap)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/miredo.rc.2 miredo
-	newconfd "${FILESDIR}"/miredo.conf.2 miredo
-	newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
-	newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
-
-	insinto /etc/miredo
-	doins misc/miredo-server.conf
-}
-
-pkg_preinst() {
-	enewgroup miredo
-	enewuser miredo -1 -1 /var/empty miredo
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index af6dfa2fdfa..5dd7f645561 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -310,11 +310,6 @@ app-crypt/gkeys-gen
 # and start actively maintaining it.  Otherwise -- removal in 90 days.
 sys-apps/paludis
 
-# Pacho Ramos <pacho@g.o> (17 Jun 2018)
-# Dead since 2013, not compatible with latest profiles (#642568). Removal in
-# a month
-net-vpn/miredo
-
 # Mart Raudsepp <leio@g.o> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.

diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 58910201a65..135c7c9e235 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -18,7 +18,6 @@ move net-misc/vpnc net-vpn/vpnc
 move net-misc/vpncwatch net-vpn/vpncwatch
 move net-misc/wireguard net-vpn/wireguard
 move net-misc/vtun net-vpn/vtun
-move net-misc/miredo net-vpn/miredo
 move net-misc/isatapd net-vpn/isatapd
 move net-misc/iodine net-vpn/iodine
 move net-misc/corkscrew net-vpn/corkscrew