socat: upgraded package to upstream

Upgraded net-misc/socat to version 1.7.3.1 on amd64

BUG=chromium:585207
TEST=emerge net-misc/socat and verified the version
by running 'socat -V'.

Change-Id: Ie5a979bf635ffba023a9c35029bef90448d77fc9
Reviewed-on: https://chromium-review.googlesource.com/326770
Commit-Ready: Aditya Kali <adityakali@google.com>
Tested-by: Aditya Kali <adityakali@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit ff5c3f2382a3231e947d31f1a2ddf8fc72f03b14)
Reviewed-on: https://chromium-review.googlesource.com/326880
Commit-Queue: Aditya Kali <adityakali@google.com>
diff --git a/metadata/md5-cache/net-misc/socat-1.7.3.0 b/metadata/md5-cache/net-misc/socat-1.7.3.0
deleted file mode 100644
index 7800391..0000000
--- a/metadata/md5-cache/net-misc/socat-1.7.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Multipurpose relay (SOcket CAT)
-EAPI=5
-HOMEPAGE=http://www.dest-unreach.org/socat/
-IUSE=ssl readline ipv6 tcpd
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.0.tar.bz2
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6a3e7d53414511ec352438f1ac067db1
diff --git a/metadata/md5-cache/net-misc/socat-1.7.3.1 b/metadata/md5-cache/net-misc/socat-1.7.3.1
new file mode 100644
index 0000000..77a3d1a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/socat-1.7.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Multipurpose relay (SOcket CAT)
+EAPI=5
+HOMEPAGE=http://www.dest-unreach.org/socat/
+IUSE=ssl readline ipv6 tcpd
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.1.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=82789caec196a5c0be3c2325c459ae0a
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 1d08a28..68a8b81 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1 +1 @@
-DIST socat-1.7.3.0.tar.bz2 474633 SHA256 0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04 SHA512 e567efd6cd31a517ffb1622983640396c6c1db93e8cc4be01b6047ac00b2fbd8474ffb9f96d2af33d24939cddb36ee4b71deb87a5a0101b1f1fb959fa436baad WHIRLPOOL 0ea897879e4d21d678e87c03d11c084a418b5ce179021f0f175db2f5877f250b6d56e42e38f6b9dbcdff7ce0d81970573d41b30a77b1768e659785792e5ae03f
+DIST socat-1.7.3.1.tar.bz2 488467 SHA256 d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32 WHIRLPOOL 09f0fc537eaad194cac97cce73971c9f69047c648f03788fa69ac3444673ff73f143b2657d0ed28d082e2cfc36829304ed7bf0ff79c7ed75e96c991292f94dd4
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 7869263..2c2a792 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/socat/socat-1.7.3.0.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
similarity index 78%
rename from net-misc/socat/socat-1.7.3.0.ebuild
rename to net-misc/socat/socat-1.7.3.1.ebuild
index d4064b8..bd7f78a 100644
--- a/net-misc/socat/socat-1.7.3.0.ebuild
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.3.0.ebuild,v 1.11 2015/04/24 23:11:21 vapier Exp $
+# $Id$
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
@@ -17,8 +17,8 @@
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( dev-libs/openssl:0= )
+	readline? ( sys-libs/readline:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 RDEPEND="${DEPEND}"
@@ -30,7 +30,7 @@
 )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-filan-build.patch
+	epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
 }
 
 src_configure() {