gentoo resync : 25.08.2020

3 files changed, 80 insertions, 2 deletions

diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index c8074c7319eb..7d264495b7ea 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,7 @@
 DIST xfconf-4.14.1.tar.bz2 644804 BLAKE2B 1b04770fa9b3f4901f561bc3978dd7ffdbfea9496330a98334ffb19c0c7413b0540423f20200e2e5191ff876f3e2c32ca8354bbab70aac4de00592d995f77e72 SHA512 727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808
 DIST xfconf-4.14.3.tar.bz2 591432 BLAKE2B 9722547018a6db7132bad53b750ec8bd66b2f5dde2348b605bf9a6ce6a7d18fefbfb16c31f58c1c4e6c593d3f0525c3bd8231b4bab0728bd64f91d918f0a6c23 SHA512 e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713
+DIST xfconf-4.15.0.tar.bz2 586244 BLAKE2B 0bc6331f6a00d9328b7d462da1bffd0aa57b7b6e5a48a6e9d05d43993910fe1a3677ca33ca2315caac0528087e61a66e574118efd6c9ea5fb2d068cc843532a8 SHA512 3d36881a5d4a8b514196905689f32eed0da49c642fced38c57fa9260013e2efc0ce83de502b91c5dd07734dd99c2521f2cac00b43d3d76141efe7eeddc03c5c7
 EBUILD xfconf-4.14.1.ebuild 1949 BLAKE2B a8a3953b1c2625ac1e2432217ddea0e7bdae9811c1770ea7f6b24d015ce1db9776e5f71cb591850babe297ae11366ee60f06777e3eaf510fe15b65974817632a SHA512 794c36200e9a9a7d6e41a54d8b8c1daeb6c1726acf3cf3a003740efc35050b947b06ae2832c4c206f29921707a2a6d8bbb978a254490b7cea0e33fb52f143579
-EBUILD xfconf-4.14.3.ebuild 1970 BLAKE2B 4e99b16d82c6afd2b8ad0201d01bcd0439f5c9031d4dfe20039bf807ea238b545c2817755ae5a7a96fcb949266bdb45900588f6762c4a009f8f24dcd5fa1bcdd SHA512 b5e23f16c284f91a66a4b81a08eec785ce306d0b81b48fbd57505e2c847d6551b1c0efdac6b4ad8050a0e4b9ad794a6b86f3712bc6b800d450a760956e1128ad
+EBUILD xfconf-4.14.3.ebuild 1965 BLAKE2B 18767591e7885e1acdd106c6c8393e5c99353802615adafda332fc451ef868671a123f3b7daa483fe6c0c0cc50011a36681c4806c3eeb53ed172308581f46ef3 SHA512 7ac591456badf8ad1f881be02dcbe5fd09065ef1aa61fabd89256390b1975764215d7da6b75c0a2d02c3972bd686ede9c8510891390b13850dde82d23266cd55
+EBUILD xfconf-4.15.0.ebuild 1757 BLAKE2B d09f4c9976687074b31d77ba0afb7a032239be697cb1d4a2f772b6986faa1da82c27151ffae7b6dbd72129274113c33598a546cc36a0d9e9b383ce072b84e2a6 SHA512 5eb83f862e7c62d8e1e67f7cb460ec616248f350033fc0eabbd1fc752e136b82e98c3e4b7d87562a2a255232d6db55c3cd740ec0ac83c63df42f7d6b7d151664
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.14.3.ebuild b/xfce-base/xfconf/xfconf-4.14.3.ebuild
index 93d826cca95d..497831d5927e 100644
--- a/xfce-base/xfconf/xfconf-4.14.3.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug introspection perl vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfconf/xfconf-4.15.0.ebuild b/xfce-base/xfconf/xfconf-4.15.0.ebuild
new file mode 100644
index 000000000000..993040c79af0
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.15.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 vala
+
+DESCRIPTION="A configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	sys-apps/dbus
+	>=xfce-base/libxfce4util-4.14:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	!<xfce-base/xfce4-panel-4.13.1
+	!<xfce-base/xfce4-settings-4.13.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+		$(use_enable debug checks)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local service_dir=${HOME}/.local/share/dbus-1/services
+	mkdir -p "${service_dir}" || die
+	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
+		[D-BUS Service]
+		Name=org.xfce.Xfconf
+		Exec=${S}/xfconfd/xfconfd
+	EOF
+
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		# -j>1 often hangs
+		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
+		nonfatal emake -j1 check
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}