x11-wm/dwm: Version bump

svn path=/sunrise/; revision=1027

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 6a6cec4582c93494f507ea0da15cb70527d276aa..0e58cc96cc3abb5b0c379f6a8b26a65646ea8b12 100644 (file)
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Aug 2006; Cedric Krier <ced@ced.homedns.org> +dwm-1.1.ebuild,
+  +files/dwm-1.1-config_mk.patch, +files/dwm-1.1-makefile.patch,
+  +files/dwm-1.1-unused_variable.patch:
+  Version bump
+
   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,

diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 28991fa4b24f54527f402d6738b55b36a4565ddf..9d1786eadd4bf9d55a5ef0562210756e94e0215f 100644 (file)
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -10,15 +10,32 @@ AUX dwm-1.0-unused_variable.patch 698 RMD160 1296d0ce42637022ecf9adde6384a76ee81
 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
+AUX dwm-1.1-config_mk.patch 675 RMD160 30089648e152edc9609e49bdc50d85b6c93cab01 SHA1 17a8c43eb6a2e20f6f845828d8661986505c0f6a SHA256 d44d8fa8b0dd6f41ae592f0021b4b77b88f9c78f19756104631a15918cbbeb4b
+MD5 5a2c3a81cf6749e6eac848a3814c8de6 files/dwm-1.1-config_mk.patch 675
+RMD160 30089648e152edc9609e49bdc50d85b6c93cab01 files/dwm-1.1-config_mk.patch 675
+SHA256 d44d8fa8b0dd6f41ae592f0021b4b77b88f9c78f19756104631a15918cbbeb4b files/dwm-1.1-config_mk.patch 675
+AUX dwm-1.1-makefile.patch 232 RMD160 badefa3b5e8dd91297f071cac420c494811c699a SHA1 b6a3a46b146a7a899b6197e86a9fd8487231f2c1 SHA256 c0245bd74381f08ec64b9d4dca0e0c2d5888b7d66a2d11479b1207e23ed68f32
+MD5 17d92a7b6091c3253e7fd04408f372a5 files/dwm-1.1-makefile.patch 232
+RMD160 badefa3b5e8dd91297f071cac420c494811c699a files/dwm-1.1-makefile.patch 232
+SHA256 c0245bd74381f08ec64b9d4dca0e0c2d5888b7d66a2d11479b1207e23ed68f32 files/dwm-1.1-makefile.patch 232
+AUX dwm-1.1-unused_variable.patch 711 RMD160 c4e02bea8e235ca52a68a00974206729c9d86f6a SHA1 434b673c1a08ab34ecaaf7f0cca932ffb587544a SHA256 a73575ddd4303e0b1ae9c81e6e39ea29df44b4e1cfd7ec58aa512e52031e20e0
+MD5 f3e6859a0fdc36ed434958f20281c5d0 files/dwm-1.1-unused_variable.patch 711
+RMD160 c4e02bea8e235ca52a68a00974206729c9d86f6a files/dwm-1.1-unused_variable.patch 711
+SHA256 a73575ddd4303e0b1ae9c81e6e39ea29df44b4e1cfd7ec58aa512e52031e20e0 files/dwm-1.1-unused_variable.patch 711
 DIST dwm-1.0.tar.gz 15444 RMD160 f2e78a542091bd492bda7e6372ee89d51ce253e1 SHA1 ab48792cb2f0d832374545140762a4df668a6703 SHA256 d1da195e1f93d8a06d289c7f54c90902e6d79bca045c6aa07953404366befc5c
+DIST dwm-1.1.tar.gz 15580 RMD160 492cbdba39fc70ea0f151b52dc73cf5a678bcd1e SHA1 621de9d3e7aaae3bef131f33321d5d5e3ae5f004 SHA256 0f665073a14e6449a94f04da333e5a1859f5f32eca7a99cd3d85dfbef55d7746
 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
