Version bump, renumber to BSD release version.

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

9 files changed, 47 insertions, 69 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/Manifest b/x11-wm/cwm/Manifest
index 7c600aecc68a..28f0b7c2c443 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cwm-20110323-Makefile.patch 1003 RMD160 2ddcfe55b9f035f4e67a99382ebf38f735120d4e SHA1 2c6dea6b063f374685f29650d31c8ddc510b543c SHA256 652026a0c2291669cb26a1aa472534fd666a998bc6c6c693619eefd14786c427
-AUX cwm-20110726-Makefile.patch 1056 RMD160 802c37b1363d1afa7ca9242cb4749d2068a209e0 SHA1 c7a6a191d1b6d469a0153ee39d22de8f48d2acd7 SHA256 c1753ebcdd9997687bfce528ec0e007c8af858df84b4432e9ab9cd8ef2ea2efd
-AUX cwm-20111229-Makefile.patch 259 RMD160 eb86d63ce2d796e2ddb9e802a54d1fcd47dd4ad4 SHA1 f45d8665096d5854cd5217c7c5b18101b57c8726 SHA256 b9259040e6475363bc9f701ccebde1db330e424bb49089170f01d8145ab0308d
-DIST cwm-20110515.tar.gz 42654 RMD160 f5e758efbda70aeac94778327c57b294572c64ec SHA1 7a4093320222753a8210b8a3cc1eddd49ff915fc SHA256 52b639938d8450507f4188f91629fb6df6fe4f3f7f6dd517bfc827c401fdc0d9
-DIST cwm-20110913.tar.bz2 45196 RMD160 b97c91d6c8e7339694e423ca5aec58a153857378 SHA1 83428bec28792e401c45fac0303ebc4d0aa700be SHA256 2ac522d4cdd1df2265f13eb4a020c27cb365d97d5a86c5a59f402e90a5fcba84
-DIST cwm-20111229.tar.bz2 37527 RMD160 53ed7ae861a1498e27a23b4669df4ed95062bc43 SHA1 42cdb31c479d3ec9cc2fcfbcb1d6edf0bc8a20a1 SHA256 e0b31420b1cef8ce3005e3b53676e39f626d209fdeaaa0e5accabd00fccf2ddd
-EBUILD cwm-20110515.ebuild 859 RMD160 8e8898664f34dcf1e54191f7d4b4429c826ce9a2 SHA1 c35e8c08593f044177d55650c79ba136c9794163 SHA256 fa2c87ce1560a6325bea2296ee96f2b02e4d200b9c99ee8013c15a8490125113
-EBUILD cwm-20110913-r1.ebuild 863 RMD160 a89e8f2ad98186c95be69f66e7f41170d5851c2d SHA1 92fe1fa0d223f50bf5d59d0a0610b0e3c408c0f1 SHA256 f455c8287dcc6f0f66cbb9e7da61d8a88e7a49728a16f2245f69c091b15a19c6
-EBUILD cwm-20111229.ebuild 846 RMD160 90b0cf8ef0568429f706b0099e83402815f41c50 SHA1 74cb9691e165070f700fef3559b63c629a23f42e SHA256 6bdb1e8b8731bf4d8ba3847114dd93e8e071e3272ba8b262538d748869b6805f
-EBUILD cwm-99999999.ebuild 884 RMD160 a3e5f99daeab751b95f1f61186af510ef328fcc5 SHA1 936d7968445f4a41f9ca093332537003ed2704c5 SHA256 0ca840633ffb5b3cbc4395927deb28affee91b72d27bae76ce45dcc6a91cd7c8
-MISC ChangeLog 4545 RMD160 f179c2143528a5dd093a39d8347652a6b9738243 SHA1 a306aa7cc655e7c46f85d8233df5fa0f91cdbeb5 SHA256 dc35f8acb3c412061a6e73595b80698c1923daf515c1ff85486305f2dd4589a1
+AUX cwm-4.2_p20110913-Makefile.patch 1056 RMD160 802c37b1363d1afa7ca9242cb4749d2068a209e0 SHA1 c7a6a191d1b6d469a0153ee39d22de8f48d2acd7 SHA256 c1753ebcdd9997687bfce528ec0e007c8af858df84b4432e9ab9cd8ef2ea2efd
+AUX cwm-4.2_p20111229-Makefile.patch 259 RMD160 eb86d63ce2d796e2ddb9e802a54d1fcd47dd4ad4 SHA1 f45d8665096d5854cd5217c7c5b18101b57c8726 SHA256 b9259040e6475363bc9f701ccebde1db330e424bb49089170f01d8145ab0308d
+DIST cwm-4.2_p20110913.tar.bz2 45149 RMD160 0691c4f27cbd9ef63ecb377d4cbc4fd72e5432c5 SHA1 714d73733ed15a4f932011ffe5bb0a859199d3e8 SHA256 39981a4839aa5ab2aa23a49dbeb85f48eabc364a1268166438c7165e1625f389
+DIST cwm-4.2_p20111229.tar.bz2 37449 RMD160 d5125a3d35d24b1d2a408f828e1bd6b790dc2455 SHA1 b199fda0fe5cdb5673449cbc15bd8d5af86bb280 SHA256 f920129cc440aa256e68778ed8eeb9c6b458d294ccc5e26f35eef917ff780fdb
+DIST cwm-5.1.tar.gz 44095 RMD160 16f5e7242a7ca16bc6275f43ef0a332dfb46e120 SHA1 e923e96c89f17ed0bf42204affa986e816ae698c SHA256 ea72081e6eafaccf6dd282524f5ce9ed2f4e6f8edc34d5aa88c941e8f398c571
+EBUILD cwm-4.2_p20110913-r1.ebuild 862 RMD160 d2b711e8e1f3f8c10d8b1b4962dcfc9248903e87 SHA1 1367378d65c3531b1100bbfa8b1c8a7547b3555e SHA256 f7f14a1837ce4d46e1f813c1dc4f459921cd114342da50143a8596d67cd7e708
+EBUILD cwm-4.2_p20111229.ebuild 851 RMD160 e5bdd830de6eb881e941a12749149cda3263c1bb SHA1 db1ccb5d311a57fd5c1291c204b1bb0a9b12e540 SHA256 4c61d88b49a5fa0430bbc8a590f2320dfcb373dd1710df2ded415c7f4dda275e
+EBUILD cwm-5.1.ebuild 872 RMD160 05cf3367aee83e81b0ff531f193b9759db1f4104 SHA1 435dbee835462b1ec0d0c9b9bdc75d3414d29e3d SHA256 dba4820d94f1c1529868918b8435a66686aabe0abf689757860bb12dae7fbbc4
+EBUILD cwm-9999.ebuild 885 RMD160 dbe38a3664379bdc52ade1a4acb6bce2b23692d1 SHA1 7823e5bf6ce3803c65cbef6bcfc50e439591bb6b SHA256 a3e531e5bfd9a7f87c027ba719c6150b36c4d3116ff3cc33b371c060c4e6f8ab
+MISC ChangeLog 5233 RMD160 d0ac81591e45ddfb39bf0c0959fcbc0081673bd0 SHA1 34f22c0423c7c604e1123a8d53ebd622e12686d5 SHA256 d4552bad39a28f4a7cc8b32eb38a80119998446f7516a3499b8c3664ce632767
 MISC metadata.xml 223 RMD160 ece0d9320b4ad1fdb29d1dec4f85e84ffda0d863 SHA1 325a16f4c96d533e8642c26ab395b06ab42f51b5 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk85Eq0ACgkQknrdDGLu8JCGgwD/TfA7GzFjaEmsg0OozdtMEpgB
-iezy96Q57iFbPPbkJwYA/0aFhT1Ku3rhqYJLRDq+oFX5gCyyxkI/iwwxMLbLreYm
-=DeMh
+iF4EAREIAAYFAk+hNGEACgkQknrdDGLu8JBEaQD9EIwTXoesoTP6osAdptNkcYwi
+5GtpUrLvQ8045ePbETcA/i5vv9RmyNcCG9wMsttRWL4Hji5CjCmVCGcIDTPlh+Jw
+=YN5y
 -----END PGP SIGNATURE-----
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