From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F04681394D9 for ; Fri, 28 Oct 2016 12:31:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 515C2E08C1; Fri, 28 Oct 2016 12:31:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29F35E08C1 for ; Fri, 28 Oct 2016 12:31:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B28CD341655 for ; Fri, 28 Oct 2016 12:31:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FF23301 for ; Fri, 28 Oct 2016 12:31:33 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1477657883.7aa24669d253a9ecacf5f7143b5db717dfa90342.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: app-emulation/q4wine/ X-VCS-Repository: proj/qt X-VCS-Files: app-emulation/q4wine/metadata.xml app-emulation/q4wine/q4wine-9999.ebuild X-VCS-Directories: app-emulation/q4wine/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7aa24669d253a9ecacf5f7143b5db717dfa90342 X-VCS-Branch: master Date: Fri, 28 Oct 2016 12:31:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b834486c-7495-4e03-b757-e47ff0f5fe73 X-Archives-Hash: 652051ee4c3cfead1f52d718d83b647a commit: 7aa24669d253a9ecacf5f7143b5db717dfa90342 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 28 12:28:46 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 28 12:31:23 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7aa24669 app-emulation/q4wine: sync with main tree Package-Manager: portage-2.3.2 app-emulation/q4wine/metadata.xml | 9 +++- app-emulation/q4wine/q4wine-9999.ebuild | 77 ++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml index 9dc3239..3aa5ee2 100644 --- a/app-emulation/q4wine/metadata.xml +++ b/app-emulation/q4wine/metadata.xml @@ -10,7 +10,12 @@ Gentoo Qt Project - Enable icoutils support - Enable Win AppDB browser subsystem + Enable ico support via media-gfx/icoutils + Support unprivileged mounting of ISO9660 images via sys-fs/fuseiso + Enable Wine AppDB browser support + + brezerk/q4wine + q4wine + diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild index db2d098..35aea36 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 +}