Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/rdesktop: ChangeLog rdesktop-1.7.0-r1.ebuild
Date: Mon, 30 May 2011 17:17:27
Message-Id: 20110530171716.CF12A20057@flycatcher.gentoo.org
1 voyageur 11/05/30 17:17:16
2
3 Modified: ChangeLog
4 Added: rdesktop-1.7.0-r1.ebuild
5 Log:
6 EAPI4, fix crash with libao and pulseaudio, thanks everyone in bug #280923
7
8 (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.130 net-misc/rdesktop/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/rdesktop/ChangeLog?rev=1.130&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/rdesktop/ChangeLog?rev=1.130&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/rdesktop/ChangeLog?r1=1.129&r2=1.130
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v
20 retrieving revision 1.129
21 retrieving revision 1.130
22 diff -u -r1.129 -r1.130
23 --- ChangeLog 26 Apr 2011 12:46:05 -0000 1.129
24 +++ ChangeLog 30 May 2011 17:17:16 -0000 1.130
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-misc/rdesktop
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.129 2011/04/26 12:46:05 voyageur Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.130 2011/05/30 17:17:16 voyageur Exp $
30 +
31 +*rdesktop-1.7.0-r1 (30 May 2011)
32 +
33 + 30 May 2011; Bernard Cafarelli <voyageur@g.o>
34 + +rdesktop-1.7.0-r1.ebuild, +files/rdesktop-1.7.0-libao_crash.patch:
35 + EAPI4, fix crash with libao and pulseaudio, thanks everyone in bug #280923
36
37 26 Apr 2011; Bernard Cafarelli <voyageur@g.o>
38 -rdesktop-1.6.0-r4.ebuild, -files/rdesktop-1.6.0+pcsc-lite-1.6.6.patch,
39
40
41
42 1.1 net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: rdesktop-1.7.0-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.7.0-r1.ebuild,v 1.1 2011/05/30 17:17:16 voyageur Exp $
52
53 EAPI=4
54
55 inherit autotools eutils
56
57 MY_PV=${PV/_/-}
58
59 DESCRIPTION="A Remote Desktop Protocol Client"
60 HOMEPAGE="http://rdesktop.sourceforge.net/"
61 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
62
63 LICENSE="GPL-3"
64 SLOT="0"
65 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
66 IUSE="alsa ao debug ipv6 libsamplerate oss pcsc-lite"
67
68 S=${WORKDIR}/${PN}-${MY_PV}
69
70 RDEPEND=">=dev-libs/openssl-0.9.6b
71 x11-libs/libX11
72 x11-libs/libXext
73 x11-libs/libXau
74 x11-libs/libXdmcp
75 alsa? ( media-libs/alsa-lib )
76 ao? ( >=media-libs/libao-0.8.6 )
77 libsamplerate? ( media-libs/libsamplerate )
78 pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )"
79 DEPEND="${RDEPEND}
80 x11-libs/libXt"
81
82 src_prepare() {
83 # Prevent automatic stripping
84 local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
85 sed -i -e "s:${strip}::" Makefile.in \
86 || die "sed failed in Makefile.in"
87
88 # Automagic dependency on libsamplerate
89 epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
90 # Fix --enable-smartcard logic
91 epatch "${FILESDIR}"/${PN}-1.6.0-smartcard_configure.patch
92 # bug #349813
93 epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.6.patch
94 # bug #280923
95 epatch "${FILESDIR}"/${P}-libao_crash.patch
96
97 eautoreconf
98 }
99
100 src_configure() {
101 if use ao; then
102 sound_conf=$(use_with ao sound libao)
103 else if use alsa; then
104 sound_conf=$(use_with alsa sound alsa)
105 else
106 sound_conf=$(use_with oss sound oss)
107 fi
108 fi
109
110 econf \
111 --with-openssl=/usr \
112 $(use_with debug) \
113 $(use_with ipv6) \
114 $(use_with libsamplerate) \
115 $(use_enable pcsc-lite smartcard) \
116 ${sound_conf}
117 }
118
119 src_install() {
120 emake DESTDIR="${D}" install
121 dodoc doc/HACKING doc/TODO doc/keymapping.txt
122
123 # For #180313 - applies to versions >= 1.5.0
124 # Fixes sf.net bug
125 # http://sourceforge.net/tracker/index.php?func=detail&aid=1725634&group_id=24366&atid=381349
126 # check for next version to see if this needs to be removed
127 insinto /usr/share/rdesktop/keymaps
128 newins "${FILESDIR}/rdesktop-keymap-additional" additional
129 newins "${FILESDIR}/rdesktop-keymap-cs" cs
130 newins "${FILESDIR}/rdesktop-keymap-sk" sk
131 }