gentoo resync : 04.05.2019

6 files changed, 91 insertions, 78 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index d519136c6c53..8240668770cb 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 723d0f325d14..b5e6b177345f 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,8 @@
 DIST exo-0.12.3.tar.bz2 1233053 BLAKE2B 27cb6041778d5b0c93002f474d96d3a0ae9b02d651d3be047eb0e3d1e6640614c457fbac7557216c46b28008bca3f3be674e29e8be48243b6bf15917bae0c907 SHA512 1a727050b822aa4bdfbce22c1668372b10ddfd9c3988f6949ee32a5c5213d90e20ebafc923193c70dea373d217994fb42101fe2aad7bf55c8e81f983c5a2106f
 DIST exo-0.12.4.tar.bz2 1235738 BLAKE2B f05ae13bb5ec599686207df3fe7458b8a42227194c91c24397ed282d2c7a6ccf10989f14c662f2e0d986c59695de2b8d50743c8489bc716aaa001cbd23fe3598 SHA512 8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783
+DIST exo-0.12.5.tar.bz2 1236257 BLAKE2B e1ea6f63e1e64a4f098e03ab45f2ff21a3a3851dcafa314aaadea9fcbb00f790ab18d608b4920dac868a31048d618a67c7f69c7fd5bcd8ea187fea78d20f7d0b SHA512 00165ef85145603f59cc4188d2637ec51c8cc51d9f2288c4e5b0328a2b085e940fbaaa987bf5a51c9999184f2d4f6f9751f4304feb6143416bade826007b3bf6
 EBUILD exo-0.12.3.ebuild 973 BLAKE2B 430993a3415dbf13e10705eafd59f8f52baf428889dc7d76fe83a48f0110d56a0c79c8ebd388a9a672de599cb8ad9d5d0e9ae64151bd94cece7813979172aad6 SHA512 b1eb116c6247d62cb221c243a36b36775a237afe8ceccfb643b254ebe97e74cf5539815e52ca8b55770e7a14351b628d83be6755747c1828d3149191ea2d90f1
 EBUILD exo-0.12.4.ebuild 974 BLAKE2B 6ebb54a4157f3024f7f9502acbfe23bf2211dcd8cc4c6fd06bff00e0cb595b4f33040a32704ededdbf36551acd6106906848f36e3fb631fb3e67fa98e425e40b SHA512 a8bdc535037c1114ee8f8f0b1a52015d13e4601d1dd775db0630a650e627c965ced0317c2984cb3f01a09358f6973e78cc6eab968919bbdd0325a78c3e4f6663
+EBUILD exo-0.12.5-r100.ebuild 1025 BLAKE2B 9126a34aec5fca2a5a18d1318f48c37619883a26aceaaf98b52c6ab1d673bb87da517ad59ee8f07b7a4fafa0f0728d584fa61cfbb3f2f3d4434f2b54b22c4ac1 SHA512 61f058fa1c4e597d05da0f31b061380efbfd3a98d92657c0d26c96794dd11a46861d7f6a5714391862457323b24143ac02048400d6bed0773690003be3ca9cb1
+EBUILD exo-0.12.5.ebuild 971 BLAKE2B c77ca40760ca40d6e57715b1bf144fe3fbeef49238a8fbb853e80d438e7355116546b13bb304e2995247e2afdaa27e4755a84509ed69aa40ab08a01b5f84cb9a SHA512 239e7e2c99bb5bc5721e7e986ea04447a325a74d617f1bfb8fdd952431a1aeb7806649b09570486be3b799a771bba2261e67b66b028f48355b0d0e4e4994e03e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.5-r100.ebuild b/xfce-base/exo/exo-0.12.5-r100.ebuild
new file mode 100644
index 000000000000..5ce9384936af
--- /dev/null
+++ b/xfce-base/exo/exo-0.12.5-r100.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.42:=
+	dev-perl/URI
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--disable-gtk2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/exo/exo-0.12.5.ebuild b/xfce-base/exo/exo-0.12.5.ebuild
new file mode 100644
index 000000000000..c41e7657499d
--- /dev/null
+++ b/xfce-base/exo/exo-0.12.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.42:=
+	dev-perl/URI
+	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index b44b44dcb362..6c8ae1cb1f60 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -3,6 +3,5 @@ DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c7461
 DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
 DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 EBUILD xfwm4-4.12.5.ebuild 1548 BLAKE2B bcad70f5676a341ada91eb817f59a5dfe1cf1f071ee2f767ba9e499e107c9c57f89ff138b6cdc05a579e28101d183557c9ae922cb8f94468589cfa9885ca91ee SHA512 5b38b1c8492b8c8a261ef0e89eddc531210dfcaf9158a32bae18ff1721f88ea91646a05a600fa5931bf53acedacebb26320a1ef136445c4b99ea011141222245
-EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
 EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
deleted file mode 100644
index 45a8b26c1892..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-3.14:3=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-PATCHES=(
-	# set of patches to fix refresh issues
-	# https://bugs.gentoo.org/614564
-	"${WORKDIR}/${P}-patchset"
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}