x11-wm/dwm: Version bump

svn path=/sunrise/; revision=1012

13 files changed, 82 insertions, 157 deletions

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 2bae70ad3..6a6cec458 100644
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Aug 2006; Cedric Krier <ced@ced.homedns.org> -dwm-0.8.ebuild,
+  -files/dwm-0.8-config_mk.patch, -files/dwm-0.8-makefile.patch,
+  -dwm-0.9.ebuild, -files/dwm-0.9-config_mk.patch,
+  -files/dwm-0.9-makefile.patch, +dwm-1.0.ebuild,
+  +files/dwm-1.0-config_mk.patch, +files/dwm-1.0-makefile.patch,
+  +files/dwm-1.0-unused_variable.patch:
+  Version bump
+
   15 Aug 2006; Cedric Krier <ced@ced.homedns.org> +dwm-0.9.ebuild,
   +files/dwm-0.9-config_mk.patch, +files/dwm-0.9-makefile.patch:
   Version bump
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 51762bf6a..28991fa4b 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,40 +1,28 @@
-AUX dwm-0.8-config_mk.patch 653 RMD160 041dd213af381ebc030c2d5280d0270aeb407b62 SHA1 f02a13578c3a5c95f748ce667905de66d27e59b8 SHA256 fadb65b83db7462fc05d9dbe33c58350f3ec2965ea5d0c73eb46c797b31ed848
-MD5 764e6aad589bb66276f22095d31951af files/dwm-0.8-config_mk.patch 653
-RMD160 041dd213af381ebc030c2d5280d0270aeb407b62 files/dwm-0.8-config_mk.patch 653
-SHA256 fadb65b83db7462fc05d9dbe33c58350f3ec2965ea5d0c73eb46c797b31ed848 files/dwm-0.8-config_mk.patch 653
-AUX dwm-0.8-makefile.patch 232 RMD160 a2148250f8d07327c81e3fe6b03fa45752c18df9 SHA1 a6f5402a937f4e581eb5d26fb308c7d97904ad5f SHA256 3cfc8da483514743d4d2d0cf078d5c5bc0c95555e16edcd2607646b9fefb8616
-MD5 e25b57b1f377ace93a1a50180428a2c7 files/dwm-0.8-makefile.patch 232
-RMD160 a2148250f8d07327c81e3fe6b03fa45752c18df9 files/dwm-0.8-makefile.patch 232
-SHA256 3cfc8da483514743d4d2d0cf078d5c5bc0c95555e16edcd2607646b9fefb8616 files/dwm-0.8-makefile.patch 232
-AUX dwm-0.9-config_mk.patch 675 RMD160 de1ba01e8a81688cb1802e8a4b37bebe24085992 SHA1 7e594da0f9b24ea1b519f9e104b5aafe1229c79b SHA256 ed419472394b7bd629d6a56ab68ba5d74860c88cda6e77479cdfbf790f4d064d
-MD5 d9bbb5aa60513e4619dd72f9d86c6999 files/dwm-0.9-config_mk.patch 675
-RMD160 de1ba01e8a81688cb1802e8a4b37bebe24085992 files/dwm-0.9-config_mk.patch 675
-SHA256 ed419472394b7bd629d6a56ab68ba5d74860c88cda6e77479cdfbf790f4d064d files/dwm-0.9-config_mk.patch 675
-AUX dwm-0.9-makefile.patch 232 RMD160 8c31087c0e2aee996179aa5122e8deb39bead8b1 SHA1 82e7868383adad44a0a54d86b31cd1148a7e14a3 SHA256 95e77f05875eedcb3fcb8730f66165140c513d44ca10bd62dffcdc5daaecd055
-MD5 feaee538d4a4ccb3cc793f202e7ab646 files/dwm-0.9-makefile.patch 232
-RMD160 8c31087c0e2aee996179aa5122e8deb39bead8b1 files/dwm-0.9-makefile.patch 232
-SHA256 95e77f05875eedcb3fcb8730f66165140c513d44ca10bd62dffcdc5daaecd055 files/dwm-0.9-makefile.patch 232
-DIST dwm-0.8.tar.gz 14284 RMD160 e1d636a8a3e61efe3ccd8bedfda50ec4c84aa6f2 SHA1 5468d7a445ab5a2d9456cecb1b9b6292abefbf36 SHA256 f0f9a24bcd27bc6ee34f2061a28dde1a62e5b128684dbafffcc4016603d93acb
-DIST dwm-0.9.tar.gz 15179 RMD160 7d50a7230336a550d605e8e42ce18b90a9171ae2 SHA1 27b9f671fb5eb45ca620781b3685bb02b7e8df17 SHA256 1342fa63192623c19a8edfa02a28a02e9d4febc6752f6971d7acc4b830289486
-EBUILD dwm-0.8.ebuild 1749 RMD160 6542ecee57fa2544559d1ccd60b5a368bf51cc61 SHA1 41368d4b10b6f3688826f9b59c50c90f03957bf5 SHA256 fada45950743da7ca04bfa3a411d92051aa842534dc063962a18489598ea7376
-MD5 f2f130c83752bdcc5afd91c2dbef96b1 dwm-0.8.ebuild 1749
-RMD160 6542ecee57fa2544559d1ccd60b5a368bf51cc61 dwm-0.8.ebuild 1749
-SHA256 fada45950743da7ca04bfa3a411d92051aa842534dc063962a18489598ea7376 dwm-0.8.ebuild 1749
-EBUILD dwm-0.9.ebuild 1749 RMD160 6542ecee57fa2544559d1ccd60b5a368bf51cc61 SHA1 41368d4b10b6f3688826f9b59c50c90f03957bf5 SHA256 fada45950743da7ca04bfa3a411d92051aa842534dc063962a18489598ea7376
-MD5 f2f130c83752bdcc5afd91c2dbef96b1 dwm-0.9.ebuild 1749
-RMD160 6542ecee57fa2544559d1ccd60b5a368bf51cc61 dwm-0.9.ebuild 1749
-SHA256 fada45950743da7ca04bfa3a411d92051aa842534dc063962a18489598ea7376 dwm-0.9.ebuild 1749
-MISC ChangeLog 1066 RMD160 8ae2a8b6640192882c6c44426e4565d14830e2a3 SHA1 efdec2c07df0c968e573268ed07c2d4ee2c5bbc5 SHA256 26a31516d4805fcdb58603b8f243c8a961e9bb591c37729e59fed331555a0cc8
-MD5 d4ae3cd54c8f71d19d973e38240482ac ChangeLog 1066
-RMD160 8ae2a8b6640192882c6c44426e4565d14830e2a3 ChangeLog 1066
-SHA256 26a31516d4805fcdb58603b8f243c8a961e9bb591c37729e59fed331555a0cc8 ChangeLog 1066
+AUX dwm-1.0-config_mk.patch 721 RMD160 5507f18563177b5406fdcd660d1b12b3824049f6 SHA1 35eeaaf6124e62f4273873b8ac32e4226fc95feb SHA256 eda3eab8e39d6165f57941cd68795e4cc3dddd586bd52335ddd9597ef599e13c
+MD5 825f6384e80e997847b352c4d462308b files/dwm-1.0-config_mk.patch 721
+RMD160 5507f18563177b5406fdcd660d1b12b3824049f6 files/dwm-1.0-config_mk.patch 721
+SHA256 eda3eab8e39d6165f57941cd68795e4cc3dddd586bd52335ddd9597ef599e13c files/dwm-1.0-config_mk.patch 721
+AUX dwm-1.0-makefile.patch 276 RMD160 a9ec8011deac115e42cf0dba9197228072e73e51 SHA1 1bca1a2b9c3db5af57e622b8a19ba82fbc12895c SHA256 69ff702a3406af44ee9613b7f80432cf91079b0cb3d78276d69bd108bc728d46
+MD5 ab48741e82bfce79f3b330e12ba8f676 files/dwm-1.0-makefile.patch 276
+RMD160 a9ec8011deac115e42cf0dba9197228072e73e51 files/dwm-1.0-makefile.patch 276
+SHA256 69ff702a3406af44ee9613b7f80432cf91079b0cb3d78276d69bd108bc728d46 files/dwm-1.0-makefile.patch 276
+AUX dwm-1.0-unused_variable.patch 698 RMD160 1296d0ce42637022ecf9adde6384a76ee813f3fc SHA1 440cfa804ed79a413d907bb9b40c85bd355a4647 SHA256 a2168954a2bca33988d1bfdf5755ae8ad5f5edb35d15b5dbcf44b68e863e82d7
+MD5 74bba6a469d0b6a22a0f50823113677d files/dwm-1.0-unused_variable.patch 698
+RMD160 1296d0ce42637022ecf9adde6384a76ee813f3fc files/dwm-1.0-unused_variable.patch 698
+SHA256 a2168954a2bca33988d1bfdf5755ae8ad5f5edb35d15b5dbcf44b68e863e82d7 files/dwm-1.0-unused_variable.patch 698
+DIST dwm-1.0.tar.gz 15444 RMD160 f2e78a542091bd492bda7e6372ee89d51ce253e1 SHA1 ab48792cb2f0d832374545140762a4df668a6703 SHA256 d1da195e1f93d8a06d289c7f54c90902e6d79bca045c6aa07953404366befc5c
+EBUILD dwm-1.0.ebuild 1798 RMD160 5ade43f47e4fe50ba1f09bf9b16a47176980a575 SHA1 01218a63b84f5ef0251877b7e5a34253ef0624aa SHA256 69f1504ad26d724e19a7c903b93684e31a6f2bd32c9b681e15e1f8774786a0cd
+MD5 9da1f04a1206ad4ff75249693b9fa66e dwm-1.0.ebuild 1798
+RMD160 5ade43f47e4fe50ba1f09bf9b16a47176980a575 dwm-1.0.ebuild 1798
+SHA256 69f1504ad26d724e19a7c903b93684e31a6f2bd32c9b681e15e1f8774786a0cd dwm-1.0.ebuild 1798
+MISC ChangeLog 1420 RMD160 2d772e0bb4dfbd1b2a332e2b67656634f153d636 SHA1 e73d0003547bde0737bf061e48beecdfd9c947d2 SHA256 2d4a225b77b2dc4090649754ce9912b6b4646d621a701dfc2bcf15a550815d84
+MD5 ff38fc80377d55df361e4fc4f9cca0ab ChangeLog 1420
+RMD160 2d772e0bb4dfbd1b2a332e2b67656634f153d636 ChangeLog 1420
+SHA256 2d4a225b77b2dc4090649754ce9912b6b4646d621a701dfc2bcf15a550815d84 ChangeLog 1420
 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 87de1578864d7bb1bff46fd975dd6153 files/digest-dwm-0.8 220
