From ea3ed3900e2441a660c246321c368e113b4249ae Mon Sep 17 00:00:00 2001
From: Cédric Krier <cedk@gentoo.org>
Date: Wed, 6 Sep 2006 16:01:24 +0000
Subject: x11-wm/dwm: Version bump

svn path=/sunrise/; revision=1158
---
 x11-wm/dwm/ChangeLog                     |  6 +++
 x11-wm/dwm/Manifest                      | 44 ++++++++++-----------
 x11-wm/dwm/dwm-1.3.ebuild                | 68 --------------------------------
 x11-wm/dwm/dwm-1.4.ebuild                | 67 +++++++++++++++++++++++++++++++
 x11-wm/dwm/files/digest-dwm-1.3          |  3 --
 x11-wm/dwm/files/digest-dwm-1.4          |  3 ++
 x11-wm/dwm/files/dwm-1.3-config_mk.patch | 28 -------------
 x11-wm/dwm/files/dwm-1.3-makefile.patch  | 11 ------
 x11-wm/dwm/files/dwm-1.3-weight.patch    | 27 -------------
 x11-wm/dwm/files/dwm-1.4-config_mk.patch | 27 +++++++++++++
 x11-wm/dwm/files/dwm-1.4-makefile.patch  | 10 +++++
 11 files changed, 133 insertions(+), 161 deletions(-)
 delete mode 100644 x11-wm/dwm/dwm-1.3.ebuild
 create mode 100644 x11-wm/dwm/dwm-1.4.ebuild
 delete mode 100644 x11-wm/dwm/files/digest-dwm-1.3
 create mode 100644 x11-wm/dwm/files/digest-dwm-1.4
 delete mode 100644 x11-wm/dwm/files/dwm-1.3-config_mk.patch
 delete mode 100644 x11-wm/dwm/files/dwm-1.3-makefile.patch
 delete mode 100644 x11-wm/dwm/files/dwm-1.3-weight.patch
 create mode 100644 x11-wm/dwm/files/dwm-1.4-config_mk.patch
 create mode 100644 x11-wm/dwm/files/dwm-1.4-makefile.patch

