gentoo resync : 24.12.2018

3 files changed, 33 insertions, 27 deletions

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index dd416a17227e..f4c2da484da7 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,6 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
-DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
 DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f
-EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
-EBUILD file-roller-3.26.2.ebuild 2291 BLAKE2B 21dc85a2d9be514e7b1d52b84d04f62912d6a5c7dab426afefe8e18bcfb392db127793aaebda027a9d8d2fe2be04fef1aaabd6d8fae6e861da045b39cc19852b SHA512 fed4e28fdc8c328b519badc13d4beca3cb4c9103fc3dd1262d4175f4414431e777a8a9aff85f48e1d8f6dce3b35303c49e485b5ad1ef05992814fbe63733c690
+DIST file-roller-3.28.1.tar.xz 1367876 BLAKE2B 7a33b1d329e76beb2999d0a701aa182b83442471eeacdca61bf50d417f3748f4985642239faa3227ff6665ce7b0c56a802b4536cda794950524688607526bb1b SHA512 5418282a91771f6b7a95ceca986c780472341ca81a6fffa169a593709121c7d4694076bf074a00e3cb7bff6df0cf9f2904cf462cca5d0fbadf6e8aafbb344a03
+EBUILD file-roller-3.26.2.ebuild 2286 BLAKE2B f246648a91f0b1694eb64491b17b35d6f0408e5d8b0a5b25e75177b01ce6712eb687afafd2466b3e98cb5c37deff31c15d1dcd8d90be78e392b3a7004d1ae1eb SHA512 7757e72f407ecd43252505fbfc0d0b941444974ac114785c9262f01895875e5bc27563b370b9e9af6deb5102f7423b202586538a45627762dba9c15733bc8c61
+EBUILD file-roller-3.28.1.ebuild 2255 BLAKE2B dd14a89379e81b232c9bcb37db45a3536df1bca06e61c17b93ddd6527b05e093ca4b6d046ffe4c74cc682b1277070865636fe203aadea5a2f17cef660c2fb25e SHA512 332b1dc4b45d52702c09c78afa6ba06202e1b56deb51ce083cbd45038a51f9c6c4522320e0dfb835cba53c536e9b0514adcd9a285d258f90eb4ee7e5d28ee91f
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.26.2.ebuild b/app-arch/file-roller/file-roller-3.26.2.ebuild
index b7717363afee..579af8c57e09 100644
--- a/app-arch/file-roller/file-roller-3.26.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.28.1.ebuild
index e916e5b37d95..dc146d9e7396 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.28.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 readme.gentoo-r1
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
 
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
@@ -12,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
@@ -30,14 +29,13 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.22.2 )
 	packagekit? ( app-admin/packagekit-base )
 "
+# libxml2 required for glib-compile-resources
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
+	dev-libs/libxml2:2
 	dev-util/itstool
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
-# eautoreconf needs:
-#	gnome-base/gnome-common
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
@@ -61,29 +59,37 @@ zoo     - app-arch/zoo"
 
 src_prepare() {
 	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.22-packages.match data/packages.match || die
-	gnome2_src_prepare
+	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
+
+	xdg_src_prepare
 }
 
 src_configure() {
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable libnotify notification) \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit)
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use nautilus nautilus-actions)
+		$(meson_use libnotify notification)
+		$(meson_use packagekit)
+		-Dlibarchive=true
+		-Dmagic=true
+	)
+	meson_src_configure
 }
 
 src_install() {
-	gnome2_src_install
+	meson_src_install
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
 	readme.gentoo_print_elog
 }
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}