gentoo resync : 24.12.2018

4 files changed, 51 insertions, 40 deletions

diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index f71f048ea93c..a9dc8ee0b3ad 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,5 @@
-DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
 DIST dconf-editor-3.26.2.tar.xz 542828 BLAKE2B e7bd35b39d7b0124105513d44f3a24d005f1c6daf2dccb1d3eeb324b65038adfc11e5ee83078058489b1e918222538a97621c74fb0a0ceb20e1a708ccf5a82bd SHA512 25a6536c97b4f6fc26890915e2d0ed3ff1d2247175fd25a7d86e44f33da8667064415b22890c799d3586cd0f08becc90414f02bf3d988aa1d02eee90d7e45ba5
-EBUILD dconf-editor-3.24.3.ebuild 709 BLAKE2B c7109dba5e8f3d88ae08b828d3a6376331a11b7a07fbd6090419300c4dcf88e0af193272b5654e9b1e4fcdd3c3090a272946808b16f94ac3df25d2bb30309dd2 SHA512 92c1ed759feb097ad15ac719a63399933da0e8dead7c0234f57030eebad5e06efeb878a72f974e6779d14e263c8f2e9fe34e823ed5671dfafaf349bb27eb2f5a
-EBUILD dconf-editor-3.26.2.ebuild 711 BLAKE2B 4b2485c15b542d7162c2fb9bff89127009919017f7f1096e98cb90f5667522bcd0d428c773e98494d1bae61d353edacf2595e95cb6e6e444517ba017a0846066 SHA512 12cd0f5f72300590a5e539ebfca2011abff4ad15ef84760aedf55c914362323811cff81655972ee9e9c3d3428e46a99855c25841cb6fe4bbe6afe20692458c0a
+DIST dconf-editor-3.28.0.tar.xz 417244 BLAKE2B 1237b199b7b991055fe30829dff0554be7e3122001c9c1a3bd1b17dc1aeeb0a4df6536560b072559c96d4da0b26bdf234479cb9c38ae979d08c220348df48649 SHA512 435c159fd3356c19e459ed9441671b508c5ba1b2d9f491d304280ef66b980779fda5769bb2e1e85a294ceebe9e729e4899ac0ab750f86e5ccdbdc455cf1ffc44
+EBUILD dconf-editor-3.26.2.ebuild 705 BLAKE2B 62ece465f4d27773b1089f646660601c10d82efe5bf23811b8b5aa4a4d499a0876d649828305d1408f84d440d80c35a6b073c5ede6f85e541f268f2ccb0ed64a SHA512 40d057586b0eb2710c7d202c3aa5df4901eea00e75dc22f028b5271aca35dbfdc64f74048f6d56d2e11ae22802df91c2ff2c41e938b41a440a6acdc5aa31842a
+EBUILD dconf-editor-3.28.0.ebuild 863 BLAKE2B 64b20c626f40bd0aff5fd40fa8ec2e22751f60b88747c8e474e70451218323fc4ad87a0f5b3253b0c75ec537b1832843989113c045e7163b0102f0f856967e96 SHA512 b999a3f7c4d479b37a94b8775aeeaeb9a6ebdce2029e57fbcb63f72980f8aca13568e4b050169b682353e27b50199d8d9493aafd2cf960348a3e291036a7f2de
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
deleted file mode 100644
index d594f7ab6d14..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/glib-2.46.0:2
-	>=gnome-base/dconf-0.25.1
-	>=x11-libs/gtk+-3.22.0:3
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/dconf-0.22[X]
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC="$(type -P true)"
-}
diff --git a/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
index 793439eceeb8..5614929cccd4 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-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
@@ -6,12 +6,12 @@ EAPI=6
 inherit gnome2
 
 DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/appstream-glib
diff --git a/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild b/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild
new file mode 100644
index 000000000000..1b5810193421
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.36"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+
+RDEPEND="
+	>=gnome-base/dconf-0.26.1
+	>=dev-libs/glib-2.55.1:2
+	>=x11-libs/gtk+-3.22.27:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}