x11-misc/dmenu: Version bump

svn path=/sunrise/; revision=1028

6 files changed, 132 insertions, 4 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index f9fc1f442..76cf31000 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: $
 
+  28 Aug 2006; Cedric Krier <ced@ced.homedns.org> +dmenu-0.6.ebuild,
+  +files/dmenu-0.6-config_mk.patch, +files/dmenu-0.6-makefile.patch:
+  Version bump
+
   24 Aug 2006; Cedric Krier <ced@ced.homedns.org> -dmenu-0.3.ebuild,
   -files/dmenu-0.3-config_mk.patch, -files/dmenu-0.3-makefile.patch,
   -dmenu-0.4.ebuild, -files/dmenu-0.4-config_mk.patch,
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 4af24fdf7..f31c4e948 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -6,15 +6,28 @@ AUX dmenu-0.5-makefile.patch 286 RMD160 200b7462b45da5dc09bae3c75665b42bcbe1dc09
 MD5 774de49405cae78fe415a96774b15afa files/dmenu-0.5-makefile.patch 286
 RMD160 200b7462b45da5dc09bae3c75665b42bcbe1dc09 files/dmenu-0.5-makefile.patch 286
 SHA256 badb7b6073252def9408a9e2491d091464043fc3931807f2c61cb3e8092c6a17 files/dmenu-0.5-makefile.patch 286
+AUX dmenu-0.6-config_mk.patch 678 RMD160 87619b637a1f00c8b1ee92ec692c62a4766a6153 SHA1 dd9b67333520382afeddbe04b52811ea66d594c2 SHA256 22fb37f4f2587959d451e86651fcec7ea72d115bcdade8b5cc70185d293f4806
+MD5 9ef7eca1b9e029a92884891d60a6a2dc files/dmenu-0.6-config_mk.patch 678
+RMD160 87619b637a1f00c8b1ee92ec692c62a4766a6153 files/dmenu-0.6-config_mk.patch 678
+SHA256 22fb37f4f2587959d451e86651fcec7ea72d115bcdade8b5cc70185d293f4806 files/dmenu-0.6-config_mk.patch 678
+AUX dmenu-0.6-makefile.patch 238 RMD160 53061b2432aa3fc376a9b105fb7f3a290e081c48 SHA1 8adefaaea6cd08f5a62d52078c4fb9eb774ea74a SHA256 68c54c6e64bb338c1b98eb85e9212c5727a3c1629bea7aac1f06ed501410a89b
+MD5 bec1cbb61c1ff26c0766c370b0ef7b73 files/dmenu-0.6-makefile.patch 238
+RMD160 53061b2432aa3fc376a9b105fb7f3a290e081c48 files/dmenu-0.6-makefile.patch 238
+SHA256 68c54c6e64bb338c1b98eb85e9212c5727a3c1629bea7aac1f06ed501410a89b files/dmenu-0.6-makefile.patch 238
 DIST dmenu-0.5.tar.gz 7034 RMD160 f6c42443d7f37887be694dfd6817fe98999b4040 SHA1 ff32a9a1d46a18567db316815b1221c3c81f00ba SHA256 b9bb55fc8ffcfffeea423f7850aff5e7cb96e6784ab67105e3fb3d1ef6294343
+DIST dmenu-0.6.tar.gz 6975 RMD160 b58e8fd8c9b64056a1eef793c7fa6328ac522fce SHA1 d4215a96cc879d01d413dc7c6f05781991378ace SHA256 f824e0527d9499a3a19c63e88ea7a6863bf5a4355fc91cb6978678d1e22f41b5
 EBUILD dmenu-0.5.ebuild 1792 RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 SHA1 61c3023e67e27a40429485a6e6386bbde140c3ab SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195
 MD5 e4beb98fee6dfca2607b20001a52ecb9 dmenu-0.5.ebuild 1792
 RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 dmenu-0.5.ebuild 1792
 SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195 dmenu-0.5.ebuild 1792
