1 |
commit: 7aa24669d253a9ecacf5f7143b5db717dfa90342 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 28 12:28:46 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 28 12:31:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7aa24669 |
7 |
|
8 |
app-emulation/q4wine: sync with main tree |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
app-emulation/q4wine/metadata.xml | 9 +++- |
13 |
app-emulation/q4wine/q4wine-9999.ebuild | 77 ++++++++++++++++++++------------- |
14 |
2 files changed, 53 insertions(+), 33 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml |
17 |
index 9dc3239..3aa5ee2 100644 |
18 |
--- a/app-emulation/q4wine/metadata.xml |
19 |
+++ b/app-emulation/q4wine/metadata.xml |
20 |
@@ -10,7 +10,12 @@ |
21 |
<name>Gentoo Qt Project</name> |
22 |
</maintainer> |
23 |
<use> |
24 |
- <flag name="icoutils">Enable icoutils support</flag> |
25 |
- <flag name="wineappdb">Enable Win AppDB browser subsystem</flag> |
26 |
+ <flag name="ico">Enable ico support via <pkg>media-gfx/icoutils</pkg></flag> |
27 |
+ <flag name="iso">Support unprivileged mounting of ISO9660 images via <pkg>sys-fs/fuseiso</pkg></flag> |
28 |
+ <flag name="wineappdb">Enable Wine AppDB browser support</flag> |
29 |
</use> |
30 |
+ <upstream> |
31 |
+ <remote-id type="github">brezerk/q4wine</remote-id> |
32 |
+ <remote-id type="sourceforge">q4wine</remote-id> |
33 |
+ </upstream> |
34 |
</pkgmetadata> |
35 |
|
36 |
diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild |
37 |
index db2d098..35aea36 100644 |
38 |
--- a/app-emulation/q4wine/q4wine-9999.ebuild |
39 |
+++ b/app-emulation/q4wine/q4wine-9999.ebuild |
40 |
@@ -2,56 +2,71 @@ |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
# $Id$ |
43 |
|
44 |
-EAPI=5 |
45 |
+EAPI=6 |
46 |
|
47 |
-PLOCALES="af cs de en es fa he it ru uk pl pt" |
48 |
+inherit cmake-utils fdo-mime gnome2-utils git-r3 |
49 |
|
50 |
-inherit cmake-utils git-r3 l10n |
51 |
+# Upstream names the package PV-rX. We change that to |
52 |
+# PV_pX so we can use portage revisions. |
53 |
+MY_P=${PN}-${PV/_p/-r} |
54 |
|
55 |
-DESCRIPTION="Qt4 GUI configuration tool for Wine" |
56 |
+DESCRIPTION="Qt GUI configuration tool for Wine" |
57 |
HOMEPAGE="http://q4wine.brezblock.org.ua/" |
58 |
EGIT_REPO_URI="https://github.com/brezerk/q4wine.git" |
59 |
|
60 |
LICENSE="GPL-3" |
61 |
SLOT="0" |
62 |
KEYWORDS="" |
63 |
-IUSE="+dbus debug +icoutils +wineappdb" |
64 |
- |
65 |
-DEPEND=" |
66 |
- dev-qt/qtcore:4 |
67 |
- dev-qt/qtgui:4 |
68 |
- dev-qt/qtsingleapplication |
69 |
- dev-qt/qtsql:4[sqlite] |
70 |
- dbus? ( dev-qt/qtdbus:4 ) |
71 |
+IUSE="+dbus debug +ico +iso +wineappdb" |
72 |
+ |
73 |
+CDEPEND=" |
74 |
+ dev-qt/qtcore:5 |
75 |
+ dev-qt/qtgui:5 |
76 |
+ dev-qt/qtnetwork:5 |
77 |
+ dev-qt/qtsingleapplication[qt5,X] |
78 |
+ dev-qt/qtsql:5[sqlite] |
79 |
+ dev-qt/qtwidgets:5 |
80 |
+ dev-qt/qtxml:5 |
81 |
+ dbus? ( dev-qt/qtdbus:5 ) |
82 |
+" |
83 |
+DEPEND="${CDEPEND} |
84 |
+ dev-qt/linguist-tools:5 |
85 |
" |
86 |
-RDEPEND="${DEPEND} |
87 |
+RDEPEND="${CDEPEND} |
88 |
app-admin/sudo |
89 |
- app-emulation/wine |
90 |
>=sys-apps/which-2.19 |
91 |
- sys-fs/fuseiso |
92 |
- icoutils? ( >=media-gfx/icoutils-0.26.0 ) |
93 |
+ ico? ( >=media-gfx/icoutils-0.26.0 ) |
94 |
+ iso? ( sys-fs/fuseiso ) |
95 |
" |
96 |
|
97 |
-DOCS=(AUTHORS ChangeLog README) |
98 |
- |
99 |
-remove_from_LINGUAS() { |
100 |
- sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \ |
101 |
- src/CMakeLists.txt || die |
102 |
-} |
103 |
+S=${WORKDIR}/${MY_P} |
104 |
|
105 |
-src_prepare() { |
106 |
- cmake-utils_src_prepare |
107 |
- l10n_for_each_disabled_locale_do remove_from_LINGUAS |
108 |
-} |
109 |
+DOCS=( AUTHORS ChangeLog README ) |
110 |
|
111 |
src_configure() { |
112 |
local mycmakeargs=( |
113 |
- -DQT5=OFF |
114 |
+ -DQT5=ON |
115 |
+ -DDEBUG=$(usex debug ON OFF) |
116 |
+ -DWITH_ICOUTILS=$(usex ico ON OFF) |
117 |
-DWITH_SYSTEM_SINGLEAPP=ON |
118 |
- $(cmake-utils_use debug) |
119 |
- $(cmake-utils_use_with dbus) |
120 |
- $(cmake-utils_use_with icoutils) |
121 |
- $(cmake-utils_use_with wineappdb) |
122 |
+ -DWITH_WINEAPPDB=$(usex wineappdb ON OFF) |
123 |
+ -DUSE_BZIP2=OFF |
124 |
+ -DUSE_GZIP=OFF |
125 |
+ -DWITH_DBUS=$(usex dbus ON OFF) |
126 |
) |
127 |
cmake-utils_src_configure |
128 |
} |
129 |
+ |
130 |
+pkg_preinst() { |
131 |
+ gnome2_icon_savelist |
132 |
+} |
133 |
+ |
134 |
+pkg_postinst() { |
135 |
+ fdo-mime_desktop_database_update |
136 |
+ gnome2_icon_cache_update |
137 |
+} |
138 |
+ |
139 |
+pkg_postrm() { |
140 |
+ fdo-mime_desktop_database_update |
141 |
+ gnome2_icon_cache_update |
142 |
+} |