gentoo resync : 13.03.2018

9 files changed, 1 insertions, 112 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e1f26d712f25..89694da859f4 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/htun/Manifest b/net-vpn/htun/Manifest
deleted file mode 100644
index 2e1c22b6eb1e..000000000000
--- a/net-vpn/htun/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX README.gentoo 139 BLAKE2B b8b4fbc9a4ca8078a26bfd4aafb7e59bab4e514c97e88e3126ea164c5aad403d4b4116b8bdc9f21e26e8e94e319f16731d2de648efdd95ad2f4244165d3df602 SHA512 11965b27b2ae85b499c83452b4c459810c9a921a8d30814bee3da2d942146082390d32baf06993c50fe3bc46fb7d3f2621a82b15d1df2b0b9db76144a53c0f5a
-AUX htun-0.9.6-glibc.patch 258 BLAKE2B d4e235f23b9f2156b1ff4e731571cebde82e61f32c2176a3e4b0454b28cbda00f77108d1475d8b6899f2d2c023bee3886d52e8829c60220b399e0da343d1c4b9 SHA512 cafee1ea1f882ccf7d6caf02c1ba8edb29047c9a3d60dd0f302817ef0b36008411996955f096db6ce34f75403a65273c264fa34f1c0d3dd909d264331ca8e805
-AUX htun-0.9.6-makefile.patch 904 BLAKE2B be56ba18ce2354f2bb416b181cf98e28a30f01fb9f4ce6a4b8c150c44366bbd9d89b70bf265034f03b72cac78763e756c2deceec764baa5ef338e03986d728c2 SHA512 10251ad9a5244554797138a96a83d23f44c97b55a3839a2c90fdcc0fc00f0d03f621806e371e0578eb57155c8d07de4f65430734a4a7dc0c1ece4769b08436f1
-DIST htun-0.9.6.tar.gz 63745 BLAKE2B 54f7c8b01b12e49325af6a1fc85687c5117c3f4f015ee9f4cbdad25a56544f23f66caf456a406e239999fcf8e08aae9f4d394080d7176421b3f41b40b43edcd0 SHA512 d709e9b6a809df5711b3c3c61c207a0ce72a054904fbe0a39bb9c60f174b19eb5fe183e3218100f45941035f72c5212fcbd716858631d1f117e6f88608f8ea0d
-EBUILD htun-0.9.6.ebuild 947 BLAKE2B d3842edf61d212cb3eeda19d5c858fb9076b82bc97ca7b4e8b59b833e223ead21c40340badbc74df8c6fbbc64f801ea788263fa135dc843a47478d19d236cc67 SHA512 7f22c59c6027ec125d0c8b9c1bcbc124c088b2d76d3331c33f37a996bf66ab42d22df0d9cbf689f38c97e355429e12d6b237e356ad63bbe6289acf89fa9ebd43
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/htun/files/README.gentoo b/net-vpn/htun/files/README.gentoo
deleted file mode 100644
index 1710c726723a..000000000000
--- a/net-vpn/htun/files/README.gentoo
+++ /dev/null
@@ -1,3 +0,0 @@
-NOTE: HTun requires the Universal TUN/TAP module
-available in the Linux kernel.  Make sure you have
-compiled the tun.o driver as a module!
diff --git a/net-vpn/htun/files/htun-0.9.6-glibc.patch b/net-vpn/htun/files/htun-0.9.6-glibc.patch
deleted file mode 100644
index 3f281c526388..000000000000
--- a/net-vpn/htun/files/htun-0.9.6-glibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-get things building with glibc-2.8
-
-http://bugs.gentoo.org/248100
-
---- a/include/common.h
-+++ b/include/common.h
-@@ -23,6 +23,7 @@
- #ifndef __COMMON_H
- #define __COMMON_H
- 
-+#include <limits.h>
- #include <netinet/in.h>
- #include <time.h>
- #include "queue.h"
diff --git a/net-vpn/htun/files/htun-0.9.6-makefile.patch b/net-vpn/htun/files/htun-0.9.6-makefile.patch
deleted file mode 100644
index c1f0b76bfa14..000000000000
--- a/net-vpn/htun/files/htun-0.9.6-makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-* Fix build system to not hardcode CC
-* Fix build system to respect user flags
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -20,16 +20,14 @@
- 
- # $Id: Makefile,v 2.16 2002/08/11 15:57:07 jehsom Exp $
- 
--
--CFLAGS = -I../include -I. -O -W -Wall -g -D_REENTRANT #-pg -a
--LDFLAGS = -lfl -lpthread # -flex for linux, solaris ?
--LEX_CFLAGS = -I../include -I. -g -D_REENTRANT #-pg -a
-+CFLAGS := $(CFLAGS) -I../include -I. -O -W -Wall -D_REENTRANT
-+LDFLAGS := $(LDFLAGS) -lfl -lpthread
-+LEX_CFLAGS = -I../include -I. -D_REENTRANT
- 
- # in Linux, LFLAGS is empty. In Solaris, LFLAGS = -lnsl -lsocket
- #LFLAGS = -lnsl -lsocket
- 
- VPATH	= .:../include
--CC      := gcc
- LEX     = flex
- YACC    = yacc
- INCLUDE := $(wildcard ../include/*.h)
-@@ -52,7 +50,7 @@
- $(OBJS): $(INCLUDE)
- 
- $(CONFOBS): $(CONFSRC)
--	$(CC) $(LEX_CFLAGS) -c $(@:.o=.c)
-+	$(CC) $(CFLAGS) $(LEX_CFLAGS) -c $(@:.o=.c)
- 
- lex.yy.c: parse.l
- 	$(LEX) $^
diff --git a/net-vpn/htun/htun-0.9.6.ebuild b/net-vpn/htun/htun-0.9.6.ebuild
deleted file mode 100644
index a04679b6af39..000000000000
--- a/net-vpn/htun/htun-0.9.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Project to tunnel IP traffic over HTTP"
-HOMEPAGE="http://linux.softpedia.com/get/System/Networking/HTun-14751.shtml"
-SRC_URI="http://www.sourcefiles.org/Networking/Tools/Proxy/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# should not be replaced by virtual/yacc
-# at least failed with dev-util/bison
-DEPEND="dev-util/yacc"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc.patch #248100
-	"${FILESDIR}"/${P}-makefile.patch
-)
-
-src_configure() {
-	# Fix multiple symbol definitions due to
-	# C99/C11 inline semantics, bug 571458
-	append-cflags -std=gnu89
-}
-
-src_compile() {
-	emake -C src CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin src/htund
-
-	insinto /etc
-	doins doc/htund.conf
-
-	local DOCS=( doc/. README )
-	einstalldocs
-	readme.gentoo_create_doc
-}
diff --git a/net-vpn/htun/metadata.xml b/net-vpn/htun/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-vpn/htun/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 94293046fbe7..aae2af1b3d72 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -6,4 +6,4 @@ EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd
 EBUILD strongswan-5.6.0-r1.ebuild 9314 BLAKE2B 526b99054b055536ab9956c6650fa9d0dad0e28150a5e1b3e871de20c7472826fc4b0115609180463eed81b76e0acc995a62024c83f74466aeadfd910cc592e4 SHA512 d9ee1657e33d7a2cc9c863ba7968e1766c0e565840c95f730fe35acb45e4aaa60d438f0a30e553806a1924c1440fb2607e7d1a5d552d23260a10fe10876bdff0
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 EBUILD strongswan-5.6.2.ebuild 9318 BLAKE2B f69307282c88a473ca7da3b15d58036863a4bb117ce6dea4066facb3cdd56df45a3222d42badaa598d734d3576d76dbff14cf0cfe2c77219244088c8606f4ae4 SHA512 ead13610287054356ccc76003112e45fce574578b8f4bcc6657938f7c472e2bcfc7c7e0f52ff09383ef3b94df79a7533ceb59a4842a19b73eba9c744393cad60
-MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
+MISC metadata.xml 3540 BLAKE2B 476b299ee9d4bae6c572f11c487fe4c185cde5c43188d78282af7542a850d445cbd955c63a544f457eeb8c687f793462a256209c13f19e1409cc9a7c6d474afc SHA512 9935d34790dbea54dd67fc673ae11da32f0a946ef8942f5f0f228187227aeba2ee85ac01cf9327471522c2122c1aa748715d33f38d4759f715b7ce39186b1b79
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 72eecce94d3b..0e0b41e2fb4a 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -5,10 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription lang="en">
 		StrongSwan is direct descendant of the discontinued FreeS/WAN project.
 		As an IPsec based VPN solution which is focused on security and ease of