commit:     aafe76ca76f0c780d4ce508117d4789236b7a834
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 21:59:33 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 21:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafe76ca

app-misc/tracker-miners: Version bump to 3.1.1

And add a tracker-miners-2 verion that is parallel-installable.

Bug: https://bugs.gentoo.org/778917
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 +
 ...s-3.1.1-Fix-asciidoc-manpage.xsl-location.patch |  25 +++
 .../tracker-miners/tracker-miners-2.3.5-r1.ebuild  | 159 +++++++++++++++++++
 .../tracker-miners/tracker-miners-3.1.1.ebuild     | 170 +++++++++++++++++++++
 profiles/package.mask                              |   1 +
 5 files changed, 356 insertions(+)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index cb04f715094..b869c0e205d 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,4 @@
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B 
a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b
 SHA512 
1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
 DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B 
f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f
 SHA512 
ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B 
a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a
 SHA512 
13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
+DIST tracker-miners-3.1.1.tar.xz 4066784 BLAKE2B 
60ae0141b295f08f9fce92b2697adcabfa1c7dcadd32759a5283771e6c98aed03a2f9a2afc8c60138a3c3590d96b59fbeb844dfbd34acb89d83dd40d1476858c
 SHA512 
d7935fd02e0971a377106c65005b6ed4fdcc2c147f698d3cb36fea8e78019050e8b8ae5a407dea9809196c0186b8969c923767445249a85ad8b81a10e07c242f

diff --git 
a/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
 