-RMD160 24a8ec3275886d998964cb96fbd9f47c77c63ad1 files/digest-dwm-0.8 220
-SHA256 9c0ec45184b95dc8dd44e2efb538a9f04cd2c8adffe2c9a259bea478d630c2ce files/digest-dwm-0.8 220
-MD5 79e438d2481b9b961e1411c1f087be29 files/digest-dwm-0.9 220
-RMD160 1784931070572cd67285384fa16baec56b82c420 files/digest-dwm-0.9 220
-SHA256 abbc5cdddd7c7827296787eea55a90de1bf1287e55c9a0218247245279134c1c files/digest-dwm-0.9 220
+MD5 e6dd2e0c126b5e37a09f35f29b82a605 files/digest-dwm-1.0 220
+RMD160 e0ac4ba2314652fdb278995ba24deae4c256ceea files/digest-dwm-1.0 220
+SHA256 b2c33c3173394f5279c1412a30b3cfef4eee24baa8bf1b44ffeed5b771b13124 files/digest-dwm-1.0 220
diff --git a/x11-wm/dwm/dwm-0.9.ebuild b/x11-wm/dwm/dwm-0.9.ebuild
deleted file mode 100644
index 5205175fc..000000000
--- a/x11-wm/dwm/dwm-0.9.ebuild
+++ /dev/null
@@ -1,67 +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 )"
-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/dwm-0.8.ebuild b/x11-wm/dwm/dwm-1.0.ebuild
index 5205175fc..664b8bf5d 100644
--- a/x11-wm/dwm/dwm-0.8.ebuild
+++ b/x11-wm/dwm/dwm-1.0.ebuild
@@ -22,6 +22,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-config_mk.patch"
 	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-unused_variable.patch"
 
 	if use savedconfig; then
 		local conf root
