1 |
commit: b0bef77d4b62c9118f8fc96a16daba3976099c51 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 30 01:44:32 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 30 01:46:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bef77d |
7 |
|
8 |
dev-libs/libdbusmenu: a couple of fixes |
9 |
|
10 |
* QA changes (HOMEPAGE, irrelevant blocker) |
11 |
* Stabilize due to trivial ebuild changes |
12 |
* Drop old |
13 |
|
14 |
Revision bump is used as the package is small and removing the py2.7 will |
15 |
benefit later for users. |
16 |
|
17 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
18 |
|
19 |
dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild | 8 +- |
20 |
dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild | 153 --------------------- |
21 |
2 files changed, 4 insertions(+), 157 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild |
24 |
index cdca5d0c621..e5b1db2075e 100644 |
25 |
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild |
26 |
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild |
27 |
@@ -10,13 +10,14 @@ VIRTUALX_REQUIRED=manual |
28 |
inherit autotools flag-o-matic multilib-minimal vala virtualx xdg-utils |
29 |
|
30 |
DESCRIPTION="Library to pass menu structure across DBus" |
31 |
-HOMEPAGE="https://launchpad.net/dbusmenu" |
32 |
+HOMEPAGE="https://launchpad.net/libdbusmenu" |
33 |
SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" |
34 |
|
35 |
LICENSE="LGPL-2.1 LGPL-3" |
36 |
SLOT="0" |
37 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
38 |
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86" |
39 |
IUSE="debug gtk gtk3 +introspection test" |
40 |
+RESTRICT="!test? ( test )" |
41 |
|
42 |
RDEPEND=" |
43 |
>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
44 |
@@ -24,8 +25,7 @@ RDEPEND=" |
45 |
dev-libs/libxml2[${MULTILIB_USEDEP}] |
46 |
gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) |
47 |
gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) |
48 |
- introspection? ( >=dev-libs/gobject-introspection-1 ) |
49 |
- !<${CATEGORY}/${PN}-0.5.1-r200" |
50 |
+ introspection? ( >=dev-libs/gobject-introspection-1 )" |
51 |
# tests also have optional dep on valgrind which we do not enforce |
52 |
DEPEND="${RDEPEND} |
53 |
app-text/gnome-doc-utils |
54 |
|
55 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild |
56 |
deleted file mode 100644 |
57 |
index d2da6965ec8..00000000000 |
58 |
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,153 +0,0 @@ |
61 |
-# Copyright 1999-2019 Gentoo Authors |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-EAPI=6 |
65 |
- |
66 |
-VALA_MIN_API_VERSION=0.16 |
67 |
-VALA_USE_DEPEND=vapigen |
68 |
-PYTHON_COMPAT=( python2_7 ) |
69 |
-VIRTUALX_REQUIRED=manual |
70 |
- |
71 |
-inherit autotools flag-o-matic multilib-minimal python-single-r1 vala \ |
72 |
- virtualx xdg-utils |
73 |
- |
74 |
-DESCRIPTION="Library to pass menu structure across DBus" |
75 |
-HOMEPAGE="https://launchpad.net/dbusmenu" |
76 |
-SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" |
77 |
- |
78 |
-LICENSE="LGPL-2.1 LGPL-3" |
79 |
-SLOT="0" |
80 |
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86" |
81 |
-IUSE="debug gtk gtk3 +introspection test" |
82 |
- |
83 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
84 |
- |
85 |
-RDEPEND=" |
86 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
87 |
- >=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}] |
88 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
89 |
- ${PYTHON_DEPS} |
90 |
- gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) |
91 |
- gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) |
92 |
- introspection? ( >=dev-libs/gobject-introspection-1 ) |
93 |
- !<${CATEGORY}/${PN}-0.5.1-r200" |
94 |
-# tests also have optional dep on valgrind which we do not enforce |
95 |
-DEPEND="${RDEPEND} |
96 |
- app-text/gnome-doc-utils |
97 |
- dev-util/glib-utils |
98 |
- dev-util/intltool |
99 |
- sys-devel/gettext |
100 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
101 |
- introspection? ( $(vala_depend) ) |
102 |
- test? ( |
103 |
- >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] |
104 |
- >=dev-util/dbus-test-runner-15.04.0_p100 |
105 |
- gtk? ( ${VIRTUALX_DEPEND} ) |
106 |
- gtk3? ( ${VIRTUALX_DEPEND} ) |
107 |
- )" |
108 |
- |
109 |
-pkg_setup() { |
110 |
- xdg_environment_reset |
111 |
- python-single-r1_pkg_setup |
112 |
-} |
113 |
- |
114 |
-src_prepare() { |
115 |
- if use introspection; then |
116 |
- vala_src_prepare |
117 |
- export VALA_API_GEN="${VAPIGEN}" |
118 |
- fi |
119 |
- python_fix_shebang tools |
120 |
- |
121 |
- eapply "${FILESDIR}/${P}-configure-fix.patch" |
122 |
- eapply "${FILESDIR}/${P}-werror.patch" |
123 |
- eapply_user |
124 |
- eautoreconf |
125 |
-} |
126 |
- |
127 |
-multilib_src_configure() { |
128 |
- append-flags -Wno-error #414323 |
129 |
- |
130 |
- local myconf=( |
131 |
- --cache-file="${BUILD_DIR}"/config.cache |
132 |
- --disable-gtk |
133 |
- --disable-static |
134 |
- # dumper extra tool is only for GTK+-2.x |
135 |
- --disable-dumper |
136 |
- $(multilib_native_use_enable introspection) |
137 |
- $(multilib_native_use_enable introspection vala) |
138 |
- $(use_enable debug massivedebugging) |
139 |
- $(use_enable test tests) |
140 |
- ) |
141 |
- local ECONF_SOURCE=${S} |
142 |
- econf "${myconf[@]}" |
143 |
- |
144 |
- GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') ) |
145 |
- local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) |
146 |
- local top_builddir=${BUILD_DIR} |
147 |
- |
148 |
- gtk_configure() { |
149 |
- local gtkconf=( |
150 |
- "${myconf[@]}" |
151 |
- --enable-gtk |
152 |
- --with-gtk="${MULTIBUILD_VARIANT}" |
153 |
- ) |
154 |
- mkdir -p "${BUILD_DIR}" || die |
155 |
- cd "${BUILD_DIR}" || die |
156 |
- econf "${gtkconf[@]}" |
157 |
- |
158 |
- rm -r libdbusmenu-glib || die |
159 |
- ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die |
160 |
- } |
161 |
- [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure |
162 |
-} |
163 |
- |
164 |
-gtk_emake() { |
165 |
- emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}" |
166 |
- multilib_is_native_abi && \ |
167 |
- emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}" |
168 |
-} |
169 |
- |
170 |
-multilib_src_compile() { |
171 |
- emake |
172 |
- |
173 |
- local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) |
174 |
- [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ |
175 |
- gtk_emake |
176 |
-} |
177 |
- |
178 |
-multilib_src_test() { |
179 |
- emake check |
180 |
- |
181 |
- gtk_test() { |
182 |
- # please keep the list of GTK+ tests up-to-date |
183 |
- emake -C "${BUILD_DIR}"/tests check \ |
184 |
- TESTS="test-gtk-objects-test test-gtk-label |
185 |
- test-gtk-shortcut test-gtk-reorder test-gtk-remove" |
186 |
- } |
187 |
- local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) |
188 |
- [[ ${GTK_VARIANTS[@]} ]] && virtx multibuild_foreach_variant \ |
189 |
- gtk_test |
190 |
-} |
191 |
- |
192 |
-multilib_src_install() { |
193 |
- emake -j1 DESTDIR="${D}" install |
194 |
- |
195 |
- local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) |
196 |
- [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ |
197 |
- gtk_emake -j1 install DESTDIR="${D}" |
198 |
-} |
199 |
- |
200 |
-multilib_src_install_all() { |
201 |
- einstalldocs |
202 |
- find "${D}" -name '*.la' -delete || die |
203 |
-} |
204 |
- |
205 |
-pkg_preinst() { |
206 |
- # kill old symlinks that Portage will preserve and break install |
207 |
- if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then |
208 |
- rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die |
209 |
- fi |
210 |
- if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then |
211 |
- rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die |
212 |
- fi |
213 |
-} |