b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
new file mode 100644
index 00000000000..26bea773b28
--- /dev/null
+++ 
b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
@@ -0,0 +1,25 @@
+From 24a47894578f48c54cb303c8a11ad8df29fc93a4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <[email protected]>
+Date: Sat, 13 Mar 2021 17:35:17 -0500
+Subject: [PATCH] Fix asciidoc manpage.xsl location
+
+---
+ docs/manpages/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index 0b8a64863..831d08597 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '/usr/share/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,
+-- 
+2.26.2
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild 
b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
new file mode 100644
index 00000000000..417aa39630d
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw 
+rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via 
gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be 
libunistring instead); so choose ICU over enca always here for the time being 
(ICU is preferred)
+RDEPEND="
+       >=dev-libs/glib-2.46:2
+       >=app-misc/tracker-2.2.0:0=
+       gstreamer? (
+               media-libs/gstreamer:1.0
+               media-libs/gst-plugins-base:1.0
+               media-plugins/gst-plugins-meta:1.0 )
+       !gstreamer? (
+               ffmpeg? ( media-video/ffmpeg:0= ) )
+
+       >=sys-apps/dbus-1.3.1
+       xmp? ( >=media-libs/exempi-2.1.0:= )
+       raw? ( media-libs/gexiv2 )
+       >=dev-libs/icu-4.8.1.2:=
+       cue? ( media-libs/libcue:= )
+       exif? ( >=media-libs/libexif-0.6 )
+       gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+       xps? ( app-text/libgxps )
+       iptc? ( media-libs/libiptcdata )
+       jpeg? ( virtual/jpeg:0 )
+       iso? ( >=sys-libs/libosinfo-0.2.10 )
+       >=media-libs/libpng-1.2:0=
+       seccomp? ( >=sys-libs/libseccomp-2.0 )
+       tiff? ( media-libs/tiff:0 )
+       xml? ( >=dev-libs/libxml2-2.6 )
+       pdf? ( >=app-text/poppler-0.16.0[cairo] )
+       playlist? ( >=dev-libs/totem-pl-parser-3:= )
+       upower? ( >=sys-power/upower-0.9.0 )
+       sys-libs/zlib:0
+       gif? ( media-libs/giflib:= )
+
+       rss? ( >=net-libs/libgrss-0.7:0 )
+       app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       dev-util/glib-utils
+       dev-util/gdbus-codegen
+
+       >=dev-util/intltool-0.40.0
+       >=sys-devel/gettext-0.19.8
+       virtual/pkgconfig
+       test? ( ${PYTHON_DEPS}
+               gstreamer? (
+                       media-libs/gstreamer:1.0[introspection]
+                       || ( media-plugins/gst-plugins-libav:1.0
+                               media-plugins/gst-plugins-openh264:1.0 )
+       ) )
+"
+# intltool-merge manually called in meson.build in 2.3.5
+
+PATCHES=(
+       "${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
+
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       # Avoid gst-inspect calls that may trigger sandbox; instead assume the 
detection will succeed and add the needed test deps for that
+       if use gstreamer; then
+               sed -i -e 's:detect-h264-codec.sh:/bin/true:' 
tests/functional-tests/meson.build || die
+       else
+               sed -i -e 's:detect-h264-codec.sh:/bin/false:' 
tests/functional-tests/meson.build || die
+       fi
+       xdg_src_prepare
+       gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+       local media_extractor="none"
+       if use gstreamer ; then
+               media_extractor="gstreamer"
+       elif use ffmpeg ; then
+               media_extractor="libav"
+       fi
+
+       local emesonargs=(
+               -Dtracker_core=system
+
+               -Ddocs=true
+               -Dextract=true
+               -Dfunctional_tests=false # currently broken, may fare better in 
2.2.3 or 2.3; if re-enabled re-add dconf test dep
+               #$(meson_use test functional_tests)
+               -Dminer_fs=true
+               $(meson_use rss miner_rss)
+               -Dwriteback=true
+               -Dabiword=true
+               -Ddvi=true
+               -Dicon=true
+               -Dmp3=true
+               -Dps=true
+               -Dtext=true
+               -Dunzip_ps_gz_files=true # spawns gunzip
+
+               $(meson_feature cue)
+               $(meson_feature exif)
+               -Dflac=disabled # never use external flac extractor - 
gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+               $(meson_feature gif)
+               $(meson_feature gsf)
+               $(meson_feature iptc)
+               $(meson_feature iso)
+               $(meson_feature jpeg)
+               $(meson_feature pdf)
+               $(meson_feature playlist)
+               -Dpng=enabled
+               $(meson_feature raw)
+               $(meson_feature tiff)
+               -Dvorbis=disabled # never use external vorbis extractor - 
gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's 
non-default
+               $(meson_feature xml)
+               $(meson_feature xmp)
+               $(meson_feature xps)
+
+               -Dbattery_detection=$(usex upower upower none)
+               -Dcharset_detection=icu # enca is a possibility, but right now 
we have tracker core always dep on icu and icu is preferred over enca
+               -Dgeneric_media_extractor=${media_extractor}
+               # gupnp gstreamer_backend is in bad state, upstream suggests to 
use discoverer, which is the default
+               -Dautostart=false # false to co-exist with tracker-miners-3
+               -Dsystemd_user_services="$(systemd_get_userunitdir)"
+       )
+       meson_src_configure
+}
+
+src_test() {
+       export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly 
check for it (env_reset set it to "memory")
+       dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       gnome2_schemas_update
+}
+
+pkg_postrm() {
+       xdg_pkg_postrm
+       gnome2_schemas_update
+}