+EBUILD dwm-1.1.ebuild 1798 RMD160 5ade43f47e4fe50ba1f09bf9b16a47176980a575 SHA1 01218a63b84f5ef0251877b7e5a34253ef0624aa SHA256 69f1504ad26d724e19a7c903b93684e31a6f2bd32c9b681e15e1f8774786a0cd
+MD5 9da1f04a1206ad4ff75249693b9fa66e dwm-1.1.ebuild 1798
+RMD160 5ade43f47e4fe50ba1f09bf9b16a47176980a575 dwm-1.1.ebuild 1798
+SHA256 69f1504ad26d724e19a7c903b93684e31a6f2bd32c9b681e15e1f8774786a0cd dwm-1.1.ebuild 1798
+MISC ChangeLog 1608 RMD160 2b258e7a88c62a9d97ce5333f1ba2211523ff730 SHA1 7bef90c8733491166a4ace87371a646fde082c7b SHA256 af2ada2b8c1df3371b80c1708781405b2f5ab08cf4e9c775befb7f5f3791e3e6
+MD5 72e93003dac67efddc57b680c5e2b6b0 ChangeLog 1608
+RMD160 2b258e7a88c62a9d97ce5333f1ba2211523ff730 ChangeLog 1608
+SHA256 af2ada2b8c1df3371b80c1708781405b2f5ab08cf4e9c775befb7f5f3791e3e6 ChangeLog 1608
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -26,3 +43,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 e6dd2e0c126b5e37a09f35f29b82a605 files/digest-dwm-1.0 220
 RMD160 e0ac4ba2314652fdb278995ba24deae4c256ceea files/digest-dwm-1.0 220
 SHA256 b2c33c3173394f5279c1412a30b3cfef4eee24baa8bf1b44ffeed5b771b13124 files/digest-dwm-1.0 220
+MD5 370423e50eec180b156cb074334b472b files/digest-dwm-1.1 220
+RMD160 665320f65de30d5422e2849b6c56d22388136457 files/digest-dwm-1.1 220
+SHA256 acb0203d110397d1af922c123d08b0a4aa0f199c053d5f0418844eb69e32ca7c files/digest-dwm-1.1 220

diff --git a/x11-wm/dwm/dwm-1.1.ebuild b/x11-wm/dwm/dwm-1.1.ebuild
new file mode 100644 (file)
index 0000000..664b8bf
--- /dev/null
+++ b/x11-wm/dwm/dwm-1.1.ebuild
@@ -0,0 +1,68 @@
+# 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"
+       epatch "${FILESDIR}/${P}-unused_variable.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.1 b/x11-wm/dwm/files/digest-dwm-1.1
new file mode 100644 (file)
index 0000000..31eb3cb
--- /dev/null
+++ b/x11-wm/dwm/files/digest-dwm-1.1
@@ -0,0 +1,3 @@
+MD5 398c002ccf825e2a0298d6c6ed86672c dwm-1.1.tar.gz 15580
+RMD160 492cbdba39fc70ea0f151b52dc73cf5a678bcd1e dwm-1.1.tar.gz 15580
+SHA256 0f665073a14e6449a94f04da333e5a1859f5f32eca7a99cd3d85dfbef55d7746 dwm-1.1.tar.gz 15580

diff --git a/x11-wm/dwm/files/dwm-1.1-config_mk.patch b/x11-wm/dwm/files/dwm-1.1-config_mk.patch
new file mode 100644 (file)
index 0000000..484f89f
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.1-config_mk.patch
@@ -0,0 +1,27 @@
+--- dwm-1.1~/config.mk 2006-08-28 13:18:03.000000000 +0200
++++ dwm-1.1/config.mk  2006-08-28 13:19:06.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.1-makefile.patch b/x11-wm/dwm/files/dwm-1.1-makefile.patch
new file mode 100644 (file)
index 0000000..2f05770
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.1-makefile.patch
@@ -0,0 +1,10 @@
+--- dwm-1.1~/Makefile  2006-08-28 13:18:03.000000000 +0200
++++ dwm-1.1/Makefile   2006-08-28 13:19:11.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.1-unused_variable.patch b/x11-wm/dwm/files/dwm-1.1-unused_variable.patch
new file mode 100644 (file)
index 0000000..92ec906
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-1.1-unused_variable.patch
@@ -0,0 +1,33 @@
+diff -ru dwm-1.1~/client.c dwm-1.1/client.c
+--- dwm-1.1~/client.c  2006-08-28 13:18:03.000000000 +0200
++++ dwm-1.1/client.c   2006-08-28 13:19:15.000000000 +0200
+@@ -52,8 +52,6 @@
+ static void
+ resizetitle(Client *c)
+ {
+-      int i;
+-
+       c->tw = textw(c->name);
+       if(c->tw > c->w)
+               c->tw = c->w + 2;
+@@ -340,7 +338,7 @@
+ settitle(Client *c)
+ {
+       char **list = NULL;
+-      int i, n;
++      int n;
+       XTextProperty name;
+ 
+       name.nitems = 0;
+diff -ru dwm-1.1~/draw.c dwm-1.1/draw.c
+--- dwm-1.1~/draw.c    2006-08-28 13:18:03.000000000 +0200
++++ dwm-1.1/draw.c     2006-08-28 13:20:02.000000000 +0200
+@@ -133,8 +133,6 @@
+ void
+ drawtitle(Client *c)
+ {
+-      int i;
+-
+       if(c == sel && issel) {
+               drawstatus();
+               XUnmapWindow(dpy, c->twin);