From 65ffecb8853c686b6c979e71ac2fbf466b2f931a Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Wed, 10 Apr 2019 15:00:55 +0300 Subject: gnome-extra/nemo-3.8: use tracker-2 I am trying to remove tracker-1 subslot from tree, so patch nemo-3.8 to support tracker-2 too, as I don't want to remove all of cinnamon 3.8 set just for that (and only removing 3.8 doesn't make sense). Remove bogus LA_PUNT and unnecessary src_prepare while here. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp --- gnome-extra/nemo/nemo-3.8.6-r1.ebuild | 79 +++++++++++++++++++++++++++++++++ gnome-extra/nemo/nemo-3.8.6.ebuild | 82 ----------------------------------- gnome-extra/nemo/nemo-4.0.6.ebuild | 7 +-- 3 files changed, 80 insertions(+), 88 deletions(-) create mode 100644 gnome-extra/nemo/nemo-3.8.6-r1.ebuild delete mode 100644 gnome-extra/nemo/nemo-3.8.6.ebuild (limited to 'gnome-extra/nemo') diff --git a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild new file mode 100644 index 000000000000..4ddc41997b43 --- /dev/null +++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{5,6} ) + +inherit meson eutils gnome2 python-any-r1 virtualx + +DESCRIPTION="A file manager for Cinnamon, forked from Nautilus" +HOMEPAGE="http://cinnamon.linuxmint.com/" +SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="exif +introspection +nls packagekit selinux tracker xmp" +RESTRICT=test + +COMMON_DEPEND=" + >=dev-libs/glib-2.37.3:2[dbus] + >=gnome-extra/cinnamon-desktop-2.6.1:0= + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.9.10:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + + gnome-base/dconf:0= + gnome-base/gsettings-desktop-schemas + >=x11-libs/libnotify-0.7:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + >=x11-libs/xapps-1.0.4 + + exif? ( >=media-libs/libexif-0.6.20:= ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + tracker? ( >=app-misc/tracker-0.12:= ) + xmp? ( >=media-libs/exempi-2.2.0:= ) + selinux? ( sys-libs/libselinux ) +" +RDEPEND="${COMMON_DEPEND} + x11-themes/adwaita-icon-theme + nls? ( >=gnome-extra/cinnamon-translations-2.2 ) +" + +PDEPEND=">=gnome-base/gvfs-0.1.2" + +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/polib[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.31.0 + dev-util/gtk-doc-am + >=dev-util/intltool-0.40.1 + sys-devel/gettext + virtual/pkgconfig + x11-base/xorg-proto + + dev-util/gtk-doc + gnome-base/gnome-common +" +# For eautoreconf +# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!) + +PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065 + +src_configure() { + meson_src_configure \ + -Dexif=$(usex exif true false) \ + -Dtracker=$(usex tracker true false) \ + -Dxmp=$(usex xmp true false) \ + -Dselinux=$(usex selinux true false) +} + +src_install() { + meson_src_install +} diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6.ebuild deleted file mode 100644 index c4ae41b45371..000000000000 --- a/gnome-extra/nemo/nemo-3.8.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit meson eutils gnome2 python-any-r1 virtualx - -DESCRIPTION="A file manager for Cinnamon, forked from Nautilus" -HOMEPAGE="http://cinnamon.linuxmint.com/" -SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="exif +introspection +nls packagekit selinux tracker xmp" -RESTRICT=test - -COMMON_DEPEND=" - >=dev-libs/glib-2.37.3:2[dbus] - >=gnome-extra/cinnamon-desktop-2.6.1:0= - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.9.10:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - - gnome-base/dconf:0= - gnome-base/gsettings-desktop-schemas - >=x11-libs/libnotify-0.7:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - >=x11-libs/xapps-1.0.4 - - exif? ( >=media-libs/libexif-0.6.20:= ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - tracker? ( >=app-misc/tracker-0.12:0/100 ) - xmp? ( >=media-libs/exempi-2.2.0:= ) - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${COMMON_DEPEND} - x11-themes/adwaita-icon-theme - nls? ( >=gnome-extra/cinnamon-translations-2.2 ) -" - -PDEPEND=">=gnome-base/gvfs-0.1.2" - -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/polib[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.31.0 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto - - dev-util/gtk-doc - gnome-base/gnome-common -" -# For eautoreconf -# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!) - -src_prepare() { - gnome2_src_prepare -} - -src_configure() { - meson_src_configure \ - -Dexif=$(usex exif true false) \ - -Dtracker=$(usex tracker true false) \ - -Dxmp=$(usex xmp true false) \ - -Dselinux=$(usex selinux true false) -} - -src_install() { - meson_src_install -} diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild index 80cd39e0275d..4aa693cf74b4 100644 --- a/gnome-extra/nemo/nemo-4.0.6.ebuild +++ b/gnome-extra/nemo/nemo-4.0.6.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) inherit meson eutils gnome2 python-any-r1 virtualx @@ -67,10 +66,6 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065 -src_prepare() { - gnome2_src_prepare -} - src_configure() { meson_src_configure \ -Dexif=$(usex exif true false) \ -- cgit v1.2.3-65-gdbad