diff --git a/x11-wm/dwm/files/digest-dwm-0.8 b/x11-wm/dwm/files/digest-dwm-0.8
deleted file mode 100644
index 3e810a6c3..000000000
--- a/x11-wm/dwm/files/digest-dwm-0.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63e6076a0e3999b10efc1d1729deda31 dwm-0.8.tar.gz 14284
-RMD160 e1d636a8a3e61efe3ccd8bedfda50ec4c84aa6f2 dwm-0.8.tar.gz 14284
-SHA256 f0f9a24bcd27bc6ee34f2061a28dde1a62e5b128684dbafffcc4016603d93acb dwm-0.8.tar.gz 14284
diff --git a/x11-wm/dwm/files/digest-dwm-0.9 b/x11-wm/dwm/files/digest-dwm-0.9
deleted file mode 100644
index b7c705da1..000000000
--- a/x11-wm/dwm/files/digest-dwm-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f3b3340cb3ae82f3e3a3721b947d992 dwm-0.9.tar.gz 15179
-RMD160 7d50a7230336a550d605e8e42ce18b90a9171ae2 dwm-0.9.tar.gz 15179
-SHA256 1342fa63192623c19a8edfa02a28a02e9d4febc6752f6971d7acc4b830289486 dwm-0.9.tar.gz 15179
diff --git a/x11-wm/dwm/files/digest-dwm-1.0 b/x11-wm/dwm/files/digest-dwm-1.0
new file mode 100644
index 000000000..e09325dfb
--- /dev/null
+++ b/x11-wm/dwm/files/digest-dwm-1.0
@@ -0,0 +1,3 @@
+MD5 587f56bef064d5c6ce115971fd6ef8c2 dwm-1.0.tar.gz 15444
+RMD160 f2e78a542091bd492bda7e6372ee89d51ce253e1 dwm-1.0.tar.gz 15444
+SHA256 d1da195e1f93d8a06d289c7f54c90902e6d79bca045c6aa07953404366befc5c dwm-1.0.tar.gz 15444
diff --git a/x11-wm/dwm/files/dwm-0.8-config_mk.patch b/x11-wm/dwm/files/dwm-0.8-config_mk.patch
deleted file mode 100644
index c4b1f5496..000000000
--- a/x11-wm/dwm/files/dwm-0.8-config_mk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- dwm-0.8~/config.mk	2006-08-12 23:10:59.000000000 +0200
-+++ dwm-0.8/config.mk	2006-08-12 23:11:31.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,10 +15,10 @@
- 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
--CC = cc
-+CC ?= cc
diff --git a/x11-wm/dwm/files/dwm-0.8-makefile.patch b/x11-wm/dwm/files/dwm-0.8-makefile.patch
deleted file mode 100644
index e25743a02..000000000
--- a/x11-wm/dwm/files/dwm-0.8-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dwm-0.8~/Makefile	2006-08-12 23:10:59.000000000 +0200
-+++ dwm-0.8/Makefile	2006-08-12 23:12:24.000000000 +0200
-@@ -28,7 +28,6 @@
- dwm: ${OBJ}
- 	@echo LD $@
- 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
- 
- clean:
- 	@echo cleaning
diff --git a/x11-wm/dwm/files/dwm-0.9-makefile.patch b/x11-wm/dwm/files/dwm-0.9-makefile.patch
deleted file mode 100644
index ec9f63400..000000000
--- a/x11-wm/dwm/files/dwm-0.9-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dwm-0.9~/Makefile	2006-08-15 14:14:41.000000000 +0200
-+++ dwm-0.9/Makefile	2006-08-15 14:16:44.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-0.9-config_mk.patch b/x11-wm/dwm/files/dwm-1.0-config_mk.patch
index e1c5574a9..e48f8eb8b 100644
--- a/x11-wm/dwm/files/dwm-0.9-config_mk.patch
+++ b/x11-wm/dwm/files/dwm-1.0-config_mk.patch
@@ -1,5 +1,6 @@
---- dwm-0.9~/config.mk	2006-08-15 14:14:41.000000000 +0200
-+++ dwm-0.9/config.mk	2006-08-15 15:00:47.000000000 +0200
+diff -ru dwm-1.0~/config.mk dwm-1.0/config.mk
+--- dwm-1.0~/config.mk	2006-08-24 11:40:13.000000000 +0200
++++ dwm-1.0/config.mk	2006-08-24 11:41:26.000000000 +0200
 @@ -4,8 +4,8 @@
  # Customize below to fit your system
  
