gentoo resync : 07.08.2021

5 files changed, 90 insertions, 96 deletions

diff --git a/net-misc/shigofumi/Manifest b/net-misc/shigofumi/Manifest
index 1f216e96ecdd..d5fe9e302c52 100644
--- a/net-misc/shigofumi/Manifest
+++ b/net-misc/shigofumi/Manifest
@@ -1,5 +1,4 @@
-AUX shigofumi-0.3-gcc-10.patch 185 BLAKE2B 72c6ad40b843e62433bc6a31323a72a30b6760deb81b123d22d60c005eef959013d7781796b1b3abf10b8edf9b4c6739f5406cd049098a2dd3a0fbec7000b52c SHA512 39341603a5ccf74757cf410ba4d11b6e3f288ac5609ee67f30906d5fc8db095136856b87ad0d709a18eb77020a95997dd57fefedb7a0efcab05dbbb137307528
-DIST shigofumi-0.3.tar.bz2 312184 BLAKE2B ebf8c0c4a7a347bd1b2c11fae9e8f0da46cad21e2b25e875e94a60a7be00a79c1737ac39754a8a230705a44a812e5f00268b528480f5e33e734e4ce5dfdbea34 SHA512 ef7b2894cfa217b713865c4fe24cc985b4ff963df4a5005bda06f03b3c7f358b318e68a136328787fe2dfbb8b1623fe2b2ceb9fbbd20be7f243fa79ace1b0210
-EBUILD shigofumi-0.3-r1.ebuild 996 BLAKE2B 4b8abdca8bea66797d0279bdf2e785cd66ae046642018bb38e082ed8f41858f0203df762af3a362705b14694e3590a9a44bd4ddc46e9d3f55dd0eac92d9182aa SHA512 6b0bff0bfd7bf29702184f29d4038e385c515dab46de1b01ac34dfe8056ec72f0d9cf0991054148fc0c59fca13403b935850d7d0fdcecfca7b443407976e0c1a
-EBUILD shigofumi-9999.ebuild 950 BLAKE2B ea253d16ffdc9299b509e94b82d704b8f7ac0215a4d7a6b1cf70f30b174cb4ee65c23e98af28a0ea00f1201136d5f2632362232a9ecd561c96d6c1ef190afba9 SHA512 edd2141c636497ac23d702adb0c1a06454eb2e51602144fc4682c03d276d05554dae422f07c7bf73de714c1dd4acee96bb1a269b6ce10a14ce9ecb23ec87fa10
+DIST shigofumi-0.9.tar.bz2 346010 BLAKE2B a8014b6d2db3bc5ffc7656331704fd8a5a81b3f9e3b60e1f96a01ae05f98754df0f2ae76008696c0d01d567eaeffc483a4d688e3c74aec26e2bf95d1eea8e649 SHA512 8deee080d701393cce516ce7e904e24d7d42317e6b4921097b879947ee87391806595ac66e9460887607be19903d91a6eebf197833cf12795161424760bb403b
+EBUILD shigofumi-0.9.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
+EBUILD shigofumi-9999.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
 MISC metadata.xml 350 BLAKE2B ddf2f81b2030cfe858cff49c0605390ef0f4b7542118a1d91801978537b00e40554ba0311cf6dd0495433ba879f810e4408b53d051f6d8e1b61c3fdf1570f5d5 SHA512 6e0cfef97580b12bf5fa6ccf822b9983fd0ec4170f4b25a011a9a17e7398bdeb1aa9726351dc4fd0bb0d3f981a76aa644d316ab5c01d302639d6ba144394b59c
diff --git a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch b/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
deleted file mode 100644
index 52688ff1d194..000000000000
--- a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/shigofumi.h
-+++ b/src/shigofumi.h
-@@ -16,7 +16,7 @@
- extern shi_state state;*/
- 
- /* UI */
--FILE *output;
-+extern FILE *output;
- 
- /* Data */
- extern struct isds_list *boxes;
diff --git a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild b/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
deleted file mode 100644
index a5dcea0425c7..000000000000
--- a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
-
-DESCRIPTION="Command line client for ISDS"
-HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc nls xattr"
-
-RDEPEND="
-	dev-libs/confuse:0=
-	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
-		$(use_enable xattr)
-}
diff --git a/net-misc/shigofumi/shigofumi-0.9.ebuild b/net-misc/shigofumi/shigofumi-0.9.ebuild
new file mode 100644
index 000000000000..398763fed882
--- /dev/null
+++ b/net-misc/shigofumi/shigofumi-0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command line client for ISDS"
+HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
+	inherit autotools git-r3
+else
+	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug nls xattr"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/libxml2:2
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
index 8667bb035c0c..398763fed882 100644
--- a/net-misc/shigofumi/shigofumi-9999.ebuild
+++ b/net-misc/shigofumi/shigofumi-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
+EAPI=8
 
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
+
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~mips ~x86"
@@ -18,34 +16,41 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug doc nls xattr"
+IUSE="debug nls xattr"
 
 RDEPEND="
-	dev-libs/confuse:0=
+	dev-libs/confuse:=
 	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
 		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
 }