Do not install treewm-xprop or treewm-xkill. Instead, point out that the newer versions in the tree may not work with treewm. Respect LDFLAGS (bug #334433), CXX and CXXFLAGS. Remove unneeded dependencies.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

3 files changed, 72 insertions, 3 deletions

diff --git a/x11-wm/treewm/ChangeLog b/x11-wm/treewm/ChangeLog
index d1cc37fdde16..560b13f6f6a6 100644
--- a/x11-wm/treewm/ChangeLog
+++ b/x11-wm/treewm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/treewm
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/ChangeLog,v 1.19 2009/02/15 22:47:05 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/ChangeLog,v 1.20 2010/09/19 01:03:48 jer Exp $
+
+*treewm-0.4.5-r1 (19 Sep 2010)
+
+  19 Sep 2010; Jeroen Roovers <jer@gentoo.org> +treewm-0.4.5-r1.ebuild:
+  Do not install treewm-xprop or treewm-xkill. Instead, point out that the
+  newer versions in the tree may not work with treewm. Respect LDFLAGS (bug
+  #334433), CXX and CXXFLAGS. Remove unneeded dependencies.
 
   15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/treewm-0.4.5-gcc43.patch, treewm-0.4.5.ebuild:
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index 0c358cc2b624..916a4acd6597 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,5 +1,6 @@
 AUX treewm-0.4.5-gcc43.patch 614 RMD160 c5168f54652eec3aaa0ccd858b676d76319a7e1b SHA1 af555862b7670e5eeb5cbdc4050f480439c08882 SHA256 6d1a2904ba1b00a8e594dd38ca85bd32e5164c4c0652f1858f215b7ffbd88016
 DIST treewm-0.4.5.tar.bz2 87098 RMD160 cdd46e6f9f9e80dbb02d88d89f552dc54fb51a90 SHA1 6b738752f38a208d3519673a70f12cee4be9e3bc SHA256 3daea1c8d5dfe44bfe4e038e112f7ae5044c7978b196acd0258ac6f51e2f8c13
+EBUILD treewm-0.4.5-r1.ebuild 1714 RMD160 dcb531ee7cb1ba71e5e633ecfb7842a82d365585 SHA1 2e3db3f63ac26caa30c6f22ed66fc7e4df9abf3a SHA256 931fa0140b7b0f30512998f0588be67d8eb5955d31ef1ed5cf4170d371e79837
 EBUILD treewm-0.4.5.ebuild 1035 RMD160 33bdabe2846fabb1f0ad39c83552c6a32ae066c7 SHA1 32d22af226e4085dff2bc1be97ad02bb037d8329 SHA256 ba8a0b094e7da4708434432b7ce917ba33203f5c4833dde931222ee450280c51
-MISC ChangeLog 2600 RMD160 f4b8f5c8f13f36ff15d683ff929a68d33c6b336c SHA1 b93503c69c6823c7b6f94a18cd29e954c8fe29ec SHA256 629ba47506b94c68c26515038c009adf8a8c2ea8727df58e2e4c0308d6e53e00
+MISC ChangeLog 2911 RMD160 814ee8dee408ac54136dceeabae04eb49e432124 SHA1 c7cb16e24a27c61c8641b9cd60663f2b957a01f1 SHA256 e9aa4c08ca9a3653a2bac4a92649291825c4a5a0d380e98e090d3dbf6e148ede
 MISC metadata.xml 358 RMD160 7e3af2d7b20941152572beeb52406b36e56000c4 SHA1 84dd7db83f8483add0cb11607c8f503a16786e8a SHA256 b26ff315c3644035ad9c134b826e3997a025fd7e65643fac3be2dfefe6d7adf0
diff --git a/x11-wm/treewm/treewm-0.4.5-r1.ebuild b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..1900a70d6862
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/treewm-0.4.5-r1.ebuild,v 1.1 2010/09/19 01:03:47 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xf86vidmodeproto"
+
+src_prepare() {
+	# bug 251845
+	epatch "${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}" \
+		|| die "emake"
+}
+
+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."
+}