net-misc/samplicator: fix shutdown of Google Code issue

1. Changed SRC_URI to GitHub.
2. Modified metadata.xml to address 1.
3. Bump to 1.3.8 and remove 1.3.7, since no such release on GitHub.
4. EAPI 6

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2907

5 files changed, 35 insertions, 34 deletions

diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index 840d73714604..c0a8b30e45c2 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -1,2 +1,2 @@
 DIST samplicator-1.3.6.tar.gz 87901 SHA256 d5af47be6fc6cdbd9b5d116c65a92c6b9fd546df1c9cd61c831b5b85eb1f2742 SHA512 a4023344ec911d3dc6992ddce139e6f1c86a67bd9948a3f92a995dc26aeda1753becea4b0f5d9ad45a06d628029bffc0a77c28fbd277da9faf42100c01d55f31 WHIRLPOOL c499abfe21ed1d8062ab8fad1b6ae87a45217a797f8997588bf6aa8acd2b743dac4e9d5df965208ffd999dd7fa59e7e413956a2ddb5f86cdbac77de854ff9737
-DIST samplicator-1.3.7-beta6.tar.gz 95603 SHA256 8f1da80f2b32ef0e41a720fe1c98905f6e4cb1acb2949dbdddbb665a09655faf SHA512 fbb22dbe37afe5d1a855866da0ca0b1c8a8165bf366a45ca25648c9e30448adc959143a2571661cc1ae59332557a58d0fa3c87b405fca6c8543bed38cf12e622 WHIRLPOOL 9a0685793774c985bea33a0cbb4fffd40f8a1e38a03a9243008188b8e725574e3a34519a616ff8262cd081afcf59d87635aae8ce192f1fdc7088d0149a90ee86
+DIST samplicator-1.3.8rc1.tar.gz 109870 SHA256 5536622b409cf570a2326e2b4a1eac403eb6d9f05295450100d5176da1ec4e47 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306 WHIRLPOOL fd736a7bbe493b7432fe30be83d7058050f0afe9611f43e6e6df34d363a06c6cb377dde8ac84952b86c1a79ff8906bc093d60c9a1e0bf08f06916d2b0aa79aa7
diff --git a/net-misc/samplicator/files/samplicator.conf b/net-misc/samplicator/files/samplicator.confd
index 3f38ccc9887b..3f38ccc9887b 100644
--- a/net-misc/samplicator/files/samplicator.conf
+++ b/net-misc/samplicator/files/samplicator.confd
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index 69bb171e770f..37fecb38f2e4 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>spiderx@spiderx.dp.ua</email>
-    <name>Vladimir Pavljuchenkov</name>
-    <description>Primary maintainer.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    This small program receives UDP datagrams on a given port, and resends
-    those datagrams to a specified set of receivers. In addition, a
-    sampling divisor N may be specified individually for each receiver,
-    which will then only receive one in N of the received packets.
-  </longdescription>
-  <upstream>
-    <changelog>https://code.google.com/p/samplicator/source/browse/trunk/ChangeLog</changelog>
-    <doc>https://code.google.com/p/samplicator/source/browse/trunk/README</doc>
-    <bugs-to>mailto:simon.leinen@gmail.com</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+This small program receives UDP datagrams on a given port, and resends
+those datagrams to a specified set of receivers. In addition, a
+sampling divisor N may be specified individually for each receiver,
+which will then only receive one in N of the received packets.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sleinen/samplicator</remote-id>
+		<bugs-to>mailto:simon.leinen@gmail.com</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/samplicator/samplicator-1.3.6.ebuild b/net-misc/samplicator/samplicator-1.3.6.ebuild
index 47e508e390bf..389968e1811c 100644
--- a/net-misc/samplicator/samplicator-1.3.6.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-inherit eutils user
+inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://${PN}.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/sleinen/${PN}"
+SRC_URI="https://github.com/sleinen/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
@@ -26,7 +26,7 @@ src_install() {
 
 	# Install Gentoo init script and its config
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	# Install manual page
 	doman "${FILESDIR}"/${PN}.8
diff --git a/net-misc/samplicator/samplicator-1.3.7_beta6.ebuild b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
index 022a66cbd37c..e16c054ecbd9 100644
--- a/net-misc/samplicator/samplicator-1.3.7_beta6.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-inherit eutils user
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://${PN}.googlecode.com/"
-MY_P=${P/_/-}
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/sleinen/${PN}"
+SRC_URI="https://github.com/sleinen/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
@@ -29,7 +31,7 @@ src_install() {
 
 	# Install Gentoo init script and its config
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	# Install manual page
 	doman "${FILESDIR}"/${PN}.8