gentoo resync : 24.12.2018

4 files changed, 47 insertions, 60 deletions

diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index f1c7574c153e..09fb81a4cc2e 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
 DIST gnome-characters-3.26.2.tar.xz 1547868 BLAKE2B 8fda44bcb3f9033dba0717a698d9db100d260624b92843ed6cf1fa45a0de2d0c326fdce5eead1868b4841da7a10a1ae25fd0298051cafd4e60d0e26ec428ad02 SHA512 a9bce1810f4ba4de59275421e201838ede4781d636231307906ab10fd588ca4ba945aee6f6f8bb847c9b76a7a0db86613189542649cb8561542bec3c774645b0
-EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
-EBUILD gnome-characters-3.26.2.ebuild 767 BLAKE2B bfe0783bbd5736de1949e98ff6cb82b108ece445f4d2233c26b1f9b9cd95e6c8b4cbb6154ad15094d0473ff2c537789f14075ebe5811edd213b27e1e786e74d0 SHA512 d77b52045e1e8a8ebcd6ffb22a61c512b5ff0b8c2f1377c92f34718537ff40ae8d8d26cb7e3ea6283c528facb9ceff4f3d5e22527a8ca9a6cf99da3f451ef6df
+DIST gnome-characters-3.30.0.tar.xz 974068 BLAKE2B 294b401e410e4383120deaa4ef3adad485c27e59879ff412d9eb282678f07faba6fb5a93e01c0aebaac7dbac7abd5c19876a0b84403ad92ffc24211daec961bd SHA512 390536e0e5891497c5bd2374c70085beb5bc7c730f51d889e4147895f24999c5c3e9a0bc466a3d4c5652922f1cd7ce1f8f1a98e61007df59d682c230bc99acd2
+EBUILD gnome-characters-3.26.2.ebuild 765 BLAKE2B fe33d2032b4eb2c26fcc6a34f20f165aee3baf2613ed6c3f15856771e6dde399be18a3026bf8ddd2dfa1a28c452e47d0ac6223321f51ad696031e10921b2a00e SHA512 8301ccebbbd871d650cbcfead0c99befebf235890452647c3d85a44a73e9a85dc6655b7d176307d11a1027e3760cbe68bb64fd38a734a0bc8ce7e0308f94c0ee
+EBUILD gnome-characters-3.30.0.ebuild 887 BLAKE2B 506f44a059c55d38fba68acc35b154f622c58849247817da47929235b4eac0382973e6b70e6a4dc89d1f2ffaef3ef54eaae7fb25e94040fb35be2ea94990eb29 SHA512 14c36ae179369b71b32cf6496e8f8d1dc8dc47d6491f369fcafeca11ac34bc9c7ef8c629b64010c7883c5237f1fbd1d686cb9c47eb692665fd896d0e297e24d6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
deleted file mode 100644
index ef88e3fd8906..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed 's/print \(.*\)/print(\1)/' -i "${S}"/tests/smoke_test.py || die
-
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
index 0c62363572ba..92489a93a964 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
new file mode 100644
index 000000000000..5febaa80b536
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3.20:3[introspection]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}