Respect user flags wrt bug 334681. Thanks to Diego for the report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 78 insertions, 3 deletions

diff --git a/x11-wm/wm2/ChangeLog b/x11-wm/wm2/ChangeLog
index 954cd1abc023..d8c94b21227b 100644
--- a/x11-wm/wm2/ChangeLog
+++ b/x11-wm/wm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/wm2
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.10 2007/06/30 13:14:15 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.11 2010/08/26 20:25:37 xarthisius Exp $
+
+*wm2-4-r1 (26 Aug 2010)
+
+  26 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> +wm2-4-r1.ebuild:
+  Respect user flags wrt bug 334681. Thanks to Diego for the report.
 
   30 Jun 2007; Santiago M. Mola <coldwind@gentoo.org>
   files/wm2-4-gentoo.patch, wm2-4.ebuild:
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index 8182e3d47b07..c0df2ce5b10c 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wm2-4-gentoo.patch 4265 RMD160 6ab7a6c49bf7c3978a403ea51e816b67c2c28e3d SHA1 2b9e31770fad5d30a160f5abec5d9a3fdfb0d1dd SHA256 32d592a74f7f4f0f4f255eb2e735f2804278bea76e54e08da82a579463586875
 DIST wm2-4.tar.gz 32807 RMD160 32b8f7c0ae3d280684505b3f69b2a82bafabacf1 SHA1 dd959e72eedca113b372ddf67b95260e25226a91 SHA256 a6c3352390f958c5033408ce73e1abd9677372a7c8c5949e39a62fda433b054d
+EBUILD wm2-4-r1.ebuild 1532 RMD160 d0eeaa7b2c16fc247b339c33c1bf4223e2b76d94 SHA1 8071dda22dba86bdc2ac05962d580c99203d1994 SHA256 6730d81a8a3571a673207ae84b595541b0e4113fdcfbbf1c7f776c1ab52f5125
 EBUILD wm2-4.ebuild 1370 RMD160 0acf53f47b1e5bf044935f78e74d73460439f858 SHA1 aff13027a1861a460af15c0530b1bb75da5e7e68 SHA256 a5290fb55a75700fe4b18a544e15937e7d319973c21e5b0e2c1ad8aec22c93e8
-MISC ChangeLog 1281 RMD160 63bc25b3551cbb79184c3bb347a02d7fa3777fdd SHA1 415c5776772c534d2cf1bc03d5c5967ca268b8fe SHA256 70d408d2dca80e22b11f737f519b8a69814ba8867bb8801229bcf5e8c99e7ab7
+MISC ChangeLog 1450 RMD160 032ae24fcc6b0a5834687e919a4b8d1ba3452531 SHA1 931e21434b5950f8a10994b25f44e91f80648b1f SHA256 454cc90ee4a6dda7518e114a6e0dac391704dc3aabca5efc0756adac4e45f4b4
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkx2zcsACgkQIiMqcbOVdxSPnwQAjd/Zrznpr8rSL9XfyqdPIQzc
+eGg2mCC+49H+apoqS1ANd0FN/LBzA4s6B6F9zUyNoJbOWBcYANbl6hiplEEMejPD
+q3tTeDEhSyeF0GvhJ6OWMAfu5zW4FbYgIMCElgD5Mxri4N9zPTv0LgRj5F1yDxor
+f4h9mUCMU8xWZ/u8l1s=
+=0Hs+
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
new file mode 100644
index 000000000000..dc2a331f44e1
--- /dev/null
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4-r1.ebuild,v 1.1 2010/08/26 20:25:37 xarthisius Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Small, unconfigurable window manager"
+HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
+SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
+
+RDEPEND="x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+SLOT="0"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed -e "s/CFLAGS/CXXFLAGS/" \
+		-e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \
+		-i Makefile || die #334681
+
+	sed 's/^#//' Config.h > wm2.conf
+	if [ -e "/etc/wm2.conf" ]; then
+		echo "#undef _CONFIG_H_" >> Config.h
+		awk '/^[^/]/{print "#" $0}' /etc/wm2.conf >> Config.h
+	fi
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}" CCC="$(tc-getCXX)" \
+		LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin wm2 || die
+	insinto /etc
+	doins wm2.conf || die
+	dodoc README || die
+}
+
+pkg_postinst() {
+	echo
+	elog "wm2 is unconfigurable after you have installed. If you want to"
+	elog "change settings of wm2, please have a look at /etc/wm2.conf"
+	elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
+	elog "from that file automatically). If you think wm2 lacks some important"
+	elog "features that you want to use (such as background pixmaps),"
+	elog "consider using wmx, written by the same author."
+	echo
+}