| 1 |
jer 09/11/30 20:46:35 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog musca-0.9.24.ebuild |
| 4 |
Log: |
| 5 |
Fix linking with --as-needed (bug #295165). Make in parallel too. Build xlisten optionally too. |
| 6 |
(Portage version: 2.2_rc54/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 x11-wm/musca/metadata.xml |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/metadata.xml?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/metadata.xml?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/metadata.xml?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: metadata.xml |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/musca/metadata.xml,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- metadata.xml 3 Nov 2009 06:45:20 -0000 1.2 |
| 22 |
+++ metadata.xml 30 Nov 2009 20:46:34 -0000 1.3 |
| 23 |
@@ -8,5 +8,6 @@ |
| 24 |
</maintainer> |
| 25 |
<use> |
| 26 |
<flag name="apis">Optionally install the experimental `apis' window manager</flag> |
| 27 |
+ <flag name="xlisten">Optionally install the xlisten utility</flag> |
| 28 |
</use> |
| 29 |
</pkgmetadata> |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.7 x11-wm/musca/ChangeLog |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/ChangeLog?rev=1.7&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/ChangeLog?rev=1.7&content-type=text/plain |
| 37 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/ChangeLog?r1=1.6&r2=1.7 |
| 38 |
|
| 39 |
Index: ChangeLog |
| 40 |
=================================================================== |
| 41 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v |
| 42 |
retrieving revision 1.6 |
| 43 |
retrieving revision 1.7 |
| 44 |
diff -u -r1.6 -r1.7 |
| 45 |
--- ChangeLog 4 Nov 2009 10:27:31 -0000 1.6 |
| 46 |
+++ ChangeLog 30 Nov 2009 20:46:34 -0000 1.7 |
| 47 |
@@ -1,6 +1,11 @@ |
| 48 |
# ChangeLog for x11-wm/musca |
| 49 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 50 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.6 2009/11/04 10:27:31 jer Exp $ |
| 51 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.7 2009/11/30 20:46:34 jer Exp $ |
| 52 |
+ |
| 53 |
+ 30 Nov 2009; Jeroen Roovers <jer@g.o> musca-0.9.24.ebuild, |
| 54 |
+ +files/musca-0.9.24-make.patch, metadata.xml: |
| 55 |
+ Fix linking with --as-needed (bug #295165). Make in parallel too. Build |
| 56 |
+ xlisten optionally too. |
| 57 |
|
| 58 |
04 Nov 2009; Jeroen Roovers <jer@g.o> musca-0.9.24.ebuild: |
| 59 |
Die more often. |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.3 x11-wm/musca/musca-0.9.24.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild?rev=1.3&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild?rev=1.3&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild?r1=1.2&r2=1.3 |
| 68 |
|
| 69 |
Index: musca-0.9.24.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v |
| 72 |
retrieving revision 1.2 |
| 73 |
retrieving revision 1.3 |
| 74 |
diff -u -r1.2 -r1.3 |
| 75 |
--- musca-0.9.24.ebuild 4 Nov 2009 10:27:31 -0000 1.2 |
| 76 |
+++ musca-0.9.24.ebuild 30 Nov 2009 20:46:34 -0000 1.3 |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
# Copyright 1999-2009 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v 1.2 2009/11/04 10:27:31 jer Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v 1.3 2009/11/30 20:46:34 jer Exp $ |
| 82 |
|
| 83 |
EAPI="2" |
| 84 |
|
| 85 |
@@ -14,7 +14,7 @@ |
| 86 |
LICENSE="GPL-3" |
| 87 |
SLOT="0" |
| 88 |
KEYWORDS="~x86" |
| 89 |
-IUSE="apis" |
| 90 |
+IUSE="apis xlisten" |
| 91 |
|
| 92 |
COMMON="x11-libs/libX11" |
| 93 |
DEPEND="${COMMON} sys-apps/sed" |
| 94 |
@@ -24,8 +24,13 @@ |
| 95 |
" |
| 96 |
|
| 97 |
src_prepare() { |
| 98 |
- sed -e 's|$(CFLAGS)|& $(LDFLAGS)|g' -i Makefile |
| 99 |
- use apis || sed -e '/apis/d' -i Makefile |
| 100 |
+ epatch "${FILESDIR}"/${P}-make.patch |
| 101 |
+ |
| 102 |
+ local i |
| 103 |
+ for i in apis xlisten; do |
| 104 |
+ use ${i} || sed -e "s|${i}||g" -i Makefile |
| 105 |
+ done |
| 106 |
+ |
| 107 |
use savedconfig && restore_config config.h |
| 108 |
} |
Archives