x11-misc/dmenu: Version bump and new config (from sys-apps/busybox)

svn path=/sunrise/; revision=889

8 files changed, 101 insertions, 74 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 042354f0d..51586b20f 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Aug 2006; Cedric Krier <ced@ced.homedns.org> -dmenu-0.2.ebuild,
+  -files/dmenu-0.2-config_mk.patch, -files/dmenu-0.2-makefile.patch,
+  +dmenu-0.3.ebuild, +files/dmenu-0.3-config_mk.patch,
+  +files/dmenu-0.3-makefile.patch:
+  Version bump and new config (from sys-apps/busybox)
+
   09 Aug 2006; Cedric Krier <ced@ced.homedns.org> +dmenu-0.2.ebuild,
   +files/dmenu-0.2-config_mk.patch, +files/dmenu-0.2-makefile.patch,
   +metadata.xml:
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index b5ff5e7b5..bcf47ae62 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,24 +1,24 @@
-AUX dmenu-0.2-config_mk.patch 656 RMD160 5ee655dddd3c1b3cdb3133fbb2a3270fb4958a94 SHA1 3b15f3a3bfd4a1d8c9646ff73703745f7682b3d9 SHA256 7c6177deb07d7a95f6e2d13e74870005e7a97b33d88f790c3b3c6fd69048075d
-MD5 530f78d5165180772b57186d83970f69 files/dmenu-0.2-config_mk.patch 656
-RMD160 5ee655dddd3c1b3cdb3133fbb2a3270fb4958a94 files/dmenu-0.2-config_mk.patch 656
-SHA256 7c6177deb07d7a95f6e2d13e74870005e7a97b33d88f790c3b3c6fd69048075d files/dmenu-0.2-config_mk.patch 656
-AUX dmenu-0.2-makefile.patch 238 RMD160 f7aab3ad6ac7099bd884a5053c52645b45fe6250 SHA1 dededd30ce4e0cd780d008611949a4bb0371cf25 SHA256 204fb6de838e811f42e87a7367ab13872a606dfeaf4f9a2af746c47c4d735c75
-MD5 71517cd0dc167acd503f769a52825614 files/dmenu-0.2-makefile.patch 238
-RMD160 f7aab3ad6ac7099bd884a5053c52645b45fe6250 files/dmenu-0.2-makefile.patch 238
-SHA256 204fb6de838e811f42e87a7367ab13872a606dfeaf4f9a2af746c47c4d735c75 files/dmenu-0.2-makefile.patch 238
-DIST dmenu-0.2.tar.gz 7008 RMD160 32e4ba4e1911ce86a827cb9d61c9a4a634cb1abe SHA1 ca0a9e8d7bf793f083bba111f7e33572f910fccd SHA256 ef841205eb5d0db71e416ea66865087bd6456ed02d9c3cfd44682a4a6f074d64
-EBUILD dmenu-0.2.ebuild 991 RMD160 a07d308393bea5cf68b8ce8b8b077217c90eb731 SHA1 c9194156136e5d683aeb8b8c4e06601fd3dfd987 SHA256 87eb69934837187e9665764b0822d708220fb0239885bb1b44d9533ed51ee16f
-MD5 21f9c874d9714663d8cbbb85abbf01a6 dmenu-0.2.ebuild 991
-RMD160 a07d308393bea5cf68b8ce8b8b077217c90eb731 dmenu-0.2.ebuild 991
-SHA256 87eb69934837187e9665764b0822d708220fb0239885bb1b44d9533ed51ee16f dmenu-0.2.ebuild 991
-MISC ChangeLog 299 RMD160 68503f07572b8943887574fabc15daa3af1399b2 SHA1 6abdc8d48ea7c16877c188800db8caf85cf4e4b8 SHA256 96aadbeeccd0592a2debe65be3a0585395ffcbfd3eeebff1805cd64d60aeff10
-MD5 bf1be9664708b624a39f878b06f87e2b ChangeLog 299
-RMD160 68503f07572b8943887574fabc15daa3af1399b2 ChangeLog 299
-SHA256 96aadbeeccd0592a2debe65be3a0585395ffcbfd3eeebff1805cd64d60aeff10 ChangeLog 299
+AUX dmenu-0.3-config_mk.patch 656 RMD160 867ae9f293f040959fb6dd2cde4d49f45e0eb4e9 SHA1 a78c2158149c0cdc518f1768ec686cd6d5d03505 SHA256 0f2f87c5d51e9795795404a960c24ea04f9fb3abaf03930d47ddf2f6a5f7ca3f
+MD5 60482fbee912aa2dcac927041f175af1 files/dmenu-0.3-config_mk.patch 656
+RMD160 867ae9f293f040959fb6dd2cde4d49f45e0eb4e9 files/dmenu-0.3-config_mk.patch 656
+SHA256 0f2f87c5d51e9795795404a960c24ea04f9fb3abaf03930d47ddf2f6a5f7ca3f files/dmenu-0.3-config_mk.patch 656
+AUX dmenu-0.3-makefile.patch 238 RMD160 852ab2dfe8ca320f783e919ffa8257c316e1f7f0 SHA1 75f6126b4da4116cb128dd9ffb467dd04bc5ed7d SHA256 758b2e495dc80f833bc01d93bc24c0d1247ae87a6942dae5a3c0a0cd47f9d1ca
+MD5 126eb30f8531f9ae15fb2c79345bfac0 files/dmenu-0.3-makefile.patch 238
+RMD160 852ab2dfe8ca320f783e919ffa8257c316e1f7f0 files/dmenu-0.3-makefile.patch 238
+SHA256 758b2e495dc80f833bc01d93bc24c0d1247ae87a6942dae5a3c0a0cd47f9d1ca files/dmenu-0.3-makefile.patch 238
+DIST dmenu-0.3.tar.gz 6959 RMD160 814f14469c567682db3a896a170ea0e6c3769de7 SHA1 5753a8ed7b42e3677e7652a9c11e375caf184e61 SHA256 c85fdd759c8b703818e15e45702cdfb2b5dbb503dd15470b8b5aab8b69ef931d
+EBUILD dmenu-0.3.ebuild 1792 RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 SHA1 61c3023e67e27a40429485a6e6386bbde140c3ab SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195
+MD5 e4beb98fee6dfca2607b20001a52ecb9 dmenu-0.3.ebuild 1792
+RMD160 283ffa3653c25c96aef5acf975ea2859fb83c2e3 dmenu-0.3.ebuild 1792
+SHA256 40987184ab22efbdef6562cd48cd5eeff903ca286845d07c240e237d7ce3b195 dmenu-0.3.ebuild 1792
+MISC ChangeLog 582 RMD160 55afcc9652003432d58b36862d587c8cf7a60bec SHA1 c871dbf07b8532875d67c5f526451df8d6b4dd34 SHA256 7b7c655ba84f54390b9f3b236be5817a23037ae89a3f511c3d3fbaf48adf4f02
+MD5 4a194a2e8e7328dd9ae35fed49e90eda ChangeLog 582
+RMD160 55afcc9652003432d58b36862d587c8cf7a60bec ChangeLog 582
+SHA256 7b7c655ba84f54390b9f3b236be5817a23037ae89a3f511c3d3fbaf48adf4f02 ChangeLog 582
 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 0df41269f78ef9dcd33c1b7527b3bd46 files/digest-dmenu-0.2 223
