gentoo resync : 07.10.2018

3 files changed, 66 insertions, 5 deletions

diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index a93cd220759a..4ee581955458 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,5 +1,6 @@
-AUX treewm-0.4.5-gcc43.patch 614 BLAKE2B 033c54a54ec06e81ac80890501f4d1f9d27633cd1b489566e6f32bdbab59286175eebe6f6a063aa7cae47f5acc7a74212744bded7bef5f2be5e25b8b27dbe026 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94
+AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4
 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf
 EBUILD treewm-0.4.5-r1.ebuild 1599 BLAKE2B 904b4cada4b8c3be319caaee79be8f3b3b0454a7c565877ddf190ac10d35514e74c0a98b1f6040ef50aefa0295b853acf610d243d592592a64bd427a6b4a17f7 SHA512 539d70320dfd4aabf552e9ca89e0ec19ffaaf8c362a01a82d33cfc02ad33afa4468cd7cede0d760b5ebbf9d54a60244c299254471d353c24de6fefec02581d9c
+EBUILD treewm-0.4.5-r2.ebuild 1589 BLAKE2B 78a64ae7946970acf37a9b7820c812f6bcb35d6dfb537a5ce31b087cf14e454415e20cf7435c0ae28d0db880941d2a48a9d42968fd37dbe7f3c5f27c7648dffb SHA512 a40275d30c81d01fac01cda23e83c724c46a6dac289fa181d508d7d813b68edfb4136363cbfb6b667cbeb459d28f9c6fca02aa7c7995c537e7784497853f2492
 EBUILD treewm-0.4.5.ebuild 925 BLAKE2B fdb77850da3956c010cdc3323eac63f44d128a986fd5d740891deb6ca90ca96eb18d27a296385bc651adb44dfdbc0a9c53075e26c4296d9bfb7b0918ea18ecb6 SHA512 08d4c32998543e58c3dc3afa4b4c41508c5a6bec8ead513d230b32cb8bd3773bcdbf71b5759de0021d1788ed8c8cee970c4e44f750cc01020a4fafc6319fe605
 MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
diff --git a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
index a8faf4319871..687bf809e3c7 100644
--- a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
+++ b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
@@ -1,5 +1,5 @@
---- treewm-0.4.5b/src/action.cc	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/action.cc	2009-01-17 18:20:41.000000000 -0400
+--- a/src/action.cc	2009-01-17 18:17:32.000000000 -0400
++++ b/src/action.cc	2009-01-17 18:20:41.000000000 -0400
 @@ -9,6 +9,7 @@
  #include "clienttree.h"
  #include "clientinfo.h"
@@ -8,8 +8,8 @@
  
  Action::Action(Section *section) {
    s = section;
---- treewm-0.4.5b/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
+--- a/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
++++ b/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
 @@ -12,6 +12,7 @@
  #include "global.h"
  #include "client.h"
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..751b8b2fe249
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake"
+
+src_prepare() {
+	default
+	# bug 251845
+	eapply "${FILESDIR}/${P}-gcc43.patch"
+	# bug 86453
+	sed -i xprop/dsimple.c \
+		-e 's:malloc:Malloc:g' \
+		|| die "sed xprop/dsimple.c"
+}
+
+src_compile() {
+	# only compile treewm, not (x11-apps/){xprop,xkill}
+	emake treewm \
+		CXX=$(tc-getCXX) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		PREFIX="/usr" ROOT="${D}"
+}
+
+src_install() {
+	# only install treewm, not (x11-apps/){xprop,xkill}
+	dobin src/treewm
+	dodoc AUTHORS ChangeLog PROBLEMS README README.tiling TODO default.cfg \
+		sample.cfg
+	insinto /usr/share/pixmaps/treewm
+	doins src/pixmaps/*.xpm
+}
+
+pkg_postinst() {
+	elog "x11-wm/treewm used to install its own versions of x11-apps/xprop and"
+	elog "x11-apps/xkill as treewm-xprop and treewm-xkill respectively, since"
+	elog "they are assumed to be broken in combination with treewm. Since"
+	elog "X(org) has become modular since treewm's last release and are not"
+	elog "installed by default, we can leave those out and simply point out"
+	elog "that it is NOT adviseable to use these programs when using treewm."
+}