sys-apps/mission-center: skip broken test

Closes: https://bugs.gentoo.org/939377 Signed-off-by: Takuya Wakazono <[email protected]>
gentoo · Sep 10, 2024 · 348bef5 · 348bef5
1 parent 8ee19df
commit 348bef5
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 48 deletions.
diff --git a/sys-apps/mission-center/files/mission-center-0.4.4-skip-test.patch b/sys-apps/mission-center/files/mission-center-0.4.4-skip-test.patch
@@ -0,0 +1,15 @@
+Upstream does not have valid appstream file.
+https://bugs.gentoo.org/939377
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,10 +20,6 @@ appstream_file = i18n.merge_file(
+   install_dir: join_paths(get_option('datadir'), 'metainfo')
+ )
+
+-appstream_util = find_program('appstream-util', required: false)
+-if appstream_util.found()
+-  test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
+-endif
+
+ install_data('io.missioncenter.MissionCenter.gschema.xml',
+   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
diff --git a/sys-apps/mission-center/mission-center-0.4.4-r2.ebuild b/sys-apps/mission-center/mission-center-0.4.4-r2.ebuild
@@ -314,7 +314,8 @@ ECARGO_HOME="${S}-build/cargo-home"
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 CeCILL-2 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/appstream-0.16.4
@@ -342,8 +343,23 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gobject-introspection
-	>=dev-build/meson-0.63
 	dev-util/blueprint-compiler
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+PATCHES=(
+	# bug 939377
+	"${FILESDIR}/${P}-skip-test.patch"
+)
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="
+	usr/bin/missioncenter
+	usr/bin/missioncenter-gatherer
 "
 
 src_unpack() {
@@ -356,7 +372,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	GATHERER_BUILD_DIR=$(usex debug debug release)
 	cd "${BUILD_DIR}/src/sys_info_v2/gatherer/src/${GATHERER_BUILD_DIR}/build/native/nvtop-${NVTOP_COMMIT}" || die
 	find "${S}/src/sys_info_v2/gatherer/3rdparty/nvtop/patches" \
@@ -367,19 +383,10 @@ src_prepare() {
 
 src_configure() {
 	EMESON_BUILDTYPE=$(usex debug debug release)
-	local emesonargs=(
-		--prefix=/usr
-	)
 	meson_src_configure
 	cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" || die
 }
 
-src_test() {
-	# patch the appstream-util validate command to use --nonet when validating the urls
-	sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}/data/meson.build" || die
-	meson_src_test
-}
-
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_pkg_postinst
@@ -389,10 +396,3 @@ pkg_postrm() {
 	gnome2_schemas_update
 	xdg_pkg_postrm
 }
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="
-	usr/bin/missioncenter
-	usr/bin/missioncenter-gatherer
-"
diff --git a/sys-apps/mission-center/mission-center-0.5.2-r1.ebuild b/sys-apps/mission-center/mission-center-0.5.2-r1.ebuild
@@ -257,7 +257,8 @@ ECARGO_HOME="${S}-build/cargo-home"
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 CeCILL-2 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/appstream-0.16.4
@@ -285,8 +286,23 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gobject-introspection
-	>=dev-build/meson-0.63
 	dev-util/blueprint-compiler
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+PATCHES=(
+	# bug 939377
+	"${FILESDIR}/${PN}-0.4.4-skip-test.patch"
+)
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="
+	usr/bin/missioncenter
+	usr/bin/missioncenter-gatherer
 "
 
 src_unpack() {
@@ -299,7 +315,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	GATHERER_BUILD_DIR=$(usex debug debug release)
 	cd "${BUILD_DIR}/src/sys_info_v2/gatherer/src/${GATHERER_BUILD_DIR}/build/native/nvtop-${NVTOP_COMMIT}" || die
 	find "${S}/src/sys_info_v2/gatherer/3rdparty/nvtop/patches" \
@@ -312,19 +328,10 @@ src_configure() {
 	filter-lto
 
 	EMESON_BUILDTYPE=$(usex debug debug release)
-	local emesonargs=(
-		--prefix=/usr
-	)
 	meson_src_configure
 	cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" || die
 }
 
-src_test() {
-	# patch the appstream-util validate command to use --nonet when validating the urls
-	sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}/data/meson.build" || die
-	meson_src_test
-}
-
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_pkg_postinst
@@ -334,10 +341,3 @@ pkg_postrm() {
 	gnome2_schemas_update
 	xdg_pkg_postrm
 }
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="
-	usr/bin/missioncenter
-	usr/bin/missioncenter-gatherer
-"
diff --git a/sys-apps/mission-center/mission-center-9999.ebuild b/sys-apps/mission-center/mission-center-9999.ebuild
@@ -23,7 +23,8 @@ S="${WORKDIR}/${PN}-v${PV}"
 BUILD_DIR="${S}-build"
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 CeCILL-2 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
-IUSE="debug"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/appstream-0.16.4
@@ -51,8 +52,23 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gobject-introspection
-	>=dev-build/meson-0.63
 	dev-util/blueprint-compiler
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+PATCHES=(
+	# bug 939377
+	"${FILESDIR}/${P}-skip-test.patch"
+)
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="
+	usr/bin/missioncenter
+	usr/bin/missioncenter-gatherer
 "
 
 src_unpack() {
@@ -65,7 +81,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	GATHERER_BUILD_DIR=$(usex debug debug release)
 	cd "${BUILD_DIR}/src/sys_info_v2/gatherer/src/${GATHERER_BUILD_DIR}/build/native/nvtop-${NVTOP_COMMIT}" || die
 	find "${S}/src/sys_info_v2/gatherer/3rdparty/nvtop/patches" \
@@ -97,10 +113,3 @@ pkg_postrm() {
 	gnome2_schemas_update
 	xdg_pkg_postrm
 }
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="
-	usr/bin/missioncenter
-	usr/bin/missioncenter-gatherer
-"