diff --git a/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild 
b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
new file mode 100644
index 00000000000..d7492f7d339
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf 
+playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via 
gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be 
libunistring instead); so choose ICU over enca always here for the time being 
(ICU is preferred)
+RDEPEND="
+       >=dev-libs/glib-2.62:2
+       >=app-misc/tracker-3.0:0=
+       gstreamer? (
+               media-libs/gstreamer:1.0
+               media-libs/gst-plugins-base:1.0
+               media-plugins/gst-plugins-meta:1.0 )
+       !gstreamer? (
+               ffmpeg? ( media-video/ffmpeg:0= ) )
+
+       >=sys-apps/dbus-1.3.1
+       xmp? ( >=media-libs/exempi-2.1.0:= )
+       raw? ( media-libs/gexiv2 )
+       >=dev-libs/icu-4.8.1.2:=
+       cue? ( media-libs/libcue:= )
+       exif? ( >=media-libs/libexif-0.6 )
+       gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+       xps? ( app-text/libgxps )
+       iptc? ( media-libs/libiptcdata )
+       jpeg? ( virtual/jpeg:0 )
+       iso? ( >=sys-libs/libosinfo-0.2.10 )
+       >=media-libs/libpng-1.2:0=
+       seccomp? ( >=sys-libs/libseccomp-2.0 )
+       tiff? ( media-libs/tiff:0 )
+       xml? ( >=dev-libs/libxml2-2.6 )
+       pdf? ( >=app-text/poppler-0.16.0[cairo] )
+       playlist? ( >=dev-libs/totem-pl-parser-3:= )
+       upower? ( >=sys-power/upower-0.9.0 )
+       sys-libs/zlib:0
+       gif? ( media-libs/giflib:= )
+
+       networkmanager? ( net-misc/networkmanager:= )
+
+       rss? ( >=net-libs/libgrss-0.7:0 )
+       app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       app-text/asciidoc
+       dev-libs/libxslt
+       dev-util/glib-utils
+       dev-util/gdbus-codegen
+
+       >=sys-devel/gettext-0.19.8
+       virtual/pkgconfig
+       test? (
+               ${PYTHON_DEPS}
+               $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+               gstreamer? (
+                       media-libs/gstreamer:1.0[introspection]
+                       || (
+                               media-plugins/gst-plugins-libav:1.0
+                               media-plugins/gst-plugins-openh264:1.0
+                       )
+               )
+       )
+"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-Fix-asciidoc-manpage.xsl-location.patch
+)
+
+python_check_deps() {
+       has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       # https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/323
+       sed -i -e 's:environtment:env:' tests/libtracker-extract/meson.build || 
die
+
+       # Avoid gst-inspect calls that may trigger sandbox; instead assume the 
detection will succeed and add the needed test deps for that
+       if use gstreamer; then
+               sed -i -e 's:detect-h264-codec.sh:/bin/true:' 
tests/functional-tests/meson.build || die
+       else
+               sed -i -e 's:detect-h264-codec.sh:/bin/false:' 
tests/functional-tests/meson.build || die
+       fi
+       xdg_src_prepare
+       gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+       local media_extractor="none"
+       if use gstreamer ; then
+               media_extractor="gstreamer"
+       elif use ffmpeg ; then
+               media_extractor="libav"
+       fi
+
+       local emesonargs=(
+               -Dtracker_core=system
+
+               -Dman=true
+               -Dextract=true
+               $(meson_use test functional_tests)
+               $(meson_use test tests_tap_protocol)
+               -Dminer_fs=true
+               $(meson_use rss miner_rss)
+               -Dwriteback=true
+               -Dabiword=true
+               -Dicon=true
+               -Dmp3=true
+               -Dps=true
+               -Dtext=true
+               -Dunzip_ps_gz_files=true # spawns gunzip
+
+               $(meson_feature networkmanager network_manager)
+               $(meson_feature cue)
+               $(meson_feature exif)
+               $(meson_feature gif)
+               $(meson_feature gsf)
+               $(meson_feature iptc)
+               $(meson_feature iso)
+               $(meson_feature jpeg)
+               $(meson_feature pdf)
+               $(meson_feature playlist)
+               -Dpng=enabled
+               $(meson_feature raw)
+               $(meson_feature tiff)
+               $(meson_feature xml)
+               $(meson_feature xmp)
+               $(meson_feature xps)
+
+               -Dbattery_detection=$(usex upower upower none)
+               -Dcharset_detection=icu # enca is a possibility, but right now 
we have tracker core always dep on icu and icu is preferred over enca
+               -Dgeneric_media_extractor=${media_extractor}
+               # gupnp gstreamer_backend is in bad state, upstream suggests to 
use discoverer, which is the default
+               -Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+       )
+       meson_src_configure
+}
+
+src_test() {
+       export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly 
check for it (env_reset set it to "memory")
+       dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       gnome2_schemas_update
+}
+
+pkg_postrm() {
+       xdg_pkg_postrm
+       gnome2_schemas_update
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index a64c72c3fd8..c6060d2184b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -35,6 +35,7 @@
 # Matt Turner <[email protected]> (2021-04-13)
 # Masked for testing
 >=app-misc/tracker-3
+>=app-misc/tracker-miners-3
 
 # Michał Górny <[email protected]> (2021-04-10)
 # Obsolete backport to Python < 3.4.  No reverse dependencies left.

Reply via email to