app-emulation/q4wine: sync with main tree

Package-Manager: portage-2.3.2

2 files changed, 53 insertions, 33 deletions

diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml
index 9dc32391..3aa5ee2d 100644
--- a/app-emulation/q4wine/metadata.xml
+++ b/app-emulation/q4wine/metadata.xml
@@ -10,7 +10,12 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="icoutils">Enable icoutils support</flag>
-		<flag name="wineappdb">Enable Win AppDB browser subsystem</flag>
+		<flag name="ico">Enable ico support via <pkg>media-gfx/icoutils</pkg></flag>
+		<flag name="iso">Support unprivileged mounting of ISO9660 images via <pkg>sys-fs/fuseiso</pkg></flag>
+		<flag name="wineappdb">Enable Wine AppDB browser support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">brezerk/q4wine</remote-id>
+		<remote-id type="sourceforge">q4wine</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild
index db2d098e..35aea36a 100644
--- a/app-emulation/q4wine/q4wine-9999.ebuild
+++ b/app-emulation/q4wine/q4wine-9999.ebuild
@@ -2,56 +2,71 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PLOCALES="af cs de en es fa he it ru uk pl pt"
+inherit cmake-utils fdo-mime gnome2-utils git-r3
 
-inherit cmake-utils git-r3 l10n
+# Upstream names the package PV-rX. We change that to
+# PV_pX so we can use portage revisions.
+MY_P=${PN}-${PV/_p/-r}
 
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
+DESCRIPTION="Qt GUI configuration tool for Wine"
 HOMEPAGE="http://q4wine.brezblock.org.ua/"
 EGIT_REPO_URI="https://github.com/brezerk/q4wine.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+dbus debug +icoutils +wineappdb"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]
-	dbus? ( dev-qt/qtdbus:4 )
+IUSE="+dbus debug +ico +iso +wineappdb"
+
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${CDEPEND}
+	dev-qt/linguist-tools:5
 "
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	app-admin/sudo
-	app-emulation/wine
 	>=sys-apps/which-2.19
-	sys-fs/fuseiso
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
+	ico? ( >=media-gfx/icoutils-0.26.0 )
+	iso? ( sys-fs/fuseiso )
 "
 
-DOCS=(AUTHORS ChangeLog README)
-
-remove_from_LINGUAS() {
-	sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \
-		src/CMakeLists.txt || die
-}
+S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do remove_from_LINGUAS
-}
+DOCS=( AUTHORS ChangeLog README )
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT5=OFF
+		-DQT5=ON
+		-DDEBUG=$(usex debug ON OFF)
+		-DWITH_ICOUTILS=$(usex ico ON OFF)
 		-DWITH_SYSTEM_SINGLEAPP=ON
-		$(cmake-utils_use debug)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with icoutils)
-		$(cmake-utils_use_with wineappdb)
+		-DWITH_WINEAPPDB=$(usex wineappdb ON OFF)
+		-DUSE_BZIP2=OFF
+		-DUSE_GZIP=OFF
+		-DWITH_DBUS=$(usex dbus ON OFF)
 	)
 	cmake-utils_src_configure
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}