Heather / gentoo-gnome

Unofficial Gnome Overlay (Also contains elementary stuff)
49 stars 40 forks source link

app-misc/tracker-2.2.2 differences #366

Open okias opened 4 years ago

okias commented 4 years ago
diff -Naur /usr/portage/app-misc/tracker/tracker-2.2.2.ebuild /var/lib/layman/gnome-next/app-misc/tracker/tracker-2.2.2.ebuild
--- /usr/portage/app-misc/tracker/tracker-2.2.2.ebuild  2019-12-09 01:39:37.000000000 +0100
+++ /var/lib/layman/gnome-next/app-misc/tracker/tracker-2.2.2.ebuild    2019-05-10 10:28:59.617267061 +0200
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.40"
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )

-inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg

 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
@@ -14,15 +13,13 @@
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"

-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"

 PV_SERIES=$(ver_cut 1-2)

 # In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
 RDEPEND="
-   >=dev-libs/glib-2.46:2
+   >=dev-libs/glib-2.59.3:2
    >=sys-apps/dbus-1.3.2
    >=dev-libs/gobject-introspection-1.54:=
    >=dev-libs/icu-4.8.1.2:=
@@ -34,17 +31,17 @@
    stemmer? ( dev-libs/snowball-stemmer )
    sys-apps/util-linux
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="${RDEPEND}
    dev-util/glib-utils
+   >=dev-util/intltool-0.40.0
    $(vala_depend)
    gtk-doc? ( >=dev-util/gtk-doc-1.8
-       app-text/docbook-xml-dtd:4.1.2
-       app-text/docbook-xml-dtd:4.5 )
+       app-text/docbook-xml-dtd:4.1.2 )
    >=sys-devel/gettext-0.19.8
    virtual/pkgconfig
    ${PYTHON_DEPS}
-"
+" # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup
+# intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0
 PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"

 function inotify_enabled() {
@@ -74,13 +71,12 @@

 src_configure() {
    local emesonargs=(
-       $(meson_use gtk-doc docs)
        -Dfts=true
-       -Dfunctional_tests=false # many fail in 2.2; retry with 2.3
-       #$(meson_use test functional_tests)
+       -Dfunctional_tests=false # python2, but g-ir-merge needs py3; https://gitlab.gnome.org/GNOME/tracker/merge_requests/40
+       $(meson_use gtk-doc)
        -Dman=true
-       $(meson_feature networkmanager network_manager)
-       $(meson_feature stemmer)
+       -Dnetwork_manager=$(usex networkmanager enabled disabled)
+       -Dstemmer=$(usex stemmer enabled disabled)
        -Dunicode_support=icu
        -Dbash_completion="$(get_bashcompdir)"
        -Dsystemd_user_services="$(systemd_get_userunitdir)"
@@ -91,13 +87,3 @@
 src_test() {
    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
-}