Version bump

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

4 files changed, 87 insertions, 5 deletions

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index f8412decd614..afc1953d272e 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/cwm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.12 2011/04/26 11:15:08 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.13 2011/05/03 18:06:38 xmw Exp $
+
+*cwm-20110323 (03 May 2011)
+
+  03 May 2011; Michael Weber <xmw@gentoo.org> +cwm-20110323.ebuild,
+  +files/cwm-20110323-Makefile.patch:
+  Version bump
 
   26 Apr 2011; Thomas Kahle <tomka@gentoo.org> cwm-20110213.ebuild:
   x86 stable per bug 361293
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index f87e12487122..7eeeba548c8a 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 AUX cwm-20110213-Makefile.patch 1008 RMD160 b8724869e963a8f616561bb7145a4d27a5c19749 SHA1 372bc3937dcaceba47851c0d81338d165b82c40c SHA256 6836c13889a824a289baaafe259e5069a1e2375d8152d15741c523d990385a64
+AUX cwm-20110323-Makefile.patch 1003 RMD160 2ddcfe55b9f035f4e67a99382ebf38f735120d4e SHA1 2c6dea6b063f374685f29650d31c8ddc510b543c SHA256 652026a0c2291669cb26a1aa472534fd666a998bc6c6c693619eefd14786c427
 DIST cwm-20100930.patch.tar.bz2 4774 RMD160 86add51d4adb302b00d8190ac751de9514d7707a SHA1 847b0f471ccf9e9461a759cc4de21372a3cba774 SHA256 a15be45985bc07f73990ad9b08c6e767a34c7c3229cddd970be203ec07b5ef07
 DIST cwm-20100930.tar.bz2 34673 RMD160 1832fc7922dd8bd99270781dc7cf2bd7685e85fc SHA1 a8eff51c9d839d3f1e790e239f19946c4177ed05 SHA256 5d9f3cb1fc91546c0d05e87b09c18421336b2dba22b1871e0a76145017aac9d5
 DIST cwm-20110213.tar.bz2 36628 RMD160 9005496ea81456f1de8b0e719a70367b8ebd247e SHA1 f160e270cbab178678fa03ecb108e42a64b55dcb SHA256 8085b4ff2beb16f373455b9b56dd819a6009573298662ee61ae3fd0761926a5b
+DIST cwm-20110323.tar.bz2 36427 RMD160 faa8e0c99781bcb939f3e5c0cec66ae0eab89e93 SHA1 2451b8b2f4e0cbd04fc2a1e0ec15cd2e590e4ab6 SHA256 cd6e12fd65bfe92db56e159e0207b1ee0c82343a425601602a5f1965974b7bde
 EBUILD cwm-20100930.ebuild 830 RMD160 3248530faeaaeb307b95bedd3385097f8c1955cd SHA1 6b928ae590f60ecd3bd8b009cb8c42d9bc800059 SHA256 655c01203282e247f0cf60bc70f6170d35726ff8fecdda827210582a3fe45e2b
 EBUILD cwm-20110213.ebuild 856 RMD160 35d9f409600495807fd6e8474317eebd5205ff54 SHA1 643bff8bb673f33f10bac82d117f2c9736ef3c12 SHA256 8dfc14d1c7d82a206e52ca8c3860bcf27d08c0bf3d66f58232be54692b1edba1
+EBUILD cwm-20110323.ebuild 858 RMD160 75af257fc072b7c445eef0d401154da4380d5d83 SHA1 d2af807836827944da2f246eec9fe6dfceaf4132 SHA256 4321f5230d00d6884b665ef584a003d7765dc50198b713c16785b7c9a09142d3
 EBUILD cwm-99999999.ebuild 911 RMD160 e5bf138c7ba189f263301641c6c2d1b91eaaaf7c SHA1 12bc1e955daa5ba244877f1de95a5a80818f1cea SHA256 1eb2b04d399dcab28f25176e4ac169fc5e56cc0fa34bf9cfee9f2c9398a7d20f
-MISC ChangeLog 1719 RMD160 d91312c50471ff48a500ed3d5f1d3a421e91cc49 SHA1 f6dc08d98ba40272d845cb7572a8a24beef15f67 SHA256 9f78557d1f598e2fc2355da561ab7c39d75b3c52e1faa186f352accf4a88bb9a
+MISC ChangeLog 1868 RMD160 409549bfc71d0e1a7fe52348c66a821f9ceac24b SHA1 bf5e768144d396aef23845191d484b59ef030d71 SHA256 a25cfe8bcfa0f76e371715e1cf798e9ba78e50c830609801e8d3dbfb338b99c5
 MISC metadata.xml 244 RMD160 ba31bc851ce5d8e007b223b4f799d84d4c6699d0 SHA1 2192e855054fb7016488afba3eda6d938fdf925d SHA256 1022f65be1952b5197408dfbf61543b61557601ce3a9f15acabeb3e9d84a0fbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk22qewACgkQodBTJSDyo65U5QD8CIcRRQNpFGUuLqpz/L1Khib0
-KYf0cI4YONKpdL2r3acA/2XnzO57XUELHaBdPg5IyM8sMLB4xC+PGyORT+Qdj2aQ
-=PQjt
+iF4EAREIAAYFAk3ARDcACgkQknrdDGLu8JCnOgD/d9okg3a7U1MWuuish77c873c
+w9rRfUEQgRyOtwNLQu0A/jPwt61AZTEtn71dCtK295YLkcN+Dl33s4yG9DBI1aLQ
+=/DcC
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/cwm/cwm-20110323.ebuild b/x11-wm/cwm/cwm-20110323.ebuild
new file mode 100644
index 000000000000..16805355cc14
--- /dev/null
+++ b/x11-wm/cwm/cwm-20110323.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110323.ebuild,v 1.1 2011/05/03 18:06:38 xmw Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+	https://github.com/chneukirchen/cwm.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	export LDADD="${LDFLAGS}"
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/x11-wm/cwm/files/cwm-20110323-Makefile.patch b/x11-wm/cwm/files/cwm-20110323-Makefile.patch
new file mode 100644
index 000000000000..688f2fff1c3b
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-20110323-Makefile.patch
@@ -0,0 +1,35 @@
+--- cwm-20110323/Makefile.orig
++++ cwm-20110323/Makefile
+@@ -15,16 +15,14 @@
+ 		kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \
+ 		strtonum.o fgetln.o
+ 
+-X11BASE=	/usr
++CPPFLAGS+=	$(shell pkg-config --cflags-only-I xft)
+ 
+-CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I.
+-
+-CFLAGS+=	-Wall -O2 -g
++CFLAGS+=
+ 
+ LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \
+ 		-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
+ 
+-MANDIR=		${X11BASE}/man/cat
++MANDIR=		/usr/share/man
+ MAN=		cwm.1 cwmrc.5
+ 
+ CLEANFILES=	cwm.cat1 cwmrc.cat5
+@@ -46,9 +44,9 @@
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+ 
+ install: ${PROG}
+-	install -m 755 cwm /usr/local/bin/
+-	install -m 644 cwm.1 /usr/local/man/man1
+-	install -m 644 cwmrc.5 /usr/local/man/man5
++	install -D -m 755 cwm $(DESTDIR)$(BINDIR)/cwm
++	install -D -m 644 cwm.1 $(DESTDIR)$(MANDIR)/man1/cwm.1
++	install -D -m 644 cwmrc.5 $(DESTDIR)$(MANDIR)/man5/cwmrc.5
+ 
+ #.include <bsd.prog.mk>
+ #.include <bsd.xorg.mk>