gentoo resync : 25.10.2021

3 files changed, 7 insertions, 67 deletions

diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
index f69df5727223..30a83ac732c8 100644
--- a/www-client/jd/Manifest
+++ b/www-client/jd/Manifest
@@ -1,6 +1,4 @@
 AUX jd-gcc-5.patch 531 BLAKE2B cd4ddb54f204eb6c09b77b76013bd91071a13b37bf365d61be7e41239d577453dd6733bf769ac4ceaff4ea7978d800106922b3ef58d46da98eb1bc9e71b31bec SHA512 851c7ff7faa83cf4e443b6ecee31790d97882bdb5ec461fb925c1bc350492d8b2a150a111778798931c8ca7f327890df11d256e0a75062c54839e8bbd285c4c6
-DIST jd-2.8.5-120826.tgz 784657 BLAKE2B 07e3ef150ddbc58cdd5d4e7bddfeb5f4cb5dd9b0c6bfc9fda4309768e34b7f4534549dad919c18ed8c5918d519e672ea4d3728d8bc87280096764d87a74151cb SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b
 DIST jd-2.8.9-150226.tgz 770110 BLAKE2B 096469fdc343dab64485897c5a402a48093ab1cc49e30973ab2f969fd60c389b1987c90246cf897125ab0d1787960574b35b811feacbc68e8079a00366c74602 SHA512 39bb4f0242426a5eff40e2a8c4bfc703491d260d4764be3745581b77a39d6db553521f2e09ea36c15d0318847a6fea8f48e079504f1f575fb600cb196c94df70
-EBUILD jd-2.8.5_p120826-r1.ebuild 1220 BLAKE2B 2a8132ceaa0748ec77417bd4c362ddee04b1b4bc4086c86b38552785f6a990081152504664e7f16b2db196f4083e04b05dd98c6ff1e135c97471fbbcbb3f49a7 SHA512 1379861910a22a94bc342d7a94acb7ce1a6c61c520360ed807bdc61041bc6a693ad676b4994b59cb5a49d2c3e55fd2dea01135393a6f4549fad429b04dfe560e
-EBUILD jd-2.8.9_p150226-r1.ebuild 1191 BLAKE2B da8e5934a3deaa113cf506fc0f17a48a56a21d209a0328dc512e899f7faf94149a30857f064f216c507fc7c72f70112271f85edab31b850eb4e7613843fc6d51 SHA512 d2c09e451924e541ee336ffe700ba10f028bdb99e1479caa75dfe9db76169bb1f1a69c60036450b3ba372eca953ae87c06d57179a3d26a339238957be942f005
+EBUILD jd-2.8.9_p150226-r2.ebuild 1215 BLAKE2B e1acd5cceddc80cf9969a22d7087971c07a5618b17403f437c51852164afe8fa107852c61198832c16655be485bfc08877a8126267526df8e95d3cdd24f3b4f2 SHA512 882d6ba610fc80270dc6b43534c3c964e16f5f7e935f64beefa52289632e50c0c2ea66eef6e1be5176a6b014eda714bca11b5c3315eb429b7d29f296112460c8
 MISC metadata.xml 484 BLAKE2B 0fb6efd6446c9e2d8c8bfb3dc468eddb1184417f6d088dc4ae23c3235397d96183cd1374e80a2fbe9492a335a865ec14ab66ea8f04170c119d76721542b62d14 SHA512 d8dfe8a9954599bbce80a3798e340649a49f42a83cd5ddbfbc81bafde99facc92ac9b37ffa21aec6e01229508fa4a8616dab63a5b20756a59c76ddf6a1a1783f
diff --git a/www-client/jd/jd-2.8.5_p120826-r1.ebuild b/www-client/jd/jd-2.8.5_p120826-r1.ebuild
deleted file mode 100644
index 02fdb774cccd..000000000000
--- a/www-client/jd/jd-2.8.5_p120826-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop autotools flag-o-matic
-
-MY_P="${P/_p/-}"
-
-DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}4linux/56721/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnutls migemo oniguruma"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-libs/glib:2
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-misc/xdg-utils
-	alsa? ( >=media-libs/alsa-lib-1 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-	migemo? ( app-text/cmigemo )
-	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with !gnutls openssl) \
-		$(use_with migemo) \
-		$(use_with migemo migemodict "${EREPFIX}"/usr/share/migemo/migemo-dict) \
-		$(use_with oniguruma) \
-		--with-sessionlib=xsmp \
-		--with-xdgopen
-}
-
-src_install() {
-	default
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/www-client/jd/jd-2.8.9_p150226-r1.ebuild b/www-client/jd/jd-2.8.9_p150226-r2.ebuild
index 147ab5936757..45cb4c711bb3 100644
--- a/www-client/jd/jd-2.8.9_p150226-r1.ebuild
+++ b/www-client/jd/jd-2.8.9_p150226-r2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools desktop flag-o-matic
 
 MY_P="${P/_p/-}"
 
 DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
+HOMEPAGE="https://jd4linux.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/${PN}4linux/62877/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa gnutls migemo oniguruma"
@@ -19,6 +19,7 @@ IUSE="alsa gnutls migemo oniguruma"
 RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/glib:2
 	sys-libs/zlib
+	virtual/libcrypt:=
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-misc/xdg-utils
@@ -27,8 +28,8 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	!gnutls? ( dev-libs/openssl:0= )
 	migemo? ( app-text/cmigemo )
 	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )