www-client/jd: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

1 files changed, 23 insertions, 23 deletions

diff --git a/www-client/jd/jd-2.8.5_p120826.ebuild b/www-client/jd/jd-2.8.5_p120826.ebuild
index dcc8ee7aced2..05dd4ad5f84b 100644
--- a/www-client/jd/jd-2.8.5_p120826.ebuild
+++ b/www-client/jd/jd-2.8.5_p120826.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools autotools-utils flag-o-matic
+EAPI="6"
+
+inherit eutils autotools flag-o-matic
 
 MY_P="${P/_p/-}"
-MY_P="${MY_P/_/-}"
 
 DESCRIPTION="gtk2 based 2ch browser written in C++"
 HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/jd4linux/56721/${MY_P}.tgz"
+SRC_URI="mirror://sourceforge.jp/${PN}4linux/56721/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,6 +18,7 @@ IUSE="alsa gnome gnutls migemo"
 
 RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/glib:2
+	sys-libs/zlib
 	x11-misc/xdg-utils
 	alsa? ( >=media-libs/alsa-lib-1 )
 	gnome? ( >=gnome-base/libgnomeui-2 )
@@ -25,35 +26,34 @@ RDEPEND="dev-cpp/gtkmm:2.4
 		x11-libs/libSM
 		x11-libs/libICE
 	)
-	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0 )
 	migemo? ( app-text/cmigemo )"
-
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
 S="${WORKDIR}/${MY_P}"
 
-AUTOTOOLS_AUTORECONF=1
+src_prepare() {
+	default
+	append-cxxflags -std=c++11
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
-	append-cxxflags -std=c++11
-	# use gnomeui sm instead of Xorg SM/ICE
-	local myeconfargs=(
+	econf \
+		$(use_with alsa) \
+		$(use_with gnome sessionlib gnomeui) \
+		$(use_with !gnome sessionlib xsmp) \
+		$(use_with !gnutls openssl) \
+		$(use_with migemo) \
+		$(use_with migemo migemodict "${EREPFIX}"/usr/share/migemo/migemo-dict) \
 		--with-xdgopen
-		$(use_with gnome sessionlib gnomeui)
-		$(use_with !gnome sessionlib xsmp)
-		$(use_with alsa)
-		$(use_with !gnutls openssl)
-		$(use_with migemo)
-		$(use_with migemo migemodict /usr/share/migemo/migemo-dict)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	doicon ${PN}.png
 	domenu ${PN}.desktop
-	#dodoc AUTHORS ChangeLog NEWS README
 }