summaryrefslogtreecommitdiff
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
commitd939d32b4d5f7bf6f91cd20b088b00047d14df55 (patch)
treecf66b1bb30146737ec5d655f076e5c74fb59efe9
parentx86 stable, bug #341915 (diff)
downloadhistorical-d939d32b4d5f7bf6f91cd20b088b00047d14df55.tar.gz
historical-d939d32b4d5f7bf6f91cd20b088b00047d14df55.tar.bz2
historical-d939d32b4d5f7bf6f91cd20b088b00047d14df55.zip
Fix X11 paths
Package-Manager: portage-2.1.8.3/cvs/Linux i686
-rw-r--r--x11-wm/dwm/ChangeLog6
-rw-r--r--x11-wm/dwm/Manifest6
-rw-r--r--x11-wm/dwm/dwm-5.7.2.ebuild6
-rw-r--r--x11-wm/dwm/dwm-5.8.2.ebuild4
4 files changed, 15 insertions, 7 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/Manifest b/x11-wm/dwm/Manifest
index 88f271365c71..c3cbc1fe8b5b 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -13,7 +13,7 @@ EBUILD dwm-5.3.1.ebuild 2022 RMD160 d30199eb4699279a7a8196cb13c6a84b4b4b291e SHA
EBUILD dwm-5.4.1.ebuild 2168 RMD160 f0b1ae5067eee5040be9a56615d959be3da2b060 SHA1 f8381039144e5d8c2e646cd917ef726e4c6b444a SHA256 e62c9c0160d263b3c2dba547239b988c9df9ca64c3be34bb71fbbeb6d24a58ab
EBUILD dwm-5.5.ebuild 2165 RMD160 6d27600fe48ea187ddbb5b1110e767baa5704f06 SHA1 a4d00529eec550f956ffaf2810a35d59c59741c0 SHA256 d4f917c7fe6d601cb18c8adf5cdf4d4594e2153cdb2b80b213cea1093177b340
EBUILD dwm-5.6.1.ebuild 2165 RMD160 2651c834a967334c289051d4d6e6e75db372cc26 SHA1 122ebacf801540660e1443dfdcd4c4219bb9031c SHA256 cd9ebe798b0ee3ff27fe629c28daf5b0860aa4707103cfab9c764ce06bd75c56
-EBUILD dwm-5.7.2.ebuild 2167 RMD160 a488e55a96a275438f8de11bc7be486931dca1a7 SHA1 03eb837e2985e99016ae04cfce25268d6477f6af SHA256 f672eaab8c7b61064411b6509147b4add0e0e89ca5ea3fd040992b9da3fb8d9f
-EBUILD dwm-5.8.2.ebuild 2158 RMD160 f929ce5a2927276fed51e83e6641a2b753ac79e5 SHA1 204fa5a523fb6359a90ff624a1c92d60f2663f11 SHA256 a633bfad90b8b3c75c86dfe7bd819ea6bc21daca8bdeef053d8d57fd56a8d9f2
-MISC ChangeLog 7221 RMD160 ad267dfa036ce563692a318073e812fda401c7f3 SHA1 9f83e0ab4792599955bd13bdf962c9f9624d89c0 SHA256 444d94c41cdb0fb321f78f728253e09785d6ac5f6388f1f476eca92fcc078827
+EBUILD dwm-5.7.2.ebuild 2251 RMD160 e3434625c9c4fba242411f5d6a99b38aa5df9124 SHA1 7e9bf7b67c618b49a023f7a5fc0120cd7fc8c206 SHA256 0d90f3503e6bd0ca8194649d898c9505c26492e30b0c02bda7d7754b69e64cea
+EBUILD dwm-5.8.2.ebuild 2242 RMD160 25d2f97abcb7b05edd4aea2f50963b7c6192bae8 SHA1 d733af6e611f2b282dbd9158d7f10dbdaa1c047d SHA256 59c37d1b0874e430e93925f815a2fc3ce781674148f030b016bd4e89cad4c3c8
+MISC ChangeLog 7323 RMD160 b72f5b97bd806f1f447bee32d0909af705d4bb79 SHA1 32871f5bd1493d64ec41fdf9b572b687d37af607 SHA256 7414dc7cb6cd274de1e9c6ecd17239779e500a59257779eb6b08f1673012f4dc
MISC metadata.xml 464 RMD160 6a015eb09888ce94ac15fa060db3245003086bd3 SHA1 ce1903fc125b85fb2d17a1586dad6e2a634908d2 SHA256 2fc98596b93f4b722956c930fc9bc1dc52cd51c316e6c4ff21fd8e5086d2f0d4
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