3 files changed, 13 insertions, 54 deletions
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 61ad5a83cc3c..895b0eaab20b 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,3 +1,3 @@
-DIST gwenhywfar-5.1.2.tar.gz 2354910 BLAKE2B e73519d33da9268f90ae2924b177c4ef684c9d991faa1f788f8c30ea669fa27d645481e6e41673b22d2796376aaab9cec72de6874b89c2fe141102cfbac2d2e4 SHA512 20374ed6c134b310f375eb286d83bf6074e397e3c6e22b0370d06fb870b9506f171a9276cad9a809331d8917e3bca1eca30a5d5776818ca7f5b06100474a7e0f
-EBUILD gwenhywfar-5.1.2.ebuild 2783 BLAKE2B af1f16ea97f1fc19ab3185369a375896e24b198d97e338319da2011c29e31a261db331e8463a1df7a24828e258145c79880a96fddd84770fe177498ccc77f35e SHA512 50dc4ee66df60b5ddd339262f0d2d66a409609ea4dded49e1092eb0bfa23006fe05319eb3080ff99e2283493904c1282c6532632640c4e671f688f9c1cebed24
-MISC metadata.xml 642 BLAKE2B 42a9becdbbea5b2bc7a0bf9a907f1bbdf63ca4eb18fdd5fc73ba8f1b5605fd253442f16ed117a3b69b3bceb191440555d7dabc5289d83ac01cd2aca8502b17e6 SHA512 b0bae0cc2d3a50d04cceeed41ab51b25aa591f29ef14e62093b5bfc7724271dc5f3e23b1412b93e1b186fdd7c8cc2aff99975dcdaa33929e55b0e2f9178ed306
+DIST gwenhywfar-5.4.1.tar.gz 2373780 BLAKE2B bc2666145d958c5ab9c5600be65bcdd4a2ea6e35f3bd83a5ba9a2380dcc8788e91038733c49c1c16ff00d27eea999a0c0f4a02a70f30180d54a1541dbb951131 SHA512 78ec815374410bb3ebbbcc5c18120b47bbc2460aa8a620fae068f3c6aaeb16351139fe0e28e8dc7037ffb9eaa449011d2483dde3c99ecd0fed7bb2c9f97f89a0
+EBUILD gwenhywfar-5.4.1-r1.ebuild 1806 BLAKE2B 665ebdd3d35c0977dd038a90f3ae67c4e2c13bd38d0927b35ed48016d3b8a543c69851c9921eb4cee054b6fdf2a91dc257306ce16d19fe0772719da3bca710b6 SHA512 b016f5fa1d30a359018fd9e270a17b7f30af497e446ccc00e13e5d3b980c0e8befff7f4cba800c9324020cd70afa7296be6995e7771f47157b6fd9ba240ad487
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
index cfb7644453e1..6b3526e8dbcf 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
@@ -8,59 +8,43 @@ inherit qmake-utils
 
 DESCRIPTION="Multi-platform helper library for other libraries"
 HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/234/${MY_P}.tar.gz"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/344/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
 KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
-
-REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
+IUSE="debug doc gtk libressl qt5 test"
 
 BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error
+	dev-libs/libxml2:2
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
 	net-libs/gnutls:=
 	virtual/libiconv
 	virtual/libintl
 	virtual/opengl
-	designer? ( dev-qt/designer:5 )
-	fox? ( x11-libs/fox:1.6 )
 	gtk? ( x11-libs/gtk+:3 )
-	qml? ( dev-qt/qtdeclarative:5 )
 	qt5? (
 		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5[widgets]
 		dev-qt/qtnetwork:5
 		dev-qt/qtopengl:5
 		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
 		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
 		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
 	)
-	sensors? ( dev-qt/qtsensors:5 )
-	serialport? ( dev-qt/qtserialport:5 )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
 "
 
@@ -70,28 +54,9 @@ RESTRICT+=" test"
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	disableQtModule() {
-		local module
-		for module in ${@}; do
-			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
-		done
-	}
-
-	use designer || disableQtModule designer uitools
-	use qml || disableQtModule qml qmltest
-	use sensors || disableQtModule sensors
-	use serialport || disableQtModule serialport
-	use test || disableQtModule testlib
-	use webkit || disableQtModule webkit webkitwidgets
-
-	local guis=()
-	use fox && guis+=( fox16 )
-	use gtk && guis+=( gtk3 )
-	use qt5 && guis+=( qt5 )
-
 	local myeconfargs=(
-		--enable-ssl
 		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
+		--with-libxml2-code=yes
 		$(use_enable debug)
 		$(use_enable doc full-doc)
 	)
@@ -100,8 +65,10 @@ src_configure() {
 		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
 	)
 
-	guis_config="--with-guis=${guis[@]}"
-	econf "${myeconfargs[@]}" "${guis_config}"
+	local guis=()
+	use gtk && guis+=( gtk3 )
+	use qt5 && guis+=( qt5 )
+	econf "${myeconfargs[@]}" "--with-guis=${guis[*]}"
 }
 
 src_compile() {
diff --git a/sys-libs/gwenhywfar/metadata.xml b/sys-libs/gwenhywfar/metadata.xml
index dbdb950a22e6..7a38bb900964 100644
--- a/sys-libs/gwenhywfar/metadata.xml
+++ b/sys-libs/gwenhywfar/metadata.xml
@@ -2,12 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="fox">Use <pkg>x11-libs/fox</pkg> graphical toolkit</flag>
-		<flag name="qml">Enable support for plugins using QML</flag>
-		<flag name="sensors">Enable support for <pkg>dev-qt/qtsensors</pkg> module</flag>
-		<flag name="serialport">Enable support for <pkg>dev-qt/qtserialport</pkg> module</flag>
-		<flag name="webkit">Enable support for <pkg>dev-qt/qtwebkit</pkg></flag>
-	</use>
 </pkgmetadata>