Version bump, cleanups

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

5 files changed, 89 insertions, 14 deletions

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index 5fbc945f35dd..112eadde54b3 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2011/08/04 21:29:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.16 2011/08/04 22:27:34 xmw Exp $
+
+*cwm-20110726 (04 Aug 2011)
+
+  04 Aug 2011; Michael Weber <xmw@gentoo.org> +cwm-20110726.ebuild,
+  +files/cwm-20110726-Makefile.patch, cwm-99999999.ebuild:
+  Adapted changes in Makefile, Version bump to new tarball, remove old version,
+  ebuild cleanup
 
   04 Aug 2011; Michael Weber <xmw@gentoo.org> cwm-20110515.ebuild:
   Fix HOMEPAGE
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 0549e2bc4288..eff961eebc86 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -3,19 +3,22 @@ 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
+AUX cwm-20110726-Makefile.patch 1056 RMD160 802c37b1363d1afa7ca9242cb4749d2068a209e0 SHA1 c7a6a191d1b6d469a0153ee39d22de8f48d2acd7 SHA256 c1753ebcdd9997687bfce528ec0e007c8af858df84b4432e9ab9cd8ef2ea2efd
 DIST cwm-20110213.tar.bz2 36628 RMD160 9005496ea81456f1de8b0e719a70367b8ebd247e SHA1 f160e270cbab178678fa03ecb108e42a64b55dcb SHA256 8085b4ff2beb16f373455b9b56dd819a6009573298662ee61ae3fd0761926a5b
 DIST cwm-20110323.tar.bz2 36427 RMD160 faa8e0c99781bcb939f3e5c0cec66ae0eab89e93 SHA1 2451b8b2f4e0cbd04fc2a1e0ec15cd2e590e4ab6 SHA256 cd6e12fd65bfe92db56e159e0207b1ee0c82343a425601602a5f1965974b7bde
 DIST cwm-20110515.tar.gz 42654 RMD160 f5e758efbda70aeac94778327c57b294572c64ec SHA1 7a4093320222753a8210b8a3cc1eddd49ff915fc SHA256 52b639938d8450507f4188f91629fb6df6fe4f3f7f6dd517bfc827c401fdc0d9
+DIST cwm-20110726.tar.bz2 37059 RMD160 d816f2a5dca44b5591a63b1e447b0993322e7c39 SHA1 16fe93f7a1d5948380ad6112c5ab7aa52f58d010 SHA256 c307f8dbb904ab6722f84f46d689b69d66d12ddfadf95a6fcfe905c2b2fcb138
 EBUILD cwm-20110213.ebuild 856 RMD160 35d9f409600495807fd6e8474317eebd5205ff54 SHA1 643bff8bb673f33f10bac82d117f2c9736ef3c12 SHA256 8dfc14d1c7d82a206e52ca8c3860bcf27d08c0bf3d66f58232be54692b1edba1
 EBUILD cwm-20110323.ebuild 858 RMD160 75af257fc072b7c445eef0d401154da4380d5d83 SHA1 d2af807836827944da2f246eec9fe6dfceaf4132 SHA256 4321f5230d00d6884b665ef584a003d7765dc50198b713c16785b7c9a09142d3
 EBUILD cwm-20110515.ebuild 863 RMD160 f3dfda0f3de6aae21c1b56f6dc715391fbc5ac53 SHA1 b56142971d07d2c62b9216d68566b8e2498e4939 SHA256 b8a76adb477a52872d0594737e671353fd4ddb45859ed534313c810a1d67ef3f
