From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- gnome-extra/gnome-software/Manifest | 6 +- .../gnome-software/gnome-software-3.28.2.ebuild | 6 +- .../gnome-software/gnome-software-3.30.6.ebuild | 101 --------------------- gnome-extra/gnome-software/metadata.xml | 1 - 4 files changed, 6 insertions(+), 108 deletions(-) delete mode 100644 gnome-extra/gnome-software/gnome-software-3.30.6.ebuild (limited to 'gnome-extra/gnome-software') diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest index 1a003992a172..ebfde12976ab 100644 --- a/gnome-extra/gnome-software/Manifest +++ b/gnome-extra/gnome-software/Manifest @@ -1,7 +1,5 @@ DIST gnome-software-3.22.7.tar.xz 3865764 BLAKE2B c23e3b9e34a9b233a584a920fcd5969b3ebb5fa4227da147870e71c1531da6c3efda913149a903667ae1725c505c1c842aac0a76b439a2730bf6c837f39757fc SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825 DIST gnome-software-3.28.2.tar.xz 5181868 BLAKE2B 4744ff13216ac1421700ef9c5ec9fb540ffb527ed8bff1bd2f7b90cb5c9b768180e3b30fc0b44724e27479f56f8867551b4b19a9496664418a6b6cbe0960623e SHA512 ca22ea589c19f3c5aae32fb2540646d3b3c8faf86f857dd414caf61b716bc50dea16281955c594a629f684da5ac87eeada6ac68247a9b0545600b739fa436dd7 -DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a EBUILD gnome-software-3.22.7.ebuild 1905 BLAKE2B 37a604c6a5f8d29c2cfc3f8e8a0ab83d10e97a8232dcbe8bc62068998cc251686f53122e27c04db4d309f51b466431dc8e29723b5c197c9b3da76f3c0238ca58 SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e -EBUILD gnome-software-3.28.2.ebuild 2227 BLAKE2B ebc79c51ede2f1228d07fe2fd576e31aa915c7615052f17ef5996d602e39837481d5ec488238ed576224aead119e96734161d7186063418404a3a95776b216a2 SHA512 a564833be3d1b0da1e9f7f363d377c563040b278ec732a4f3b8f03d3be9ced623790a86db77dad16f2e811ae40363b134c2c04eecd2f05fe101c41d32ed76d0a -EBUILD gnome-software-3.30.6.ebuild 2503 BLAKE2B fb342fd305937d2e6a9ee1e715683691648318576f77a76feecac8422af354971698bab42baf242b8947a533cdcb83c58d153928423bab5e0031b7a9a473b147 SHA512 3e4ac4ee1adbb7e8dc0ec7cb41c91c1825ccd3f2a5bf32f1cff6a956cbf6ab1c4e73f97c5f4474323c8461bbe28ef8ccdcea13911011efda7fabc88e869592a3 -MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7 +EBUILD gnome-software-3.28.2.ebuild 2279 BLAKE2B 401a34339b7d8484265b50ba83ed3476143aecd5eda7f49b6d75c392cda1e0ce19b0b47533fbdb6dc4c3ceb8f15572e20418d58e6e311d823cd1ba1ad879f5a4 SHA512 626eda6b4a952247501413f487e6c0fadfeb89a8215778e87b4646762a709675ea160bc01bee42d62e9f4e7e09a341d672c36db23765349654c0dde810a4b9db +MISC metadata.xml 364 BLAKE2B 55dee83c2b28ef3c3ecf738dc837455c9ab16351fcbdeee41726204d7d246ae42d7fd129e40bedd8563d3fd05cf4e82b6d22faabc06bff7996a1d87b7cdbc9df SHA512 a19e76913149b546abd9039dd4a51af6f74b59580c79f0370e7d95cf6e66b129f71d152c3dcc64fe237b1eab22c2bbf97d521b0a7bc1f46af6e7671770310e83 diff --git a/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild index ca92955b0f2a..3556c78411ba 100644 --- a/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild +++ b/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/libxml2:2 - >=sys-devel/gettext-0.19.8 + >=sys-devel/gettext-0.19.7 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) test? ( @@ -86,9 +86,11 @@ src_test() { pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update + gnome2_icon_cache_update } pkg_postrm() { xdg_pkg_postrm gnome2_schemas_update + gnome2_icon_cache_update } diff --git a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild deleted file mode 100644 index c7aa1aa96ec7..000000000000 --- a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="Gnome install & update software" -HOMEPAGE="https://wiki.gnome.org/Apps/Software" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+firmware gnome gtk-doc packagekit spell test udev" - -RDEPEND=" - >=dev-libs/appstream-glib-0.7.14:0 - >=x11-libs/gdk-pixbuf-2.32.0:2 - >=dev-libs/glib-2.56:2 - >=x11-libs/gtk+-3.22.4:3 - >=dev-libs/json-glib-1.2.0 - app-crypt/libsecret - >=net-libs/libsoup-2.52.0:2.4 - gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) - spell? ( app-text/gspell:= ) - sys-auth/polkit - packagekit? ( >=app-admin/packagekit-base-1.1.0 ) - firmware? ( >=sys-apps/fwupd-1.0.3 ) - udev? ( virtual/libgudev ) - >=gnome-base/gsettings-desktop-schemas-3.11.5 -" -DEPEND="${RDEPEND} - dev-libs/libxml2:2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) -" -# test? ( dev-util/valgrind ) - -python_check_deps() { - use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die - # Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session - # TODO: Investigate; seems to work outside ebuild .. test/emerge - sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die -} - -src_configure() { - local emesonargs=( - $(meson_use test tests) - $(meson_use spell gspell) - $(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?) - -Dman=true - $(meson_use packagekit) - # -Dpackagekit_autoremove - -Dpolkit=true - $(meson_use firmware fwupd) - -Dflatpak=false - -Drpm_ostree=false - -Dsteam=false - $(meson_use gnome shell_extensions) # Maybe gnome-shell USE? - -Dodrs=false - -Dubuntuone=false - -Dubuntu_reviews=false - -Dwebapps=true - $(meson_use udev gudev) - -Dsnap=false - -Dexternal_appstream=false - -Dvalgrind=false - $(meson_use gtk-doc gtk_doc) - ) - meson_src_configure -} - -src_test() { - virtx meson test -v -C ${BUILD_DIR} -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml index 92751ac281c6..74322fe8c80e 100644 --- a/gnome-extra/gnome-software/metadata.xml +++ b/gnome-extra/gnome-software/metadata.xml @@ -7,6 +7,5 @@ Enable firmware update support through sys-apps/fwupd - Enable module for package manager integration -- cgit v1.2.3