x11-misc/dmenu: Version bump

svn path=/sunrise/; revision=1676

6 files changed, 29 insertions, 47 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 0da57fe05..61e1a489f 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Oct 2006; Cedric Krier <ced@ced.homedns.org> -dmenu-1.2.ebuild,
+  -files/dmenu-1.2-makefile.patch, +dmenu-1.4.ebuild:
+  Version bump
+
   09 Oct 2006; Cedric Krier <ced@ced.homedns.org> -dmenu-1.1.ebuild,
   -files/dmenu-1.1-config_mk.patch, -files/dmenu-1.1-makefile.patch,
   dmenu-1.2.ebuild:
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 1ccf43126..e5e65e98d 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,20 +1,16 @@
-AUX dmenu-1.2-makefile.patch 739 RMD160 99848621518ee09d5e9466816cc8dff06f5253a9 SHA1 3ff3213282f496969bac5a7fb7051ec3f3d15d6d SHA256 47da6da35f58f41f88224660dcc796156d4a2d06cb38c36bd6adabe81bf6bbde
-MD5 ef8d8e5d21e86090f58574411bc65cf5 files/dmenu-1.2-makefile.patch 739
-RMD160 99848621518ee09d5e9466816cc8dff06f5253a9 files/dmenu-1.2-makefile.patch 739
-SHA256 47da6da35f58f41f88224660dcc796156d4a2d06cb38c36bd6adabe81bf6bbde files/dmenu-1.2-makefile.patch 739
-DIST dmenu-1.2.tar.gz 7388 RMD160 8eb573ab9ae5491d5d9d226e6853b96043b1a23a SHA1 2d91433bcf78f94e2b9b4c0e9a933b4668453365 SHA256 9b893d51e734cef8ed3884607d93f02209443a4b195cd8a5c73cdcf1ddf0de62
-EBUILD dmenu-1.2.ebuild 702 RMD160 f5ecde5bf48896647efd0cf3cbdb1afd696f9985 SHA1 74e042b55fd780cd9cb27d657850ddfb99fd539e SHA256 6eaacb7bb57cd78659c74586b066a231bd2441212785265aa60ae964e60386ad
-MD5 1bf01d659d4a95a8eb25e02f4ce774bc dmenu-1.2.ebuild 702
-RMD160 f5ecde5bf48896647efd0cf3cbdb1afd696f9985 dmenu-1.2.ebuild 702
-SHA256 6eaacb7bb57cd78659c74586b066a231bd2441212785265aa60ae964e60386ad dmenu-1.2.ebuild 702
-MISC ChangeLog 3171 RMD160 9114279cc81997cab472da8a7b1c3589cc5791cd SHA1 f451a3d0ba5e8c3779d837080512375024a418e1 SHA256 94d496b98a9481c29a1df08df8f82f95a603eea2bf09ab37dfa8f86d298e7e8c
-MD5 8507e3f08a158f952f1db044c5811dc5 ChangeLog 3171
-RMD160 9114279cc81997cab472da8a7b1c3589cc5791cd ChangeLog 3171
-SHA256 94d496b98a9481c29a1df08df8f82f95a603eea2bf09ab37dfa8f86d298e7e8c ChangeLog 3171
+DIST dmenu-1.4.tar.gz 7331 RMD160 c80574ee3eaf56c63f0b867c557e5c86e766a808 SHA1 714de2ea88d3b1b68d6620dd6793efa8b0894dae SHA256 7de5ab1418e56509dbcf90be664380475eefd49884bb6b8f1be66e5af1b8b9ea
+EBUILD dmenu-1.4.ebuild 826 RMD160 c2f2cee245b40eafb5489efe4303bc995bf22f9f SHA1 c251aca21d6361863807edb104d95d33762bbb2f SHA256 cd5c478f684ee0d0a9ecd969ba115ea99050b5c28c42f0ee6f6ff00f842c544c
+MD5 8faa92241e01e0be0962b257764c8e5d dmenu-1.4.ebuild 826
+RMD160 c2f2cee245b40eafb5489efe4303bc995bf22f9f dmenu-1.4.ebuild 826
+SHA256 cd5c478f684ee0d0a9ecd969ba115ea99050b5c28c42f0ee6f6ff00f842c544c dmenu-1.4.ebuild 826
+MISC ChangeLog 3310 RMD160 12519df5831bc47b1fca64a8629be3ec4a1aa3f4 SHA1 456964b5d5465c129ac4425132f47eb31fe3a130 SHA256 a636b5a002d3dc8d06b772905dba8629748923d5f4b2eee1a895060c3e1251e4
+MD5 fef14bc4edbd20d0096c051716eee46c ChangeLog 3310
+RMD160 12519df5831bc47b1fca64a8629be3ec4a1aa3f4 ChangeLog 3310
+SHA256 a636b5a002d3dc8d06b772905dba8629748923d5f4b2eee1a895060c3e1251e4 ChangeLog 3310
 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 3ce5d9c24ab442062f54bf1bcda97367 files/digest-dmenu-1.2 223