-RMD160 402a90aaa53cdc917ec318d0fcf4693d0d85e565 files/digest-dmenu-0.2 223
-SHA256 0aa3b7556ddb9c1845773d59b8a40b97c47c358a4e67d329a5fa76e375c80b2c files/digest-dmenu-0.2 223
+MD5 3d65150e72838b3c46349d3229314079 files/digest-dmenu-0.3 223
+RMD160 3ce4c356e860d4cf7085efb11f1db88787b150f7 files/digest-dmenu-0.3 223
+SHA256 35f7aa7ddcc9734584c48e17afe17be935a007a773d6b33901b1f1fc1feaf61f files/digest-dmenu-0.3 223
diff --git a/x11-misc/dmenu/dmenu-0.2.ebuild b/x11-misc/dmenu/dmenu-0.2.ebuild
deleted file mode 100644
index a81571bfa..000000000
--- a/x11-misc/dmenu/dmenu-0.2.ebuild
+++ /dev/null
@@ -1,47 +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 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=""
-
-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"
-}
-
-src_compile() {
-	if [ -f /etc/${P}/config.h ]; then
-		einfo "Using /etc/${P}/config.h"
-		cp /etc/${P}/config.h "${S}/config.h"
-	fi
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
-	insinto /etc/${P}
-	doins config.h
-
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "To customize ${PN} edit /etc/${P}/config.h"
-	einfo "and re-emerge ${P}"
-}
diff --git a/x11-misc/dmenu/dmenu-0.3.ebuild b/x11-misc/dmenu/dmenu-0.3.ebuild
new file mode 100644
index 000000000..8f35cbbc8
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-0.3.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.2 b/x11-misc/dmenu/files/digest-dmenu-0.2
deleted file mode 100644
index cff0c1432..000000000
--- a/x11-misc/dmenu/files/digest-dmenu-0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bab6da308ac466505148f18844a3771e dmenu-0.2.tar.gz 7008
-RMD160 32e4ba4e1911ce86a827cb9d61c9a4a634cb1abe dmenu-0.2.tar.gz 7008
-SHA256 ef841205eb5d0db71e416ea66865087bd6456ed02d9c3cfd44682a4a6f074d64 dmenu-0.2.tar.gz 7008
diff --git a/x11-misc/dmenu/files/digest-dmenu-0.3 b/x11-misc/dmenu/files/digest-dmenu-0.3
new file mode 100644
index 000000000..e8508f11e
--- /dev/null
+++ b/x11-misc/dmenu/files/digest-dmenu-0.3
@@ -0,0 +1,3 @@
+MD5 bce526e3fab2d4bd3c513b5b378ca425 dmenu-0.3.tar.gz 6959
+RMD160 814f14469c567682db3a896a170ea0e6c3769de7 dmenu-0.3.tar.gz 6959
+SHA256 c85fdd759c8b703818e15e45702cdfb2b5dbb503dd15470b8b5aab8b69ef931d dmenu-0.3.tar.gz 6959
diff --git a/x11-misc/dmenu/files/dmenu-0.2-config_mk.patch b/x11-misc/dmenu/files/dmenu-0.3-config_mk.patch
index 34c9cd668..af3a43f3c 100644
--- a/x11-misc/dmenu/files/dmenu-0.2-config_mk.patch
+++ b/x11-misc/dmenu/files/dmenu-0.3-config_mk.patch
@@ -1,5 +1,5 @@
---- dmenu-0.2~/config.mk	2006-08-09 11:02:20.000000000 +0200
-+++ dmenu-0.2/config.mk	2006-08-09 11:03:41.000000000 +0200
+--- dmenu-0.3~/config.mk	2006-08-13 11:25:34.000000000 +0200
++++ dmenu-0.3/config.mk	2006-08-13 11:26:05.000000000 +0200
 @@ -4,8 +4,8 @@
  # Customize below to fit your system
  
diff --git a/x11-misc/dmenu/files/dmenu-0.2-makefile.patch b/x11-misc/dmenu/files/dmenu-0.3-makefile.patch
index b105fd74b..448737315 100644
--- a/x11-misc/dmenu/files/dmenu-0.2-makefile.patch
+++ b/x11-misc/dmenu/files/dmenu-0.3-makefile.patch
@@ -1,5 +1,5 @@
---- dmenu-0.2~/Makefile	2006-08-09 11:02:20.000000000 +0200
-+++ dmenu-0.2/Makefile	2006-08-09 11:18:17.000000000 +0200
+--- dmenu-0.3~/Makefile	2006-08-13 11:25:34.000000000 +0200
++++ dmenu-0.3/Makefile	2006-08-13 11:26:09.000000000 +0200
 @@ -28,7 +28,6 @@
  dmenu: ${OBJ}
  	@echo LD $@