4 files changed, 6 insertions, 146 deletions
diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 9073bed9703a..f93b1a5dee01 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/dmenu
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.50 2008/11/01 17:19:57 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.51 2009/03/21 21:37:04 nelchael Exp $
+
+  21 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org> -files/dmenu-3.7.patch,
+  -dmenu-3.7-r1.ebuild, -dmenu-3.8.ebuild:
+  Remove old versions.
 
   01 Nov 2008; nixnut <nixnut@gentoo.org> dmenu-3.9.ebuild:
   Stable on ppc wrt bug 244528
diff --git a/x11-misc/dmenu/dmenu-3.7-r1.ebuild b/x11-misc/dmenu/dmenu-3.7-r1.ebuild
deleted file mode 100644
index b8def8dbd41b..000000000000
--- a/x11-misc/dmenu/dmenu-3.7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-3.7-r1.ebuild,v 1.10 2008/07/22 20:01:47 corsair Exp $
-
-inherit toolchain-funcs savedconfig eutils
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
-HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
-		-e "s/LDFLAGS = -s/LDFLAGS += -g/" \
-		-e "s/XINERAMALIBS =/XINERAMALIBS ?=/" \
-		-e "s/XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
-		config.mk || die "sed failed"
-
-	epatch "${FILESDIR}/${P}.patch"
-
-	if use savedconfig; then
-		restore_config config.h
-	fi
-}
-
-src_compile() {
-	local msg
-	use savedconfig && msg=", please check the configfile"
-	if use xinerama; then
-		emake CC=$(tc-getCC) || die "emake failed${msg}"
-	else
-		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" \
-			|| die "emake failed${msg}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README
-
-	save_config config.h
-}
-
-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/dmenu-3.8.ebuild b/x11-misc/dmenu/dmenu-3.8.ebuild
deleted file mode 100644
index 002dd19051f5..000000000000
--- a/x11-misc/dmenu/dmenu-3.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-3.8.ebuild,v 1.1 2008/07/30 18:32:45 cedk Exp $
-
-inherit toolchain-funcs savedconfig
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
-HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-DEPEND="x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
-		-e "s/LDFLAGS = -s/LDFLAGS += -g/" \
-		-e "s/XINERAMALIBS =/XINERAMALIBS ?=/" \
-		-e "s/XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
-		config.mk || die "sed failed"
-
-	if use savedconfig; then
-		restore_config config.h
-	fi
-}
-
-src_compile() {
-	local msg
-	use savedconfig && msg=", please check the configfile"
-	if use xinerama; then
-		emake CC=$(tc-getCC) || die "emake failed${msg}"
-	else
-		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" \
-			|| die "emake failed${msg}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README
-
-	save_config config.h
-}
-
-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/dmenu-3.7.patch b/x11-misc/dmenu/files/dmenu-3.7.patch
deleted file mode 100644
index 44bb70154846..000000000000
--- a/x11-misc/dmenu/files/dmenu-3.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru dmenu-3.7~/dmenu.c dmenu-3.7/dmenu.c
---- dmenu-3.7~/dmenu.c	2008-07-20 16:26:14.000000000 +0200
-+++ dmenu-3.7/dmenu.c	2008-07-20 16:27:01.000000000 +0200
-@@ -477,11 +477,11 @@
- 		calcoffsets();
- 		break;
- 	case XK_Return:
--		if((e->state & ShiftMask) && text)
-+		if((e->state & ShiftMask) && *text)
- 			fprintf(stdout, "%s", text);
- 		else if(sel)
- 			fprintf(stdout, "%s", sel->text);
--		else if(text)
-+		else if(*text)
- 			fprintf(stdout, "%s", text);
- 		fflush(stdout);
- 		running = False;