Version bump

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

5 files changed, 129 insertions, 3 deletions

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index 8cb725127359..9957dcb6822e 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/cwm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.8 2010/11/21 19:37:03 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.9 2011/02/18 15:37:05 xmw Exp $
+
+*cwm-99999999 (18 Feb 2011)
+*cwm-20110213 (18 Feb 2011)
+
+  18 Feb 2011; Michael Weber <xmw@gentoo.org> +cwm-20110213.ebuild,
+  +files/cwm-20110213-Makefile.patch, +cwm-99999999.ebuild:
+  Version bump
 
   21 Nov 2010; Michael Weber <xmw@gentoo.org> cwm-20100930.ebuild:
   Added ~arm and ~sparc keyword
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index da0fcddfd61c..34736c20574e 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,5 +1,9 @@
+AUX cwm-20110213-Makefile.patch 1008 RMD160 b8724869e963a8f616561bb7145a4d27a5c19749 SHA1 372bc3937dcaceba47851c0d81338d165b82c40c SHA256 6836c13889a824a289baaafe259e5069a1e2375d8152d15741c523d990385a64
 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
 EBUILD cwm-20100930.ebuild 830 RMD160 3248530faeaaeb307b95bedd3385097f8c1955cd SHA1 6b928ae590f60ecd3bd8b009cb8c42d9bc800059 SHA256 655c01203282e247f0cf60bc70f6170d35726ff8fecdda827210582a3fe45e2b
-MISC ChangeLog 1210 RMD160 2c412e89bc84b6301a76f37f8835f25a229045ef SHA1 ce7d7444f98b2734782c1ffab526f3595b3fde2d SHA256 327fd872d6431ecc29ea939c68b4186c92faeb7408cf79e2c4efb7690a3a7cd3
+EBUILD cwm-20110213.ebuild 858 RMD160 fbb236bfc81afe43e79fb3429d65e577dbd0b4a9 SHA1 d4b3010c1f0fb4ee1978765237d13fac41abfdf3 SHA256 9576e0bd410bbbee6d18710f36d9d45c125efb44e1d2379401de7220086f8f48
+EBUILD cwm-99999999.ebuild 911 RMD160 e5bf138c7ba189f263301641c6c2d1b91eaaaf7c SHA1 12bc1e955daa5ba244877f1de95a5a80818f1cea SHA256 1eb2b04d399dcab28f25176e4ac169fc5e56cc0fa34bf9cfee9f2c9398a7d20f
+MISC ChangeLog 1411 RMD160 ca70213c30b2f1128c016963ab72eeee4b61d85e SHA1 4160bad404162219522c070b9c3b2fa3d720f795 SHA256 83ebe648f7b8458a5b30591f28c3ff9fef5e0b961ffe30ec43a7419f65acaca3
 MISC metadata.xml 244 RMD160 ba31bc851ce5d8e007b223b4f799d84d4c6699d0 SHA1 2192e855054fb7016488afba3eda6d938fdf925d SHA256 1022f65be1952b5197408dfbf61543b61557601ce3a9f15acabeb3e9d84a0fbe
diff --git a/x11-wm/cwm/cwm-20110213.ebuild b/x11-wm/cwm/cwm-20110213.ebuild
new file mode 100644
index 000000000000..614fb0c6447c
--- /dev/null
+++ b/x11-wm/cwm/cwm-20110213.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-20110213.ebuild,v 1.1 2011/02/18 15:37:05 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/cwm-99999999.ebuild b/x11-wm/cwm/cwm-99999999.ebuild
new file mode 100644
index 000000000000..4048b825bd1d
--- /dev/null
+++ b/x11-wm/cwm/cwm-99999999.ebuild
@@ -0,0 +1,42 @@
+# 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-99999999.ebuild,v 1.1 2011/02/18 15:37:05 xmw Exp $
+
+EAPI=2
+
+EGIT_REPO_URI=https://github.com/chneukirchen/cwm.git
+EGIT_BRANCH=linux
+
+inherit eutils toolchain-funcs git
+
+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=""
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20110213-Makefile.patch
+}
+
+src_compile() {
+	export LDADD="${LDFLAGS}"
+	#export YACC=""
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/x11-wm/cwm/files/cwm-20110213-Makefile.patch b/x11-wm/cwm/files/cwm-20110213-Makefile.patch
new file mode 100644
index 000000000000..c47ecd4225e2
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-20110213-Makefile.patch
@@ -0,0 +1,35 @@
+--- cwm-20110213/Makefile.orig
++++ cwm-20110213/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+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I.
++CPPFLAGS+=	$(shell pkg-config --cflags-only-I xft)
+ 
+-CFLAGS+=	-Wall -O2 -g
++CFLAGS+=	
+ 
+ LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -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 +45,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>