[gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/, ...
commit: 972b1e16b88b5e1da425ab028a96dbd91b450098
Author: Mart Raudsepp gentoo org>
AuthorDate: Fri Mar 29 22:48:06 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Mar 29 22:48:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972b1e16
app-accessibility/at-spi2-atk: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
app-accessibility/at-spi2-atk/Manifest | 2 -
.../at-spi2-atk/at-spi2-atk-2.24.1.ebuild | 48 ---
.../at-spi2-atk/at-spi2-atk-2.30.0.ebuild | 41 -
.../test-collection.xml| 20 ---
.../test-document.xml | 7 ---
.../test-editable-text.xml | 9 ---
.../test-hypertext.xml | 6 --
.../at-spi2-atk-2.20.0-tests-data/test-image.xml | 7 ---
.../test-selection.xml | 16 -
.../at-spi2-atk-2.20.0-tests-data/test-table.xml | 70 --
.../at-spi2-atk-2.20.0-tests-data/test-text.xml| 9 ---
.../at-spi2-atk-2.20.0-tests-data/test-value.xml | 6 --
12 files changed, 241 deletions(-)
diff --git a/app-accessibility/at-spi2-atk/Manifest
b/app-accessibility/at-spi2-atk/Manifest
index 3cb4d25c457..f2a27f9d2c2 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,4 +1,2 @@
-DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B
92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1
SHA512
5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B
108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266
SHA512
f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
-DIST at-spi2-atk-2.30.0.tar.xz 94824 BLAKE2B
65f8abb034a610e8aaa72c4d0e3c93fa03f6737cbf8bff28c885c654ba3fe98e8750e6398326e47069f12d33f75eae729cbafdfca31a3a0ab7b233ba3f8a4c58
SHA512
d7a02c347e31d78da81455cff77b44ab6d9e11add8d9457fba6a6b354cef731ab73e8a83060c150f3ef3d5191bfbc649618360a61c9826816b1aafb3e2bea7d5
DIST at-spi2-atk-2.30.1.tar.xz 94812 BLAKE2B
fe3ef77e749bef2300219fe32586ac0b871d06dce708ce8b7b57356a1fa17041c3f7b788e3e6d6b5f89dc97c3e8d43a9d1eb897ed8fbaac954f042421aef68b6
SHA512
862cccb65d2a8a7df4e899e4f53742535389a0efa0a75c936b52e68690c07e206b19d8308f0910cddb71bda0d803012d613f6959329ae43c411d1314062b7018
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
deleted file mode 100644
index cf70707dd34..000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility";
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
- >=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
- >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
- !https://wiki.gnome.org/Accessibility";
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
- >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
- >=dev-libs/atk-2.30.0[${MULTILIB_USEDEP}]
- >=app-accessibility/at-spi2-core-2.30.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests
failed'
-}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
deleted file mode 100644
index 7086ede8554..000
---
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
+++ /dev/null
@@
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/, ...
commit: 5874a2728031228dd169c450e763dd2e93cb288d
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Tue Aug 30 22:14:45 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Tue Aug 30 22:15:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5874a272
app-accessibility/at-spi2-atk: re-enable unittests
Tests were failing due to missing files in upstream tarball, see [1].
Add missing multilib dependency on libxml2 as it is needed to configure.
[1] https://bugzilla.gnome.org/show_bug.cgi?id=770615
Package-Manager: portage-2.3.0
.../at-spi2-atk/at-spi2-atk-2.20.1.ebuild | 12 ++--
.../test-collection.xml| 20 +++
.../test-document.xml | 7 +++
.../test-editable-text.xml | 9 +++
.../test-hypertext.xml | 6 ++
.../at-spi2-atk-2.20.0-tests-data/test-image.xml | 7 +++
.../test-selection.xml | 16 +
.../at-spi2-atk-2.20.0-tests-data/test-table.xml | 70 ++
.../at-spi2-atk-2.20.0-tests-data/test-text.xml| 9 +++
.../at-spi2-atk-2.20.0-tests-data/test-value.xml | 6 ++
10 files changed, 158 insertions(+), 4 deletions(-)
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
index 262acfa..e848c4f 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
@@ -15,9 +15,6 @@ SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos
~x86-macos"
IUSE="test"
-# tests fail on multilib setups
-RESTRICT="test"
-
COMMON_DEPEND="
>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
@@ -32,13 +29,20 @@ DEPEND="${COMMON_DEPEND}
test? ( >=dev-libs/libxml2-2.9.1 )
"
+src_prepare() {
+ # Upstream forgot to put this in tarball, upstream #770615
+ cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ ||
die
+
+ gnome2_src_prepare
+}
+
multilib_src_configure() {
ECONF_SOURCE=${S} \
gnome2_src_configure --enable-p2p $(use_with test tests)
}
multilib_src_test() {
- dbus-run-session -- emake -j1 check
+ emake check TESTS_ENVIRONMENT="dbus-run-session"
}
multilib_src_compile() { gnome2_src_compile; }
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
new file mode 100644
index ..7086ede
--- /dev/null
+++
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-collection.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
new file mode 100644
index ..7363a62
--- /dev/null
+++
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-document.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
new file mode 100644
index ..ae8084c2
--- /dev/null
+++
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-editable-text.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
new file mode 100644
index ..1b6be6d
--- /dev/null
+++
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-hypertext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
new file mode 100644
index ..b678ac2
--- /dev/null
+++
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-image.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git
a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml
b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.20.0-tests-data/test-selection.xml
n
