Version bump, renumber to BSD release version.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

8 files changed, 34 insertions, 55 deletions

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index 587d5621ca29..076486f8611b 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for x11-wm/cwm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.33 2012/02/13 13:39:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.34 2012/05/02 13:19:24 xmw Exp $
+
+*cwm-9999 (02 May 2012)
+*cwm-5.1 (02 May 2012)
+*cwm-4.2_p20111229 (02 May 2012)
+*cwm-4.2_p20110913-r1 (02 May 2012)
+
+  02 May 2012; Michael Weber <xmw@gentoo.org> +cwm-4.2_p20110913-r1.ebuild,
+  +cwm-4.2_p20111229.ebuild, +files/cwm-4.2_p20110913-Makefile.patch,
+  +files/cwm-4.2_p20111229-Makefile.patch, +cwm-5.1.ebuild, +cwm-9999.ebuild,
+  -files/cwm-20110323-Makefile.patch, -cwm-20110515.ebuild,
+  -files/cwm-20110726-Makefile.patch, -cwm-20110913-r1.ebuild,
+  -cwm-20111229.ebuild, -files/cwm-20111229-Makefile.patch,
+  -cwm-99999999.ebuild:
+  Version bump, renumber to BSD release version.
+
+  02 May 2012; Michael Weber <xmw@gentoo.org> -cwm-20110515.ebuild:
+  Remove old version
 
   13 Feb 2012; Michael Weber <xmw@gentoo.org> cwm-20110913-r1.ebuild:
   sparc stable (bug 400535)
diff --git a/x11-wm/cwm/cwm-20110913-r1.ebuild b/x11-wm/cwm/cwm-4.2_p20110913-r1.ebuild
index e4923093a37a..fbddada933e3 100644
--- a/x11-wm/cwm/cwm-20110913-r1.ebuild
+++ b/x11-wm/cwm/cwm-4.2_p20110913-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110913-r1.ebuild,v 1.5 2012/02/13 13:39:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-4.2_p20110913-r1.ebuild,v 1.1 2012/05/02 13:19:24 xmw Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm sparc x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXft
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	sys-devel/bison"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110726-Makefile.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
 	export LDADD="${LDFLAGS}"
 	tc-export CC
 }
diff --git a/x11-wm/cwm/cwm-20111229.ebuild b/x11-wm/cwm/cwm-4.2_p20111229.ebuild
index d4b1241f5f4d..c52d65b4206a 100644
--- a/x11-wm/cwm/cwm-20111229.ebuild
+++ b/x11-wm/cwm/cwm-4.2_p20111229.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20111229.ebuild,v 1.2 2012/01/29 01:54:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-4.2_p20111229.ebuild,v 1.1 2012/05/02 13:19:24 xmw Exp $
 
 EAPI=4
 
diff --git a/x11-wm/cwm/cwm-20110515.ebuild b/x11-wm/cwm/cwm-5.1.ebuild
index 33599f01be1d..ff5d1ecc96ed 100644
--- a/x11-wm/cwm/cwm-20110515.ebuild
+++ b/x11-wm/cwm/cwm-5.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110515.ebuild,v 1.6 2011/09/11 21:21:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-5.1.ebuild,v 1.1 2012/05/02 13:19:24 xmw Exp $
 
-EAPI=2
+EAPI=4
 
 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"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+	http://github.com/chneukirchen/cwm"
+SRC_URI="http://chneukirchen.org/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm sparc x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXft
@@ -24,15 +24,12 @@ DEPEND="${RDEPEND}
 	sys-devel/bison"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110323-Makefile.patch
-}
-
-src_compile() {
-	export LDADD="${LDFLAGS}"
+	epatch "${FILESDIR}"/${PN}-4.2_p20111229-Makefile.patch
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
 }
diff --git a/x11-wm/cwm/cwm-99999999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index cb0b28e75c93..81bc7388aaad 100644
--- a/x11-wm/cwm/cwm-99999999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.7 2012/01/29 01:54:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-9999.ebuild,v 1.1 2012/05/02 13:19:24 xmw Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	sys-devel/bison"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20111229-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-4.2_p20111229-Makefile.patch
 	tc-export CC
 }
 
diff --git a/x11-wm/cwm/files/cwm-20110323-Makefile.patch b/x11-wm/cwm/files/cwm-20110323-Makefile.patch
deleted file mode 100644
index 688f2fff1c3b..000000000000
--- a/x11-wm/cwm/files/cwm-20110323-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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>
diff --git a/x11-wm/cwm/files/cwm-20110726-Makefile.patch b/x11-wm/cwm/files/cwm-4.2_p20110913-Makefile.patch
index 5298ce521572..5298ce521572 100644
--- a/x11-wm/cwm/files/cwm-20110726-Makefile.patch
+++ b/x11-wm/cwm/files/cwm-4.2_p20110913-Makefile.patch
diff --git a/x11-wm/cwm/files/cwm-20111229-Makefile.patch b/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch
index bb00c017112a..bb00c017112a 100644
--- a/x11-wm/cwm/files/cwm-20111229-Makefile.patch
+++ b/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch