gentoo resync : 08.08.2018

5 files changed, 111 insertions, 32 deletions

diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
index cfb70f80762c..704fe79b77e4 100644
--- a/www-client/jd/Manifest
+++ b/www-client/jd/Manifest
@@ -1,3 +1,6 @@
+AUX jd-gcc-5.patch 531 BLAKE2B cd4ddb54f204eb6c09b77b76013bd91071a13b37bf365d61be7e41239d577453dd6733bf769ac4ceaff4ea7978d800106922b3ef58d46da98eb1bc9e71b31bec SHA512 851c7ff7faa83cf4e443b6ecee31790d97882bdb5ec461fb925c1bc350492d8b2a150a111778798931c8ca7f327890df11d256e0a75062c54839e8bbd285c4c6
 DIST jd-2.8.5-120826.tgz 784657 BLAKE2B 07e3ef150ddbc58cdd5d4e7bddfeb5f4cb5dd9b0c6bfc9fda4309768e34b7f4534549dad919c18ed8c5918d519e672ea4d3728d8bc87280096764d87a74151cb SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b
-EBUILD jd-2.8.5_p120826.ebuild 1318 BLAKE2B 080ab48fab13fdbac7fbf7539828559fd8c8b14d5541e13b115102fda7be335604a659d2df0335c7fb320ed9b6be09b5070f34915e700f19f64b4942df8ec888 SHA512 d5f91ea64ad531e0931db349722c0a5a9f5710e438103e714d37d977b459a88c805b9ceb8bb31e22eb7bda7bcf07c6357aece94a44ea2a94b770722a46808d2b
-MISC metadata.xml 315 BLAKE2B cd3f447e3abc191fcbfa1fef5a48b628972e663374da0ca3908cb48a9ad7c36f2773cfa98d35ec208775bc6b32f1073f40e39b11e3f792e13ea772180a16fb10 SHA512 087cd02ed5f0102424d975d865f4039a567d970e7272da23c8455c00d592f1d2d368ea4843b4570e52a8f892bb2234dfb8b259aa51495794d73e925b1f58419f
+DIST jd-2.8.9-150226.tgz 770110 BLAKE2B 096469fdc343dab64485897c5a402a48093ab1cc49e30973ab2f969fd60c389b1987c90246cf897125ab0d1787960574b35b811feacbc68e8079a00366c74602 SHA512 39bb4f0242426a5eff40e2a8c4bfc703491d260d4764be3745581b77a39d6db553521f2e09ea36c15d0318847a6fea8f48e079504f1f575fb600cb196c94df70
+EBUILD jd-2.8.5_p120826.ebuild 1221 BLAKE2B abd38a288f11e9a9cd1abc1515148258a96ccad9a52209dcfc42c77c45131f655584bae500c34ec27dc04ee37c1561760e0d6de2db3a7e3980f7e0cee10477fb SHA512 04b8b510412344fff172326a16d4bdf18b1e5890628cb4ea37ce7cf1f02814bba7072d83125edc060c72b7ec555fa7baeb03bf9f18c4b2bc57a9731d80d903af
+EBUILD jd-2.8.9_p150226.ebuild 1192 BLAKE2B 28475f34242dbd8cf00fcb44b8c91c29f7ac48e681ca58bddd190db778ce7ab221ea22672bac5af87d4dc5fd646ae5ba3a4ffbad9e51d7e1966f7bb044efd712 SHA512 fc6368265bbac771685df6195c0a0cef5f1950284df3d7479d67517678e9220981400e6d08ea0ab316fb3a45f3807d129a312c3b4db03cca54f4c10e4b20d2e6
+MISC metadata.xml 419 BLAKE2B cf2a3244f7358e218a9fcbf2fe6265fee1f0ebc983230a8b6777ea8fbaf86555ece54455e464aba5abee3b4fa6ea832eb246c268d7e101d4ca7bb550d11783f5 SHA512 c558d2d6312e3076ee584db16f8192297782ef8cee53dfb7078ba9787d67d777080f2ea8cff26e091240eee712c372cb3a9b364c9f346bd8bbcc138314b921a7
diff --git a/www-client/jd/files/jd-gcc-5.patch b/www-client/jd/files/jd-gcc-5.patch
new file mode 100644
index 000000000000..4e6a74f4d79d
--- /dev/null
+++ b/www-client/jd/files/jd-gcc-5.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/600802
+
+Author: nanikata@gmail.com
+
+--- a/src/article/drawareabase.h
++++ b/src/article/drawareabase.h
+@@ -330,7 +330,7 @@
+ 
+         // リアライズしたか
+         // Gtk::Widget::is_realized() はうまく動作しない
+-        const bool is_drawarea_realized(){ return m_window; }
++        const bool is_drawarea_realized(){ return static_cast<bool>(m_window); }
+ 
+         // 文字色のID( colorid.h にある ID を指定)
+         const int get_colorid_text() const{ return m_colorid_text; }
diff --git a/www-client/jd/jd-2.8.5_p120826.ebuild b/www-client/jd/jd-2.8.5_p120826.ebuild
index dcc8ee7aced2..80bbabb0121e 100644
--- a/www-client/jd/jd-2.8.5_p120826.ebuild
+++ b/www-client/jd/jd-2.8.5_p120826.ebuild
@@ -1,59 +1,59 @@
-# 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"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnome gnutls migemo"
+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 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
-	!gnome? (
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gnutls? ( >=net-libs/gnutls-1.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9 )
-	migemo? ( app-text/cmigemo )"
-
+	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}"
 
-AUTOTOOLS_AUTORECONF=1
+PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
 
-src_configure() {
+src_prepare() {
+	default
 	append-cxxflags -std=c++11
-	# use gnomeui sm instead of Xorg SM/ICE
-	local myeconfargs=(
+
+	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
-		$(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
 }
diff --git a/www-client/jd/jd-2.8.9_p150226.ebuild b/www-client/jd/jd-2.8.9_p150226.ebuild
new file mode 100644
index 000000000000..c1e8d8e99e2c
--- /dev/null
+++ b/www-client/jd/jd-2.8.9_p150226.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils 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/62877/${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
+
+	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/metadata.xml b/www-client/jd/metadata.xml
index f69cb4cf43a6..79b2e260a246 100644
--- a/www-client/jd/metadata.xml
+++ b/www-client/jd/metadata.xml
@@ -5,6 +5,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge-jp">jd4linux</remote-id>
 	</upstream>