Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/xrdp: xrdp-0.4.1.ebuild ChangeLog
Date: Mon, 05 Apr 2010 14:06:52
Message-Id: 20100405140649.E122F2C03E@corvid.gentoo.org
1 flameeyes 10/04/05 14:06:49
2
3 Modified: xrdp-0.4.1.ebuild ChangeLog
4 Log:
5 Fix --as-needed patching to work on both x86 and amd64.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.4 net-misc/xrdp/xrdp-0.4.1.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild?rev=1.4&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild?rev=1.4&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild?r1=1.3&r2=1.4
14
15 Index: xrdp-0.4.1.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v
18 retrieving revision 1.3
19 retrieving revision 1.4
20 diff -u -r1.3 -r1.4
21 --- xrdp-0.4.1.ebuild 25 Jan 2010 17:33:35 -0000 1.3
22 +++ xrdp-0.4.1.ebuild 5 Apr 2010 14:06:49 -0000 1.4
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.3 2010/01/25 17:33:35 armin76 Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.4 2010/04/05 14:06:49 flameeyes Exp $
28
29 EAPI="2"
30
31 @@ -26,18 +26,17 @@
32 cd "${S}"
33
34 epatch "${FILESDIR}/${P}-curdir.patch"
35 + epatch "${FILESDIR}"/${P}-asneeded.patch
36
37 # fix cflags, broken paths, multilib, and insecure rpath in all makefiles
38 - for MAKE in $(find . -name Makefile) ; do
39 - sed -i "s:CFLAGS = -Wall -O. :CFLAGS += :
40 + find . -name Makefile -print0 | \
41 + xargs -0 sed \
42 + -i "s:CFLAGS = -Wall -O. :CFLAGS += :
43 s:/usr/xrdp:${DESTDIR}:g
44 s:/usr/lib/:/usr/$(get_libdir)/:g
45 - s:rpath,\.:rpath,${DESTDIR}:g" ${MAKE}
46 - done
47 + s:rpath,\.:rpath,${DESTDIR}:g"
48
49 sed -i '/instfiles\/xrdp_control1.sh/ d' Makefile
50 -
51 - epatch "${FILESDIR}"/${P}-asneeded.patch
52 }
53
54 src_compile() {
55
56
57
58 1.7 net-misc/xrdp/ChangeLog
59
60 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.7&view=markup
61 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.7&content-type=text/plain
62 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/xrdp/ChangeLog?r1=1.6&r2=1.7
63
64 Index: ChangeLog
65 ===================================================================
66 RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v
67 retrieving revision 1.6
68 retrieving revision 1.7
69 diff -u -r1.6 -r1.7
70 --- ChangeLog 25 Jan 2010 17:33:35 -0000 1.6
71 +++ ChangeLog 5 Apr 2010 14:06:49 -0000 1.7
72 @@ -1,6 +1,10 @@
73 # ChangeLog for net-misc/xrdp
74 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
75 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.6 2010/01/25 17:33:35 armin76 Exp $
76 +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.7 2010/04/05 14:06:49 flameeyes Exp $
77 +
78 + 05 Apr 2010; Diego E. Pettenò <flameeyes@g.o> xrdp-0.4.1.ebuild,
79 + files/xrdp-0.4.1-asneeded.patch:
80 + Fix --as-needed patching to work on both x86 and amd64.
81
82 25 Jan 2010; Raúl Porcel <armin76@g.o> -xrdp-0.3.1.ebuild,
83 xrdp-0.4.1.ebuild: