1 |
ottxor 12/08/26 04:27:39 |
2 |
|
3 |
Modified: google-talkplugin-3.2.4.0.ebuild |
4 |
google-talkplugin-9999.ebuild ChangeLog |
5 |
Added: google-talkplugin-3.5.1.0.ebuild |
6 |
Removed: google-talkplugin-3.1.4.0.ebuild |
7 |
Log: |
8 |
version bump |
9 |
|
10 |
(Portage version: 2.2.0_alpha122/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.2 www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild?rev=1.2&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild?rev=1.2&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild?r1=1.1&r2=1.2 |
18 |
|
19 |
Index: google-talkplugin-3.2.4.0.ebuild |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild,v |
22 |
retrieving revision 1.1 |
23 |
retrieving revision 1.2 |
24 |
diff -u -r1.1 -r1.2 |
25 |
--- google-talkplugin-3.2.4.0.ebuild 20 Jul 2012 20:45:56 -0000 1.1 |
26 |
+++ google-talkplugin-3.2.4.0.ebuild 26 Aug 2012 04:27:39 -0000 1.2 |
27 |
@@ -1,6 +1,6 @@ |
28 |
# Copyright 1999-2012 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild,v 1.1 2012/07/20 20:45:56 ottxor Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild,v 1.2 2012/08/26 04:27:39 ottxor Exp $ |
32 |
|
33 |
EAPI=4 |
34 |
|
35 |
@@ -28,7 +28,7 @@ |
36 |
KEYWORDS="-* ~amd64 ~x86" |
37 |
#GoogleTalkPlugin binary contains openssl |
38 |
LICENSE="google-talkplugin openssl" |
39 |
-RESTRICT="strip mirror" |
40 |
+RESTRICT="fetch strip" |
41 |
|
42 |
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib ) |
43 |
dev-libs/glib:2 |
44 |
@@ -74,9 +74,12 @@ |
45 |
|
46 |
# nofetch means upstream bumped and thus needs version bump |
47 |
pkg_nofetch() { |
48 |
- einfo "This version is no longer available from Google." |
49 |
- einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." |
50 |
- einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)." |
51 |
+ elog "This version is no longer available from Google and the license prevents mirroring." |
52 |
+ elog "This ebuild is intended for users who already downloaded it previously and have problems" |
53 |
+ elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search" |
54 |
+ use amd64 && MY_PKG="${MY_PKG/i386/amd64}" |
55 |
+ elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}" |
56 |
+ elog "and copy the file ${MY_PKG} to ${DISTDIR}." |
57 |
} |
58 |
|
59 |
src_unpack() { |
60 |
|
61 |
|
62 |
|
63 |
1.7 www-plugins/google-talkplugin/google-talkplugin-9999.ebuild |
64 |
|
65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.7&view=markup |
66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.7&content-type=text/plain |
67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?r1=1.6&r2=1.7 |
68 |
|
69 |
Index: google-talkplugin-9999.ebuild |
70 |
=================================================================== |
71 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v |
72 |
retrieving revision 1.6 |
73 |
retrieving revision 1.7 |
74 |
diff -u -r1.6 -r1.7 |
75 |
--- google-talkplugin-9999.ebuild 20 Jul 2012 20:45:56 -0000 1.6 |
76 |
+++ google-talkplugin-9999.ebuild 26 Aug 2012 04:27:39 -0000 1.7 |
77 |
@@ -1,6 +1,6 @@ |
78 |
# Copyright 1999-2012 Gentoo Foundation |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.6 2012/07/20 20:45:56 ottxor Exp $ |
81 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.7 2012/08/26 04:27:39 ottxor Exp $ |
82 |
|
83 |
EAPI=4 |
84 |
|
85 |
@@ -46,6 +46,7 @@ |
86 |
x11-libs/libXrandr |
87 |
x11-libs/libXrender |
88 |
x11-libs/libXt |
89 |
+ x11-libs/pango |
90 |
sys-apps/lsb-release |
91 |
virtual/opengl |
92 |
libnotify? ( x11-libs/libnotify )" |
93 |
|
94 |
|
95 |
|
96 |
1.31 www-plugins/google-talkplugin/ChangeLog |
97 |
|
98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.31&view=markup |
99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.31&content-type=text/plain |
100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?r1=1.30&r2=1.31 |
101 |
|
102 |
Index: ChangeLog |
103 |
=================================================================== |
104 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v |
105 |
retrieving revision 1.30 |
106 |
retrieving revision 1.31 |
107 |
diff -u -r1.30 -r1.31 |
108 |
--- ChangeLog 20 Jul 2012 20:45:56 -0000 1.30 |
109 |
+++ ChangeLog 26 Aug 2012 04:27:39 -0000 1.31 |
110 |
@@ -1,6 +1,13 @@ |
111 |
# ChangeLog for www-plugins/google-talkplugin |
112 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
113 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.30 2012/07/20 20:45:56 ottxor Exp $ |
114 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.31 2012/08/26 04:27:39 ottxor Exp $ |
115 |
+ |
116 |
+*google-talkplugin-3.5.1.0 (26 Aug 2012) |
117 |
+ |
118 |
+ 26 Aug 2012; Christoph Junghans <ottxor@g.o> |
119 |
+ +google-talkplugin-3.5.1.0.ebuild, -google-talkplugin-3.1.4.0.ebuild, |
120 |
+ google-talkplugin-3.2.4.0.ebuild, google-talkplugin-9999.ebuild: |
121 |
+ version bump |
122 |
|
123 |
*google-talkplugin-3.2.4.0 (20 Jul 2012) |
124 |
|
125 |
|
126 |
|
127 |
|
128 |
1.1 www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild |
129 |
|
130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild?rev=1.1&view=markup |
131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild?rev=1.1&content-type=text/plain |
132 |
|
133 |
Index: google-talkplugin-3.5.1.0.ebuild |
134 |
=================================================================== |
135 |
# Copyright 1999-2012 Gentoo Foundation |
136 |
# Distributed under the terms of the GNU General Public License v2 |
137 |
# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild,v 1.1 2012/08/26 04:27:39 ottxor Exp $ |
138 |
|
139 |
EAPI=4 |
140 |
|
141 |
inherit eutils nsplugins unpacker |
142 |
|
143 |
if [ "${PV}" != "9999" ]; then |
144 |
DEB_PATCH="1" |
145 |
#http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages |
146 |
MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}" |
147 |
MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb" |
148 |
SRC_URI="x86? ( ${MY_URL}/${MY_PKG} ) |
149 |
amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )" |
150 |
else |
151 |
MY_URL="http://dl.google.com/linux/direct" |
152 |
MY_PKG="${PN}_current_i386.deb" |
153 |
SRC_URI="" |
154 |
fi |
155 |
|
156 |
DESCRIPTION="Video chat browser plug-in for Google Talk" |
157 |
|
158 |
HOMEPAGE="http://www.google.com/chat/video" |
159 |
IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon" |
160 |
SLOT="0" |
161 |
|
162 |
KEYWORDS="-* ~amd64 ~x86" |
163 |
#GoogleTalkPlugin binary contains openssl |
164 |
LICENSE="google-talkplugin openssl" |
165 |
RESTRICT="strip mirror" |
166 |
|
167 |
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib ) |
168 |
dev-libs/glib:2 |
169 |
system-libCg? ( media-gfx/nvidia-cg-toolkit ) |
170 |
media-libs/fontconfig |
171 |
media-libs/freetype:2 |
172 |
media-libs/libpng:1.2 |
173 |
>=sys-libs/glibc-2.4 |
174 |
x11-libs/cairo |
175 |
x11-libs/gdk-pixbuf |
176 |
x11-libs/gtk+:2 |
177 |
x11-libs/libX11 |
178 |
x11-libs/libXcomposite |
179 |
x11-libs/libXfixes |
180 |
x11-libs/libXrandr |
181 |
x11-libs/libXrender |
182 |
x11-libs/libXt |
183 |
x11-libs/pango |
184 |
sys-apps/lsb-release |
185 |
virtual/opengl |
186 |
libnotify? ( x11-libs/libnotify )" |
187 |
|
188 |
DEPEND="" |
189 |
|
190 |
INSTALL_BASE="opt/google/talkplugin" |
191 |
|
192 |
QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin" |
193 |
|
194 |
QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so" |
195 |
|
196 |
QA_DT_HASH="${INSTALL_BASE}/libnpg.*so |
197 |
${INSTALL_BASE}/lib/libCg.*so |
198 |
${INSTALL_BASE}/GoogleTalkPlugin" |
199 |
|
200 |
S="${WORKDIR}" |
201 |
|
202 |
LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl |
203 |
sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or |
204 |
ro sr th ur" |
205 |
|
206 |
for X in ${LANGS} ; do |
207 |
IUSE="${IUSE} linguas_${X}" |
208 |
done |
209 |
|
210 |
# nofetch means upstream bumped and thus needs version bump |
211 |
pkg_nofetch() { |
212 |
einfo "This version is no longer available from Google." |
213 |
einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." |
214 |
einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)." |
215 |
} |
216 |
|
217 |
src_unpack() { |
218 |
local pkg="${A:=${MY_PKG}}" |
219 |
if [ "${PV}" = "9999" ]; then |
220 |
use amd64 && pkg="${pkg/i386/amd64}" |
221 |
einfo "Fetching ${pkg}" |
222 |
wget "${MY_URL}/${pkg}" || die |
223 |
fi |
224 |
unpacker ${pkg} |
225 |
} |
226 |
|
227 |
src_install() { |
228 |
unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz |
229 |
dodoc changelog.Debian |
230 |
|
231 |
exeinto "/${INSTALL_BASE}" |
232 |
doexe "${INSTALL_BASE}"/GoogleTalkPlugin |
233 |
for i in "${INSTALL_BASE}"/libnpg*.so; do |
234 |
doexe "${i}" |
235 |
inst_plugin "/${i}" |
236 |
done |
237 |
|
238 |
#install screen-sharing stuff - bug #397463 |
239 |
insinto "/${INSTALL_BASE}" |
240 |
doins "${INSTALL_BASE}"/windowpicker.glade |
241 |
|
242 |
strip-linguas ${LANGS} |
243 |
for l in ${LINGUAS}; do |
244 |
insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/ |
245 |
doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo |
246 |
done |
247 |
|
248 |
#install bundled libCg |
249 |
if use video_cards_radeon || use video_cards_fglrx; then |
250 |
#hack from #402401 |
251 |
exeinto "/${INSTALL_BASE}"/lib |
252 |
doexe "${INSTALL_BASE}"/lib/libCg*.so |
253 |
if use system-libCg; then |
254 |
ewarn "There seems to be a problem with ati cards and USE='-system-libCG," |
255 |
ewarn "so we install the bundled version of libCG anyway. (bug #402401)" |
256 |
fi |
257 |
echo "O3D_OVERRIDE_RENDER_MODE=2D" > "${ED}/opt/google/talkplugin/envvars" |
258 |
ewarn "We have set O3D_OVERRIDE_RENDER_MODE=2D in ${EROOT}opt/google/talkplugin/envvars" |
259 |
ewarn "please report your experience, good or bad, with this workaround on bug #402401" |
260 |
elif ! use system-libCg; then |
261 |
exeinto "/${INSTALL_BASE}"/lib |
262 |
doexe "${INSTALL_BASE}"/lib/libCg*.so |
263 |
fi |
264 |
} |