gentoo resync : 29.05.2018

3 files changed, 39 insertions, 21 deletions

diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index e26435ea6747..b10f883aa739 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,7 +1,8 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
+AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 AUX sawfish-1.9.1-firefox.patch 920 BLAKE2B 0ba7db2c91be76de52af3e07458b2a088e3cdee7147c64878a2429ce5a00c762bec55f46a8f8fedd622a8a8a6a30edbb51df74bc46a9b74fba8221f5a336443e SHA512 194b27a5674113b0820d5e03892973fb15b377cac9c43913b0f5698eb63cf6da556ff0edcee2b426fc218ea97f44bbbf5b21a4d6aa73af4a907cfc7944c53966
 DIST sawfish-1.9.1.tar.xz 2616612 BLAKE2B c81231723dbab4dcd994d838c2918e7af8415ccf0a2c8dd74031ab00adc29cf72563cca2d3ab7376fb88d42c4111e1460edc0789a9a07c00c3ebe93a57d941a4 SHA512 243a818e2cc2546c040f33fbc076bbcc4033b88f0b4be573f9daa80b2dcfd8d9dc97384d236b9b71d6efe08ad39bfd3f3f31b5c055b9b268418efb7668e27a42
-DIST sawfish_1.11.90.tar.xz 2751684 BLAKE2B 5635e26b7cad2455f232b0a2359c9d78485e4b9fb63f975d51d132680f88e50ad20b66d84375234aa42c725154a2ec046f348409e4576d3a09c050ffdbf0b7c0 SHA512 24735438167c1146e57f82a58876b68b1126d45f237751828ae9603a8eea966058fb6d8fbfddc28e1a96ab774a044b4b9b70b1e299f958b77eb32c987684925e
-EBUILD sawfish-1.11.90.ebuild 2332 BLAKE2B b0b05e5ad4359d4610048f5a321d756b50f2081ca86637ee8a9d1a4399a85bf8b1236c3a119e2eba2236d4aea1bb706cce97f40eacc1044c8afb1c599eb5d9f1 SHA512 745912863185eaccb070fd83a7157f1e386c742a3d279735fece5b7bbd367397e47b25662e17b347ae65a40f3b15d082b3a9f198b3029d0cc81bc371be7f05a6
+DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
+EBUILD sawfish-1.12.0.ebuild 2012 BLAKE2B 31886b09a130134407b51c1109f2e9f420c682225bca7272f162e26c832554c17c200179c22120a5ecb3b351a7ffe27f886b62ed679dc710514c17ea82cf7f92 SHA512 5e62f21e7fdbf1f0df9929c82f4506156d09f728a1cdc5987bc139d5628cc0bd9a9a5053401e25ad72211f26f33a754cdd1d981f607acfc79b1f105c41c741e1
 EBUILD sawfish-1.9.1-r2.ebuild 1832 BLAKE2B 6723a40547880fdcc4b471068fd79c08a1e4beeb3b282c6956a691d9f8aeb3c8858b453c3e1f5ce11e8906c6d43b6e9b2017da6302107f2e914636c8ab833ed8 SHA512 970a02beb9306c21f68b789fc1924bfa389d01e8e2ad0c67bcb201b5a79c7623112eae9843e71c322ae5e9a861e423da1a996c5ab8808f5f070c2bd2469ce72d
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch b/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch
new file mode 100644
index 000000000000..305155418c6b
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch
@@ -0,0 +1,19 @@
+diff -ur sawfish_1.12.0.orig/data/sawfish-config.desktop sawfish_1.12.0/data/sawfish-config.desktop
+--- sawfish_1.12.0.orig/data/sawfish-config.desktop	2016-08-13 11:26:23.000000000 +0300
++++ sawfish_1.12.0/data/sawfish-config.desktop	2016-08-13 12:02:33.283152716 +0300
+@@ -3,4 +3,4 @@
+ Name=Sawfish Config
+ Exec=sawfish-config
+ GenericName=Sawfish Config
+-Categories=Utility;Applet;
++Categories=Settings;DesktopSettings;
+diff -ur sawfish_1.12.0.orig/data/sawfish.desktop sawfish_1.12.0/data/sawfish.desktop
+--- sawfish_1.12.0.orig/data/sawfish.desktop	2016-08-13 11:26:23.000000000 +0300
++++ sawfish_1.12.0/data/sawfish.desktop	2016-08-13 12:02:31.790154154 +0300
+@@ -4,5 +4,5 @@
+ Name[el]=Πριονόψαρο (Sawfish)
+ Exec=sawfish
+ GenericName=Sawfish
+-Categories=Utility;DesktopUtility;
++Categories=System;
+ Keywords=Window Manager
diff --git a/x11-wm/sawfish/sawfish-1.11.90.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index a7d4141d7884..0c22bd469e35 100644
--- a/x11-wm/sawfish/sawfish-1.11.90.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -12,41 +12,39 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="emacs nls xinerama"
+IUSE="emacs kde nls xinerama"
 
-RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )
+RDEPEND="
+	emacs? ( virtual/emacs !app-emacs/sawfish )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
 	x11-libs/pangox-compat
+	x11-libs/gdk-pixbuf:2[X]
 	>=x11-libs/gtk+-2.24.0:2
 	x11-libs/libXtst
+	kde? ( kde-frameworks/kdelibs4support )
 	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )"
+	xinerama? ( x11-libs/libXinerama )
+"
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS
-	   doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT
-	   TODO )
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO )
 
 src_configure() {
-	# The configure script tries to use kde4-config (bug #573664) or
-	# kf5-config (from kdelibs4support) to detect where it should put
-	# its session files. This could probably be enabled for kde5 going
-	# forward (behind USE=kde), but there's currently a bug in the
-	# configure script preventing that from working nicely:
-	#
-	#   https://github.com/SawfishWM/sawfish/issues/22
-	#
-	# For now, we just disable the kde[45] session support entirely.
 	set -- \
+		$(use_with kde kde5session) \
 		$(use_with xinerama) \
 		--with-gdk-pixbuf \
 		--without-kde4session \
-		--without-kde5session \
 		--disable-static
 
 	if ! use nls; then
@@ -72,7 +70,7 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	if use emacs; then
 		elisp-install ${PN} sawfish.{el,elc}