-RMD160 75b3836156b84fb940d76a981eef4c04dcad55a7 files/digest-dmenu-1.2 223
-SHA256 2cc355bcd100e1778a1d8f1a67bcfa377d50dc56f46a7b28084ba0d11302281f files/digest-dmenu-1.2 223
+MD5 ed8928c70fff44e3046315d82d938867 files/digest-dmenu-1.4 223
+RMD160 6f46a73563fce9ca61d1597feab99f1ab48b1847 files/digest-dmenu-1.4 223
+SHA256 26e6c10b9c34854a9f63062d5f038f22c81f9dc73bed315268afd7201c9b2fc7 files/digest-dmenu-1.4 223
diff --git a/x11-misc/dmenu/dmenu-1.2.ebuild b/x11-misc/dmenu/dmenu-1.4.ebuild
index d4cd95177..74a3f9bf8 100644
--- a/x11-misc/dmenu/dmenu-1.2.ebuild
+++ b/x11-misc/dmenu/dmenu-1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
 HOMEPAGE="http://suckless.org/view/dynamic+window+manager"
@@ -14,13 +14,20 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	sed -i \
+		-e "s/.*strip.*//" \
+		Makefile || die "sed failed"
+
+	sed -i \
+		-e "s/CFLAGS = -Os/CFLAGS +=/" \
+		-e "s/LDFLAGS =/LDFLAGS +=/" \
+		config.mk || die "sed failed"
 }
 
 src_compile() {
diff --git a/x11-misc/dmenu/files/digest-dmenu-1.2 b/x11-misc/dmenu/files/digest-dmenu-1.2
deleted file mode 100644
index 18355b275..000000000
--- a/x11-misc/dmenu/files/digest-dmenu-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0deb4ffb0b889d4eac23b2bc7af94a01 dmenu-1.2.tar.gz 7388
-RMD160 8eb573ab9ae5491d5d9d226e6853b96043b1a23a dmenu-1.2.tar.gz 7388
-SHA256 9b893d51e734cef8ed3884607d93f02209443a4b195cd8a5c73cdcf1ddf0de62 dmenu-1.2.tar.gz 7388
diff --git a/x11-misc/dmenu/files/digest-dmenu-1.4 b/x11-misc/dmenu/files/digest-dmenu-1.4
new file mode 100644
index 000000000..6d5e947cd
--- /dev/null
+++ b/x11-misc/dmenu/files/digest-dmenu-1.4
@@ -0,0 +1,3 @@
+MD5 98cc8482d385e8a8a8dab141408057bb dmenu-1.4.tar.gz 7331
+RMD160 c80574ee3eaf56c63f0b867c557e5c86e766a808 dmenu-1.4.tar.gz 7331
+SHA256 7de5ab1418e56509dbcf90be664380475eefd49884bb6b8f1be66e5af1b8b9ea dmenu-1.4.tar.gz 7331
diff --git a/x11-misc/dmenu/files/dmenu-1.2-makefile.patch b/x11-misc/dmenu/files/dmenu-1.2-makefile.patch
deleted file mode 100644
index 8abf9efbc..000000000
--- a/x11-misc/dmenu/files/dmenu-1.2-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru dmenu-1.2~/config.mk dmenu-1.2/config.mk
---- dmenu-1.2~/config.mk	2006-10-06 22:06:28.000000000 +0200
-+++ dmenu-1.2/config.mk	2006-10-06 22:09:22.000000000 +0200
-@@ -15,8 +15,8 @@
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
- 
- # flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
--LDFLAGS = ${LIBS}
-+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
-+LDFLAGS += ${LIBS}
- #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
- 
-diff -ru dmenu-1.2~/Makefile dmenu-1.2/Makefile
---- dmenu-1.2~/Makefile	2006-10-06 22:06:28.000000000 +0200
-+++ dmenu-1.2/Makefile	2006-10-06 22:06:48.000000000 +0200
-@@ -24,7 +24,6 @@
- dmenu: ${OBJ}
- 	@echo LD $@
- 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
- 
- clean:
- 	@echo cleaning