From 2f7050c37123b48a68d47127de74a4838a7f2538 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 28 Nov 2011 00:01:50 +0000
Subject: [PATCH] Rename /usr/bin/lsx by Roger (bug #392045).

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64
---
 x11-misc/dmenu/ChangeLog             |  7 ++++-
 x11-misc/dmenu/Manifest              |  9 +++---
 x11-misc/dmenu/dmenu-4.4.1-r1.ebuild | 43 ++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 x11-misc/dmenu/dmenu-4.4.1-r1.ebuild

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index d83d872cb48b..a0eabf8cc13d 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.74 2011/11/27 23:54:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.75 2011/11/28 00:01:50 jer Exp $
+
+*dmenu-4.4.1-r1 (28 Nov 2011)
+
+  28 Nov 2011; Jeroen Roovers <jer@gentoo.org> +dmenu-4.4.1-r1.ebuild:
+  Rename /usr/bin/lsx by Roger (bug #392045).
 
   27 Nov 2011; Jeroen Roovers <jer@gentoo.org> dmenu-4.4.1.ebuild:
   Do not block app-misc/lsx (bug #392045).
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 5765b41281ed..2635d9ed5d63 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -6,13 +6,14 @@ DIST dmenu-4.3.1.tar.gz 8905 RMD160 61675030c88c31bce88c6d2a2e408b28f622b68c SHA
 DIST dmenu-4.4.1.tar.gz 9318 RMD160 4a15486eaf19fdde93e763ec340001e5e74ac2a4 SHA1 42f8bb4b8bf72840cc343f0b3f31975a22350e5a SHA256 6d641645ab610d98d847b9a64500be7cc0e75bff5342534906936afa6ddb4550
 EBUILD dmenu-4.2.1.ebuild 1187 RMD160 1fb7e2f4e2e829fb7b4971f6a65ba4a1ca5fb828 SHA1 24e6913b0e42fbec1c61d33223a8d245e0a384a6 SHA256 303057faf1ea5a2b718293b1be9c9dc3fa8c2563080c24b31a6755ea504ac9e9
 EBUILD dmenu-4.3.1.ebuild 1180 RMD160 3d4aee6d00890f51a55e6065d679bf32a2eb3b76 SHA1 7fa9c6ce11af0d7cd0d29a07d23bc01bb997e9c6 SHA256 d1390c246c3402d758693e9d509033f095f130b37d24110067977e094f5d9a30
+EBUILD dmenu-4.4.1-r1.ebuild 1156 RMD160 e7478b0075a42ff4111dedf39d5d3790e6a64fba SHA1 281cfb09f4f4678b4e8839c4485ee335894888ca SHA256 d90f22fe73e06131183aa512c54108087d802367420796392eea6581638b0302
 EBUILD dmenu-4.4.1.ebuild 1097 RMD160 2be118447eaf8768a50141d007fa73b8bee4a938 SHA1 40e80dc230688a4fa1526e93935b549889f22a39 SHA256 ad5cd99d6d34504d9d85e2ba15e983c94a33118410b32f023afb6354f3f82247
-MISC ChangeLog 8165 RMD160 7bece0d62d10d0dbaa484092b19df8a26e5746da SHA1 efa7fd79341b7ce8fbd932f88d5edf7d53b54b26 SHA256 fb1bebb375307c82bb3d65b782b5e8c628fab858b7a07441818c91436552542d
+MISC ChangeLog 8314 RMD160 1e79f2b185a91a45a9ee3fcce30db060786e2342 SHA1 617ddac9703a6a23b38add3a424b20e09075dcae SHA256 88232bd0e0db966a9b3ed54ed0a2f49c53c4f0b3c96e7291885cec3f5dff499b
 MISC metadata.xml 264 RMD160 4a42dacaf8b7d3d015cc213529aeebb4c14c00b1 SHA1 a3102166478c00c9fa25b067d0d6bb6c77b796db SHA256 7c5d86dda58d2fef2a5bbf9eb560745a6c0586224b8d9f941f6eaca9e1552c84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7SzcIACgkQVWmRsqeSphPlnQCeOVChD1YnUEhPLd251LyWnN+/
-azMAnjA5BLKzT5XXfMNWkE3xF4dr6LnZ
-=M1NX
+iEYEARECAAYFAk7Sz3QACgkQVWmRsqeSphPh4gCeNHZSrkfzQtxQ+t3r0T2q+bY4
+BGAAnj634os67IOdQkCBxlvche6Ei8pT
+=oHs0
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/dmenu/dmenu-4.4.1-r1.ebuild b/x11-misc/dmenu/dmenu-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..d88a6e782166
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.4.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.4.1-r1.ebuild,v 1.1 2011/11/28 00:01:50 jer Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+DEPEND="x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS   = -ansi -pedantic -Wall -Os/CFLAGS  += -ansi -pedantic -Wall/" \
+		-e "s/LDFLAGS  = -s/LDFLAGS  +=/" \
+		-e "s/XINERAMALIBS  =/XINERAMALIBS  ?=/" \
+		-e "s/XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+		config.mk || die
+	sed -i -e 's|lsx|dmenu_&|g' dmenu_run || die
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC)
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS=""
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	mv "${D}"/usr/bin/{,dmenu_}lsx || die
+}
-- 
2.26.2