(limited to 'x11-wm')

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 446d0b239..8cacbf9a2 100644
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Sep 2006; Cedric Krier <ced@ced.homedns.org> -dwm-1.3.ebuild,
+  -files/dwm-1.3-config_mk.patch, -files/dwm-1.3-makefile.patch,
+  -files/dwm-1.3-weight.patch, +dwm-1.4.ebuild,
+  +files/dwm-1.4-config_mk.patch, +files/dwm-1.4-makefile.patch:
+  Version bump
+
   05 Sep 2006; Cedric Krier <ced@ced.homedns.org> dwm-1.3.ebuild,
   +files/dwm-1.3-weight.patch:
   patch fixing c->weight handling
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 4e4951b77..205aedbc2 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,28 +1,24 @@
-AUX dwm-1.3-config_mk.patch 721 RMD160 bbb220bdeed749251f1179042849c51a5097a7ec SHA1 2fe737f0e3535a2b563387607fb7cd76469e7953 SHA256 2e24cba38f6982f9014e74252d63314b74a5380885dfdf35b5ae96d950876121
-MD5 0b2d9b9b8aaf2ee44c45ee6dd461f0d6 files/dwm-1.3-config_mk.patch 721
-RMD160 bbb220bdeed749251f1179042849c51a5097a7ec files/dwm-1.3-config_mk.patch 721
-SHA256 2e24cba38f6982f9014e74252d63314b74a5380885dfdf35b5ae96d950876121 files/dwm-1.3-config_mk.patch 721
-AUX dwm-1.3-makefile.patch 276 RMD160 11c8f58d0a7180d830e27df211caa73d7b4151da SHA1 b9f2a0f8e6aa79c66af65d0da29f38693d9b4998 SHA256 2e8d905ba297c8a864897f617f6ccd726b95ceec4da8ce47d4ec75fa0e551346
-MD5 b5232e325c1c399e8f74be6f80dc2262 files/dwm-1.3-makefile.patch 276
-RMD160 11c8f58d0a7180d830e27df211caa73d7b4151da files/dwm-1.3-makefile.patch 276
-SHA256 2e8d905ba297c8a864897f617f6ccd726b95ceec4da8ce47d4ec75fa0e551346 files/dwm-1.3-makefile.patch 276
-AUX dwm-1.3-weight.patch 720 RMD160 495f974824cca759139947bb47fe58a85995130e SHA1 b7393bec130036d54c15ed62f818231d6936734d SHA256 1bb804d5b1052116c0c08f24edfa3101e83dfa0a87aed516a941dd6b3cf2d151
-MD5 2f9d40899d9f7d75bc2b61b81fe90d03 files/dwm-1.3-weight.patch 720
-RMD160 495f974824cca759139947bb47fe58a85995130e files/dwm-1.3-weight.patch 720
-SHA256 1bb804d5b1052116c0c08f24edfa3101e83dfa0a87aed516a941dd6b3cf2d151 files/dwm-1.3-weight.patch 720
-DIST dwm-1.3.tar.gz 15883 RMD160 40fd09102d87c0fbc0b54be58684b4bd01108c15 SHA1 1ac1f1831924f4cda119d55b3fb92e45a31e5129 SHA256 e395147781a0542088a1101bc3ff809d1cee27674093dc9d75b64f0ca4891324
-EBUILD dwm-1.3.ebuild 1792 RMD160 ecc0febc22f6e54a51f5dea7644a003c089ff01e SHA1 a5bc9b85ede49eb348fb8780530d4b376820b2b7 SHA256 c2b0229677f35aac073f34949f82dc09f357554f56f9c85edbbee7b1336a4cc5
-MD5 51a65618c71ae69ea0d0ac117b97a3e1 dwm-1.3.ebuild 1792
-RMD160 ecc0febc22f6e54a51f5dea7644a003c089ff01e dwm-1.3.ebuild 1792
-SHA256 c2b0229677f35aac073f34949f82dc09f357554f56f9c85edbbee7b1336a4cc5 dwm-1.3.ebuild 1792
-MISC ChangeLog 2364 RMD160 7bd6ac75203ff604ca92aaf68015f0a4cef98b6d SHA1 56bfe8ef465d711c644ebbfa3adcaa9dc7948d9c SHA256 4f83089a683daa56aed83c326b13fd15ecaa46614b5e3335d79c6fafae0f9ee0
-MD5 0eb82538026c4bec5abc7ce6650c23e7 ChangeLog 2364
-RMD160 7bd6ac75203ff604ca92aaf68015f0a4cef98b6d ChangeLog 2364
-SHA256 4f83089a683daa56aed83c326b13fd15ecaa46614b5e3335d79c6fafae0f9ee0 ChangeLog 2364
+AUX dwm-1.4-config_mk.patch 675 RMD160 a3d645a63ccf52f88be31e321eaa4fc57a73ed72 SHA1 25f5ea6be496a09197072157930bc5fed2a97f7c SHA256 ac7c6f820ccb33665d7cf69cf47f4a0e2f1a9b807a7a1a4327bd1ecea21bea28
+MD5 fc5b7c2e25992bbe703af0b47e82f99f files/dwm-1.4-config_mk.patch 675
+RMD160 a3d645a63ccf52f88be31e321eaa4fc57a73ed72 files/dwm-1.4-config_mk.patch 675
+SHA256 ac7c6f820ccb33665d7cf69cf47f4a0e2f1a9b807a7a1a4327bd1ecea21bea28 files/dwm-1.4-config_mk.patch 675
+AUX dwm-1.4-makefile.patch 232 RMD160 a9944325fa4d4285d7b76f8a9dd652028e44358a SHA1 ac4b04aae4c3f966b9407cbcd676ee149b0ca35f SHA256 5e78a8f36c6b18f41282759ec379b4c0491a36646be71174375369beb179b88d
+MD5 5579e32834d00bf40bc9670120462810 files/dwm-1.4-makefile.patch 232
+RMD160 a9944325fa4d4285d7b76f8a9dd652028e44358a files/dwm-1.4-makefile.patch 232
+SHA256 5e78a8f36c6b18f41282759ec379b4c0491a36646be71174375369beb179b88d files/dwm-1.4-makefile.patch 232
+DIST dwm-1.4.tar.gz 15939 RMD160 ab7ab316ad50bec835181969cbfa8484e9d75b4d SHA1 7471f9608adad4165f08054ee6bbd02079d414a9 SHA256 7ffa9c37c3173d7de09175237c36aeaf42004b1d3fe6a8addbe4be1b177cc035
+EBUILD dwm-1.4.ebuild 1752 RMD160 4dbe43f87496ea5da9754bb17fde1854c3656589 SHA1 637736f5cc493c4af4e7bde1bec9a103fe116459 SHA256 41385bb5e07449ed514acf9be00e2eebc94cf2c8bef524af15bcb7e1f271d204
+MD5 ddad39040c451ab420ad2f095b0fc079 dwm-1.4.ebuild 1752
+RMD160 4dbe43f87496ea5da9754bb17fde1854c3656589 dwm-1.4.ebuild 1752
+SHA256 41385bb5e07449ed514acf9be00e2eebc94cf2c8bef524af15bcb7e1f271d204 dwm-1.4.ebuild 1752
+MISC ChangeLog 2625 RMD160 850d8f0d0cbc74cd7d3ebd3a9b341c4a57caeccf SHA1 9ce748f6b9a713e53458bd23106b5f9ceb044d6d SHA256 46692c1cc9b828191c2025fea8873f2ce82508f916177b7ff4096aed8329ed6b
+MD5 4d00a0e6b3979f4f7a3fc1236a52d355 ChangeLog 2625
+RMD160 850d8f0d0cbc74cd7d3ebd3a9b341c4a57caeccf ChangeLog 2625
+SHA256 46692c1cc9b828191c2025fea8873f2ce82508f916177b7ff4096aed8329ed6b ChangeLog 2625
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 cdc15d4ddc3811cae28eed8fe951d485 files/digest-dwm-1.3 220
-RMD160 3155d5341ed428fbed3fb1c886e00cb1d484802c files/digest-dwm-1.3 220
-SHA256 a1edbe3381ad6b33e2a0026e563a48cec48cc7e9d49d2ac84851dd226ec95d27 files/digest-dwm-1.3 220
+MD5 04f815e80f2e4e73f95116f7be30a191 files/digest-dwm-1.4 220
+RMD160 ab84b201995d1bd8dfe08ddaac1896718c44f3ca files/digest-dwm-1.4 220
+SHA256 7a471ba0ccf5c5493858f42d65af067899d9e4b4b72e7541b433219dbba3d37a files/digest-dwm-1.4 220
diff --git a/x11-wm/dwm/dwm-1.3.ebuild b/x11-wm/dwm/dwm-1.3.ebuild
deleted file mode 100644
index 2fd3e8c88..000000000
--- a/x11-wm/dwm/dwm-1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a dynamic window manager for X11"
-HOMEPAGE="http://www.10kloc.org/dwm/"
-SRC_URI="http://10kloc.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="savedconfig"
-
-DEPEND="|| ( x11-libs/libX11 <virtual/x11-7 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-config_mk.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-weight.patch"
-
-	if use savedconfig; then
-		local conf root
-		[[ -r config.h ]] && rm config.h
-		for conf in ${PF} ${P} ${PN}; do
-			for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" /; do
-				configfile=${root}etc/portage/savedconfig/${conf}.config.h
-				if [[ -r ${configfile} ]]; then
-					elog "Found your ${configfile} and using it."
-					cp ${configfile} "${S}"/config.h
-					return 0
-				fi
-			done
-		done
-		ewarn "Could not locate user configfile, so we will save a default one."
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
-	dodoc README
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig"
-		elog "Saving this build config to ${config_dir}/${PF}.config.h"
-		einfo "Read this ebuild for more info on how to take advantage of this option."
-		mkdir -p "${config_dir}"
-		cp "${S}"/config.h "${config_dir}"/${PF}.config.h
-	fi
-}
-
-pkg_postinst() {
-	einfo "This ebuild has support for user defined configs"
-	einfo "Please read this ebuild for more details and re-emerge as needed"
-	einfo "if you want to add or remove functionality for ${PN}"
-}
diff --git a/x11-wm/dwm/dwm-1.4.ebuild b/x11-wm/dwm/dwm-1.4.ebuild
new file mode 100644
index 000000000..55fc1d334
--- /dev/null
+++ b/x11-wm/dwm/dwm-1.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="http://www.10kloc.org/dwm/"
+SRC_URI="http://10kloc.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="savedconfig"
+
+DEPEND="|| ( x11-libs/libX11 <virtual/x11-7 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-config_mk.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+
+	if use savedconfig; then
+		local conf root
+		[[ -r config.h ]] && rm config.h
+		for conf in ${PF} ${P} ${PN}; do
+			for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" /; do
+				configfile=${root}etc/portage/savedconfig/${conf}.config.h
+				if [[ -r ${configfile} ]]; then
+					elog "Found your ${configfile} and using it."
+					cp ${configfile} "${S}"/config.h
+					return 0
+				fi
+			done
+		done
+		ewarn "Could not locate user configfile, so we will save a default one."
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+
+	dodoc README
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig"
+		elog "Saving this build config to ${config_dir}/${PF}.config.h"
+		einfo "Read this ebuild for more info on how to take advantage of this option."
+		mkdir -p "${config_dir}"
+		cp "${S}"/config.h "${config_dir}"/${PF}.config.h
+	fi
+}
+
+pkg_postinst() {
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+}
diff --git a/x11-wm/dwm/files/digest-dwm-1.3 b/x11-wm/dwm/files/digest-dwm-1.3
deleted file mode 100644
index 707bac246..000000000
--- a/x11-wm/dwm/files/digest-dwm-1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 92a878e4b2641e1567643de62af2e616 dwm-1.3.tar.gz 15883
-RMD160 40fd09102d87c0fbc0b54be58684b4bd01108c15 dwm-1.3.tar.gz 15883
-SHA256 e395147781a0542088a1101bc3ff809d1cee27674093dc9d75b64f0ca4891324 dwm-1.3.tar.gz 15883
diff --git a/x11-wm/dwm/files/digest-dwm-1.4 b/x11-wm/dwm/files/digest-dwm-1.4
new file mode 100644
index 000000000..fa11038f3
--- /dev/null
+++ b/x11-wm/dwm/files/digest-dwm-1.4
@@ -0,0 +1,3 @@
+MD5 b2b30302ec1d85c96c4c412b41631a6b dwm-1.4.tar.gz 15939
+RMD160 ab7ab316ad50bec835181969cbfa8484e9d75b4d dwm-1.4.tar.gz 15939
+SHA256 7ffa9c37c3173d7de09175237c36aeaf42004b1d3fe6a8addbe4be1b177cc035 dwm-1.4.tar.gz 15939
diff --git a/x11-wm/dwm/files/dwm-1.3-config_mk.patch b/x11-wm/dwm/files/dwm-1.3-config_mk.patch
deleted file mode 100644
index 05f10a5bb..000000000
--- a/x11-wm/dwm/files/dwm-1.3-config_mk.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru dwm-1.3~/config.mk dwm-1.3/config.mk
---- dwm-1.3~/config.mk	2006-09-05 10:25:29.000000000 +0200
-+++ dwm-1.3/config.mk	2006-09-05 10:25:53.000000000 +0200
-@@ -4,8 +4,8 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX ?= /usr/local
-+MANPREFIX ?= ${PREFIX}/share/man
- 
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -15,11 +15,11 @@
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
- 
- # flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-+CFLAGS += -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
- LDFLAGS = ${LIBS}
- #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC ?= cc
- LD = ${CC}
diff --git a/x11-wm/dwm/files/dwm-1.3-makefile.patch b/x11-wm/dwm/files/dwm-1.3-makefile.patch
deleted file mode 100644
index d13eca748..000000000
--- a/x11-wm/dwm/files/dwm-1.3-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru dwm-1.3~/Makefile dwm-1.3/Makefile
---- dwm-1.3~/Makefile	2006-09-05 10:25:29.000000000 +0200
-+++ dwm-1.3/Makefile	2006-09-05 10:42:10.000000000 +0200
-@@ -28,7 +28,6 @@
- dwm: ${OBJ}
- 	@echo LD $@
- 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
- 
- clean:
- 	@echo cleaning
diff --git a/x11-wm/dwm/files/dwm-1.3-weight.patch b/x11-wm/dwm/files/dwm-1.3-weight.patch
deleted file mode 100644
index 17fe74d31..000000000
--- a/x11-wm/dwm/files/dwm-1.3-weight.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- dwm-1.3~/tag.c	2006-09-05 10:25:29.000000000 +0200
-+++ dwm-1.3/tag.c	2006-09-05 12:30:32.000000000 +0200
-@@ -106,8 +106,7 @@
- 	if(!matched)
- 		for(i = 0; i < ntags; i++)
- 			c->tags[i] = seltag[i];
--	for(i = 0; i < ntags && !c->tags[i]; i++);
--	c->weight = i;
-+	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
- }
- 
- void
-@@ -121,6 +120,7 @@
- 	for(i = 0; i < ntags; i++)
- 		sel->tags[i] = False;
- 	sel->tags[arg->i] = True;
-+	sel->weight = arg->i;
- 	arrange(NULL);
- }
- 
-@@ -136,5 +136,6 @@
- 	for(i = 0; i < ntags && !sel->tags[i]; i++);
- 	if(i == ntags)
- 		sel->tags[arg->i] = True;
-+	for(sel->weight = 0; sel->weight < ntags && !sel->tags[sel->weight]; sel->weight++);
- 	arrange(NULL);
- }
diff --git a/x11-wm/dwm/files/dwm-1.4-config_mk.patch b/x11-wm/dwm/files/dwm-1.4-config_mk.patch
new file mode 100644
index 000000000..70e7843a8
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.4-config_mk.patch
@@ -0,0 +1,27 @@
+--- dwm-1.4~/config.mk	2006-09-06 17:47:00.000000000 +0200
++++ dwm-1.4/config.mk	2006-09-06 17:47:22.000000000 +0200
+@@ -4,8 +4,8 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX ?= /usr/local
++MANPREFIX ?= ${PREFIX}/share/man
+ 
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -15,11 +15,11 @@
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+ 
+ # flags
+-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
++CFLAGS += -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
+ LDFLAGS = ${LIBS}
+ #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = -g ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC ?= cc
+ LD = ${CC}
diff --git a/x11-wm/dwm/files/dwm-1.4-makefile.patch b/x11-wm/dwm/files/dwm-1.4-makefile.patch
new file mode 100644
index 000000000..4697ed2ed
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.4-makefile.patch
@@ -0,0 +1,10 @@
+--- dwm-1.4~/Makefile	2006-09-06 17:47:00.000000000 +0200
++++ dwm-1.4/Makefile	2006-09-06 17:47:25.000000000 +0200
+@@ -28,7 +28,6 @@
+ dwm: ${OBJ}
+ 	@echo LD $@
+ 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
+ 
+ clean:
+ 	@echo cleaning
-- 
cgit v1.2.3-65-gdbad