summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2010-10-21 21:39:36 +0000
committerCédric Krier <cedk@gentoo.org>2010-10-21 21:39:36 +0000
commit86e9201c86bb2c0ca38cc8fd0e94ec7c5d5d1d20 (patch)
tree18a87c4a7d91ad51faa3f7be6244fa8b401cc77d /x11-wm
parentx86 stable, bug #341915 (diff)
downloadgentoo-2-86e9201c86bb2c0ca38cc8fd0e94ec7c5d5d1d20.tar.gz
gentoo-2-86e9201c86bb2c0ca38cc8fd0e94ec7c5d5d1d20.tar.bz2
gentoo-2-86e9201c86bb2c0ca38cc8fd0e94ec7c5d5d1d20.zip
Fix X11 paths
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/dwm/ChangeLog6
-rw-r--r--x11-wm/dwm/dwm-5.7.2.ebuild6
-rw-r--r--x11-wm/dwm/dwm-5.8.2.ebuild4
3 files changed, 12 insertions, 4 deletions
diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 01c658b61577..364eff7304d9 100644
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/dwm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.67 2010/08/27 09:51:14 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.68 2010/10/21 21:39:36 cedk Exp $
+
+ 21 Oct 2010; Cédric Krier <cedk@gentoo.org> dwm-5.7.2.ebuild,
+ dwm-5.8.2.ebuild:
+ Fix X11 paths
27 Aug 2010; Cédric Krier <cedk@gentoo.org> dwm-5.8.2.ebuild:
Fix LDFLAGS for bug #334755
diff --git a/x11-wm/dwm/dwm-5.7.2.ebuild b/x11-wm/dwm/dwm-5.7.2.ebuild
index 242907be7600..f860af79645b 100644
--- a/x11-wm/dwm/dwm-5.7.2.ebuild
+++ b/x11-wm/dwm/dwm-5.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.7.2.ebuild,v 1.1 2009/10/10 21:59:07 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.7.2.ebuild,v 1.2 2010/10/21 21:39:36 cedk Exp $
inherit toolchain-funcs savedconfig
@@ -30,6 +30,8 @@ src_unpack() {
-e "s/LDFLAGS = -s/LDFLAGS += -g/" \
-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+ -e "s@/usr/X11R6/include@/usr/include/X11@" \
+ -e "s@/usr/X11R6/lib@/usr/lib@" \
config.mk || die "sed failed"
if use savedconfig; then
diff --git a/x11-wm/dwm/dwm-5.8.2.ebuild b/x11-wm/dwm/dwm-5.8.2.ebuild
index bafd53d9e1c2..b17cd7e3690b 100644
--- a/x11-wm/dwm/dwm-5.8.2.ebuild
+++ b/x11-wm/dwm/dwm-5.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.8.2.ebuild,v 1.2 2010/08/27 09:51:14 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-5.8.2.ebuild,v 1.3 2010/10/21 21:39:36 cedk Exp $
inherit toolchain-funcs savedconfig
@@ -30,6 +30,8 @@ src_unpack() {
-e "s/LDFLAGS = /LDFLAGS += /" \
-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
+ -e "s@/usr/X11R6/include@/usr/include/X11@" \
+ -e "s@/usr/X11R6/lib@/usr/lib@" \
config.mk || die "sed failed"
if use savedconfig; then