-EBUILD cwm-99999999.ebuild 911 RMD160 e5bf138c7ba189f263301641c6c2d1b91eaaaf7c SHA1 12bc1e955daa5ba244877f1de95a5a80818f1cea SHA256 1eb2b04d399dcab28f25176e4ac169fc5e56cc0fa34bf9cfee9f2c9398a7d20f
-MISC ChangeLog 2108 RMD160 e7cc67b8d65cc9dc884b5a8a8176e65d477bc379 SHA1 17a5ba2bdb391f4f2aba6ed15a5f89d62445d31b SHA256 2dcdc63c6f5c9fd9b74d25d1a741b7812b9b558ab5a5a3bde8b8aa692eac15f6
+EBUILD cwm-20110726.ebuild 820 RMD160 3ffc17af6811c18b37fb8ae9b3b9d6fe36ccc564 SHA1 bab1ec91c11c99465258d3ab6defd8c00e1ddc39 SHA256 e92a6528d28abaef549f5f9981917b19d055cc01286566dc21bd99dad48a856d
+EBUILD cwm-99999999.ebuild 856 RMD160 0e8cf38ace4ab2db047465462613bf9b716fdaa7 SHA1 5fd607d2e8a5d1ff937b71bd514e8f2bcc23831a SHA256 c0d58dc537cb52b5bb3e1b90bbd6ca9353695c7a8b124a43bcf66cbfd1e8b1dc
+MISC ChangeLog 2362 RMD160 0cfcc3d9cbb6c845e69779e32b080c6db7e57a26 SHA1 b3fa5bf1dd53c2d8c763716b24322d1118c1e0b5 SHA256 4100271dcf4e6199d526f7d3e368b1ac37ae86dfe9132f4cba06620b0914a694
 MISC metadata.xml 244 RMD160 ba31bc851ce5d8e007b223b4f799d84d4c6699d0 SHA1 2192e855054fb7016488afba3eda6d938fdf925d SHA256 1022f65be1952b5197408dfbf61543b61557601ce3a9f15acabeb3e9d84a0fbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk47D0QACgkQknrdDGLu8JAGnwD/ZZ/GlmighY2TtkGMjk06INqc
-zLVhBAR46D7SrswTQ6QBAIMBIp/6Q3tfOI0XXTctdorHl4vAXhdYUuGffaVXAWAa
-=aWN7
+iF4EAREIAAYFAk47HNwACgkQknrdDGLu8JDuAAEAlC8MLKOYgtlI2qhjYfdUmbBD
+fjdn2wTkV/GthbuQP0YA/3KuDiUskO15Oxxn51UpblT3lEHADxFVN+UtH+IsJrbC
+=fh7N
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/cwm/cwm-20110726.ebuild b/x11-wm/cwm/cwm-20110726.ebuild
new file mode 100644
index 000000000000..417e55dcbe2a
--- /dev/null
+++ b/x11-wm/cwm/cwm-20110726.ebuild
@@ -0,0 +1,34 @@
+# 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-20110726.ebuild,v 1.1 2011/08/04 22:27:34 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/
+	http://github.com/chneukirchen/cwm"
+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
+	export LDADD="${LDFLAGS}"
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/x11-wm/cwm/cwm-99999999.ebuild b/x11-wm/cwm/cwm-99999999.ebuild
index 4048b825bd1d..74cde09ff61d 100644
--- a/x11-wm/cwm/cwm-99999999.ebuild
+++ b/x11-wm/cwm/cwm-99999999.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.2 2011/08/04 22:27:34 xmw Exp $
 
 EAPI=2
 
@@ -11,7 +11,7 @@ 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"
+	http://github.com/chneukirchen/cwm"
 SRC_URI=""
 
 LICENSE="ISC"
@@ -27,14 +27,9 @@ DEPEND="${RDEPEND}
 	sys-devel/bison"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110213-Makefile.patch
-}
-
-src_compile() {
+	epatch "${FILESDIR}"/${PN}-20110726-Makefile.patch
 	export LDADD="${LDFLAGS}"
-	#export YACC=""
 	tc-export CC
-	emake || die
 }
 
 src_install() {
diff --git a/x11-wm/cwm/files/cwm-20110726-Makefile.patch b/x11-wm/cwm/files/cwm-20110726-Makefile.patch
new file mode 100644
index 000000000000..5298ce521572
--- /dev/null
+++ b/x11-wm/cwm/files/cwm-20110726-Makefile.patch
@@ -0,0 +1,36 @@
+--- cwm-20110726/Makefile
++++ cwm-20110726/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 -lxcb -lXau -lXdmcp \
+-		-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
++LDADD+=		$(shell pkg-config --libs xft xinerama xrandr )
+ 
+-MANDIR=		${X11BASE}/man/man
++MANDIR=		/usr/share/man
+ MAN=		cwm.1 cwmrc.5
+ 
+ CLEANFILES=	cwm.cat1 cwmrc.cat5
+@@ -45,9 +43,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>