gentoo resync : 24.12.2018

3 files changed, 72 insertions, 1 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index d0d69c3a6442..3e50eedbe274 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -5,6 +5,8 @@ AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd6
 AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2
 DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
 DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
+DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
 EBUILD cinnamon-session-3.6.1-r4.ebuild 1540 BLAKE2B de1d180a3c7ef0b85ff0f8e9766108d5e6f8ed58fab9c124b21d9acf5907665db3eb45723b48e31bdbc9772ecfe5358d0f46c9702c346253530de4bfc9f7dca0 SHA512 4e12e45b19c8c54cc8319ff554c1372942a72ad54f8e13e5b24e23f230ea09292403395fad216cb95bccaddf64d22d4b2a4adc281e8abe4b4b27271d1004123a
-EBUILD cinnamon-session-3.8.0.ebuild 1450 BLAKE2B f9f5547f664e96193165f7d2bd183ed162026700f201d49aba1f681b9006123a22aa204fb369f661bb923b409133df25f3fd7318cae96d1d6c2df2081c907b71 SHA512 db53aa1732d2dfa0d84ad4c1788b59b292028d5b90c2916342782ff78f483b95e7eeda126b4b2b242ad601188f5bae538398f47bb5a374be156bda18afec6fd4
+EBUILD cinnamon-session-3.8.0.ebuild 1474 BLAKE2B 5e8dd60d0a4c5ff3a6b6c5f68f1be9e30847eef7670889883a47e760ec0e5bb6cdaeb2c9a2feb162bbd26be6d79f793c90ab7ee043b9d02657fb763b29206187 SHA512 505078b87d43e3460bfed29622e93b799f154f2da1d12498647f6a85e270461798eda594529ce5eccdfdaf15b4a497ec9073c54cfc7e55600c45a765c4a29ca7
+EBUILD cinnamon-session-4.0.0.ebuild 1471 BLAKE2B 96fc2466fc1089c7b66e26e748241ad59f3503039695761908b6ac6dc1b4da116d35de8239fd84f3a66b67621caa310ceb9987220596bbdcafb7e85ecde7bc61 SHA512 74e65752aa91f079ac0f77230a0abe8370a121340dc45be2c6b5cddef7cfdc4c2c68a7a101a713de6fdb96587bb44572ef89d25f160673694076f0cb0d2970fc
 MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
index 1dd7ed6cc952..199699e2688b 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
+	>=x11-libs/xapps-1.0.4
 	virtual/opengl
 	systemd? ( >=sys-apps/systemd-183
 			   sys-auth/polkit )
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
new file mode 100644
index 000000000000..80d2ae516f7e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	>=x11-libs/xapps-1.0.4
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183
+			   sys-auth/polkit )
+	!systemd? ( sys-power/upower
+			   sys-auth/polkit[elogind] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/elogind[policykit] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \
+		   "${FILESDIR}/${PN}-3.8.0-elogind2.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	meson_src_configure \
+		-Dwith-gconf=false \
+		-Dwith-docbook=$(usex doc true false) \
+		-Dwith-ipv6=$(usex ipv6 true false)
+}
+
+src_install() {
+	meson_src_install
+}