-MISC ChangeLog 1068 RMD160 b27c91a1c439bb9a57524371a373b88e71dd6395 SHA1 150dee3f2cd4c943085e2e49cc33f0e905f774df SHA256 bdd0f7c3bcd4db4cc9f909ebcb0379ed9981c989ad990c39625636431a9f8a8a
-MD5 b3a068ab5d0132138a261ee758dda2ad ChangeLog 1068
-RMD160 b27c91a1c439bb9a57524371a373b88e71dd6395 ChangeLog 1068
-SHA256 bdd0f7c3bcd4db4cc9f909ebcb0379ed9981c989ad990c39625636431a9f8a8a ChangeLog 1068
+EBUILD dmenu-0.6.ebuild 1792 RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 SHA1 61c3023e67e27a40429485a6e6386bbde140c3ab SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195
+MD5 e4beb98fee6dfca2607b20001a52ecb9 dmenu-0.6.ebuild 1792
+RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 dmenu-0.6.ebuild 1792
+SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195 dmenu-0.6.ebuild 1792
+MISC ChangeLog 1222 RMD160 25101d0a6bd4452f3325cbe0815e90f3af2cdec9 SHA1 d8722378fd32e0f07819fb2d4234266d8457eae4 SHA256 1f2a6de3c4bd379b597d5bda2fb6a90f1082c59c48664ac489a72ba57b421013
+MD5 8fb10b6c1e1be0870d97a65be65ae393 ChangeLog 1222
+RMD160 25101d0a6bd4452f3325cbe0815e90f3af2cdec9 ChangeLog 1222
+SHA256 1f2a6de3c4bd379b597d5bda2fb6a90f1082c59c48664ac489a72ba57b421013 ChangeLog 1222
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -22,3 +35,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 b64fa2418179d15b09358d08119b224d files/digest-dmenu-0.5 223
 RMD160 2726199402be42aad2689e3255c2721ab7e210e7 files/digest-dmenu-0.5 223
 SHA256 f59ae1148f690b18d92f138e8b23e6bcab0acc4e94c2115223aed2dfb6e5df20 files/digest-dmenu-0.5 223
+MD5 1ab1bea9075285f4ea523ee0869f87a0 files/digest-dmenu-0.6 223
+RMD160 368f9f37ccd76af458790dc51fbd13faf76ce411 files/digest-dmenu-0.6 223
+SHA256 0f33590110b2dcee0b47e2089c0a0da1789ee3d3582b4fc340e5e5f4e62d7ec5 files/digest-dmenu-0.6 223
diff --git a/x11-misc/dmenu/dmenu-0.6.ebuild b/x11-misc/dmenu/dmenu-0.6.ebuild
new file mode 100644
index 000000000..8f35cbbc8
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-0.6.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 generic, highly customizable, and efficient menu for the X Window System"
+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-misc/dmenu/files/digest-dmenu-0.6 b/x11-misc/dmenu/files/digest-dmenu-0.6
new file mode 100644
index 000000000..aaa694792
--- /dev/null
+++ b/x11-misc/dmenu/files/digest-dmenu-0.6
@@ -0,0 +1,3 @@
+MD5 c5de93d0f66a5aaedd4128924a5e0eff dmenu-0.6.tar.gz 6975
+RMD160 b58e8fd8c9b64056a1eef793c7fa6328ac522fce dmenu-0.6.tar.gz 6975
+SHA256 f824e0527d9499a3a19c63e88ea7a6863bf5a4355fc91cb6978678d1e22f41b5 dmenu-0.6.tar.gz 6975
diff --git a/x11-misc/dmenu/files/dmenu-0.6-config_mk.patch b/x11-misc/dmenu/files/dmenu-0.6-config_mk.patch
new file mode 100644
index 000000000..b73b7c447
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-0.6-config_mk.patch
@@ -0,0 +1,27 @@
+--- dmenu-0.6~/config.mk	2006-08-28 13:27:11.000000000 +0200
++++ dmenu-0.6/config.mk	2006-08-28 13:27:49.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-misc/dmenu/files/dmenu-0.6-makefile.patch b/x11-misc/dmenu/files/dmenu-0.6-makefile.patch
new file mode 100644
index 000000000..2f1309214
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-0.6-makefile.patch
@@ -0,0 +1,10 @@
+--- dmenu-0.6~/Makefile	2006-08-28 13:27:11.000000000 +0200
++++ dmenu-0.6/Makefile	2006-08-28 13:27:52.000000000 +0200
+@@ -28,7 +28,6 @@
+ dmenu: ${OBJ}
+ 	@echo LD $@
+ 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
+ 
+ clean:
+ 	@echo cleaning