Merge updates from master

3 files changed, 25 insertions, 34 deletions

diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild
index 31742ab52d12..eb82210357fa 100644
--- a/media-gfx/springgraph/springgraph-88.ebuild
+++ b/media-gfx/springgraph/springgraph-88.ebuild
@@ -1,39 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils
-
-DESCRIPTION="Generate spring graphs from graphviz input files"
-HOMEPAGE="http://www.chaosreigns.com/code/springgraph"
 MY_PV="0.${PV}"
 MY_P="${PN}_${MY_PV}"
 SRC_FILE="${MY_P}.orig.tar.gz"
 SRC_DEBIAN_PATCH="${PN}_0.82-5.diff.gz"
+
+DESCRIPTION="Generate spring graphs from graphviz input files"
+HOMEPAGE="http://www.chaosreigns.com/code/springgraph"
 SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV}
-		 mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_DEBIAN_PATCH}"
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_DEBIAN_PATCH}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-DEPEND=""
+
 RDEPEND="dev-perl/GD"
-S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_unpack() {
-	mkdir -p ${S}
-	cp ${DISTDIR}/${PN}.pl.${PV} ${S}/${PN}
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${SRC_DEBIAN_PATCH}
-}
+S=${WORKDIR}
+
+PATCHES=( "${SRC_DEBIAN_PATCH%.gz}" )
 
-src_compile() {
-	# nothing to do
-	:
+src_unpack() {
+	cp "${DISTDIR}"/${PN}.pl.${PV} ${PN} || die
+	default
 }
 
 src_install() {
-	into /usr
 	dobin ${PN}
 	doman debian/${PN}.1
 }
diff --git a/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
index 7ef07d326f61..e9f173afff5a 100644
--- a/net-analyzer/poink/poink-2.03.ebuild
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -9,12 +9,10 @@ DESCRIPTION="TCP/IP-based ping implementation"
 HOMEPAGE="https://directory.fsf.org/security/system/poink.html"
 SRC_URI="https://ep09.pld-linux.org/~mmazur/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc x86"
-
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
-DEPEND=""
 
 PATCHES=( "${FILESDIR}/${PN}-2.03-signed-char-fixup.patch" )
 
diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild
index 5da55abc5891..84b83371d881 100644
--- a/net-analyzer/raddump/raddump-0.3.1.ebuild
+++ b/net-analyzer/raddump/raddump-0.3.1.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="RADIUS packet interpreter"
 HOMEPAGE="https://sourceforge.net/projects/raddump/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
-DEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	eautoreconf
-}
+RDEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
+DEPEND=${RDEPEND}
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO ChangeLog CREDITS
+src_prepare() {
+	default
+	eautoreconf
 }