diff --git a/x11-wm/dwm/files/dwm-1.0-makefile.patch b/x11-wm/dwm/files/dwm-1.0-makefile.patch
new file mode 100644
index 000000000..e5869cefa
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.0-makefile.patch
@@ -0,0 +1,11 @@
+diff -ru dwm-1.0~/Makefile dwm-1.0/Makefile
+--- dwm-1.0~/Makefile	2006-08-24 11:40:13.000000000 +0200
++++ dwm-1.0/Makefile	2006-08-24 11:40:36.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.0-unused_variable.patch b/x11-wm/dwm/files/dwm-1.0-unused_variable.patch
new file mode 100644
index 000000000..29ffb4e59
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.0-unused_variable.patch
@@ -0,0 +1,32 @@
+diff -ru dwm-1.0~/client.c dwm-1.0/client.c
+--- dwm-1.0~/client.c	2006-08-24 11:40:13.000000000 +0200
++++ dwm-1.0/client.c	2006-08-24 11:43:53.000000000 +0200
+@@ -26,8 +26,6 @@
+ static void
+ resizetitle(Client *c)
+ {
+-	int i;
+-
+ 	c->tw = textw(c->name);
+ 	if(c->tw > c->w)
+ 		c->tw = c->w + 2;
+@@ -325,7 +323,7 @@
+ settitle(Client *c)
+ {
+ 	char **list = NULL;
+-	int i, n;
++	int n;
+ 	XTextProperty name;
+ 
+ 	name.nitems = 0;
+diff -ru dwm-1.0~/draw.c dwm-1.0/draw.c
+--- dwm-1.0~/draw.c	2006-08-24 11:40:13.000000000 +0200
++++ dwm-1.0/draw.c	2006-08-24 11:43:12.000000000 +0200
+@@ -151,7 +151,6 @@
+ void
+ drawtitle(Client *c)
+ {
+-	int i;
+ 	Bool istile = arrange == dotile;
+ 
+ 	if(c == sel && issel) {