1 |
ottxor 12/06/28 04:27:31 |
2 |
|
3 |
Modified: ChangeLog google-talkplugin-2.9.10.0.ebuild |
4 |
google-talkplugin-9999.ebuild |
5 |
Added: google-talkplugin-3.1.4.0.ebuild |
6 |
Removed: google-talkplugin-2.8.5.0.ebuild |
7 |
Log: |
8 |
version bump (bug #423905) |
9 |
|
10 |
(Portage version: 2.2.0_alpha113/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.29 www-plugins/google-talkplugin/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.29&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.29&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?r1=1.28&r2=1.29 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v |
22 |
retrieving revision 1.28 |
23 |
retrieving revision 1.29 |
24 |
diff -u -r1.28 -r1.29 |
25 |
--- ChangeLog 25 May 2012 17:22:32 -0000 1.28 |
26 |
+++ ChangeLog 28 Jun 2012 04:27:31 -0000 1.29 |
27 |
@@ -1,6 +1,13 @@ |
28 |
# ChangeLog for www-plugins/google-talkplugin |
29 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.28 2012/05/25 17:22:32 ottxor Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.29 2012/06/28 04:27:31 ottxor Exp $ |
32 |
+ |
33 |
+*google-talkplugin-3.1.4.0 (28 Jun 2012) |
34 |
+ |
35 |
+ 28 Jun 2012; Christoph Junghans <ottxor@g.o> |
36 |
+ -google-talkplugin-2.8.5.0.ebuild, google-talkplugin-2.9.10.0.ebuild, |
37 |
+ +google-talkplugin-3.1.4.0.ebuild, google-talkplugin-9999.ebuild: |
38 |
+ version bump (bug #423905) |
39 |
|
40 |
*google-talkplugin-2.9.10.0 (25 May 2012) |
41 |
|
42 |
|
43 |
|
44 |
|
45 |
1.2 www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild?rev=1.2&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild?rev=1.2&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild?r1=1.1&r2=1.2 |
50 |
|
51 |
Index: google-talkplugin-2.9.10.0.ebuild |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild,v |
54 |
retrieving revision 1.1 |
55 |
retrieving revision 1.2 |
56 |
diff -u -r1.1 -r1.2 |
57 |
--- google-talkplugin-2.9.10.0.ebuild 25 May 2012 17:22:32 -0000 1.1 |
58 |
+++ google-talkplugin-2.9.10.0.ebuild 28 Jun 2012 04:27:31 -0000 1.2 |
59 |
@@ -1,6 +1,6 @@ |
60 |
# Copyright 1999-2012 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild,v 1.1 2012/05/25 17:22:32 ottxor Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild,v 1.2 2012/06/28 04:27:31 ottxor Exp $ |
64 |
|
65 |
EAPI=4 |
66 |
|
67 |
@@ -28,7 +28,7 @@ |
68 |
KEYWORDS="-* ~amd64 ~x86" |
69 |
#GoogleTalkPlugin binary contains openssl |
70 |
LICENSE="google-talkplugin openssl" |
71 |
-RESTRICT="strip mirror" |
72 |
+RESTRICT="fetch strip" |
73 |
|
74 |
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib ) |
75 |
dev-libs/glib:2 |
76 |
@@ -73,9 +73,12 @@ |
77 |
|
78 |
# nofetch means upstream bumped and thus needs version bump |
79 |
pkg_nofetch() { |
80 |
- einfo "This version is no longer available from Google." |
81 |
- einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." |
82 |
- einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)." |
83 |
+ elog "This version is no longer available from Google and the license prevents mirroring." |
84 |
+ elog "This ebuild is intended for users who already downloaded it previously and have problems" |
85 |
+ elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search" |
86 |
+ use amd64 && MY_PKG="${MY_PKG/i386/amd64}" |
87 |
+ elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}" |
88 |
+ elog "and copy the file ${MY_PKG} to ${DISTDIR}." |
89 |
} |
90 |
|
91 |
src_unpack() { |
92 |
|
93 |
|
94 |
|
95 |
1.5 www-plugins/google-talkplugin/google-talkplugin-9999.ebuild |
96 |
|
97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.5&view=markup |
98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.5&content-type=text/plain |
99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?r1=1.4&r2=1.5 |
100 |
|
101 |
Index: google-talkplugin-9999.ebuild |
102 |
=================================================================== |
103 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v |
104 |
retrieving revision 1.4 |
105 |
retrieving revision 1.5 |
106 |
diff -u -r1.4 -r1.5 |
107 |
--- google-talkplugin-9999.ebuild 5 Apr 2012 14:50:33 -0000 1.4 |
108 |
+++ google-talkplugin-9999.ebuild 28 Jun 2012 04:27:31 -0000 1.5 |
109 |
@@ -1,6 +1,6 @@ |
110 |
# Copyright 1999-2012 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.4 2012/04/05 14:50:33 ottxor Exp $ |
113 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.5 2012/06/28 04:27:31 ottxor Exp $ |
114 |
|
115 |
EAPI=4 |
116 |
|
117 |
@@ -114,4 +114,9 @@ |
118 |
exeinto "/${INSTALL_BASE}"/lib |
119 |
doexe "${INSTALL_BASE}"/lib/*.so |
120 |
fi |
121 |
+ |
122 |
+ if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then |
123 |
+ ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit" |
124 |
+ ewarn "please report your experience, good or bad, on bug #402401" |
125 |
+ fi |
126 |
} |
127 |
|
128 |
|
129 |
|
130 |
1.1 www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild |
131 |
|
132 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild?rev=1.1&view=markup |
133 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild?rev=1.1&content-type=text/plain |
134 |
|
135 |
Index: google-talkplugin-3.1.4.0.ebuild |
136 |
=================================================================== |
137 |
# Copyright 1999-2012 Gentoo Foundation |
138 |
# Distributed under the terms of the GNU General Public License v2 |
139 |
# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild,v 1.1 2012/06/28 04:27:31 ottxor Exp $ |
140 |
|
141 |
EAPI=4 |
142 |
|
143 |
inherit eutils nsplugins unpacker |
144 |
|
145 |
if [ "${PV}" != "9999" ]; then |
146 |
DEB_PATCH="1" |
147 |
#http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages |
148 |
MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}" |
149 |
MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb" |
150 |
SRC_URI="x86? ( ${MY_URL}/${MY_PKG} ) |
151 |
amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )" |
152 |
else |
153 |
MY_URL="http://dl.google.com/linux/direct" |
154 |
MY_PKG="${PN}_current_i386.deb" |
155 |
SRC_URI="" |
156 |
fi |
157 |
|
158 |
DESCRIPTION="Video chat browser plug-in for Google Talk" |
159 |
|
160 |
HOMEPAGE="http://www.google.com/chat/video" |
161 |
IUSE="libnotify +system-libCg" |
162 |
SLOT="0" |
163 |
|
164 |
KEYWORDS="-* ~amd64 ~x86" |
165 |
#GoogleTalkPlugin binary contains openssl |
166 |
LICENSE="google-talkplugin openssl" |
167 |
RESTRICT="strip mirror" |
168 |
|
169 |
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib ) |
170 |
dev-libs/glib:2 |
171 |
system-libCg? ( media-gfx/nvidia-cg-toolkit ) |
172 |
media-libs/fontconfig |
173 |
media-libs/freetype:2 |
174 |
media-libs/libpng:1.2 |
175 |
>=sys-libs/glibc-2.4 |
176 |
x11-libs/cairo |
177 |
x11-libs/gdk-pixbuf |
178 |
x11-libs/gtk+:2 |
179 |
x11-libs/libX11 |
180 |
x11-libs/libXcomposite |
181 |
x11-libs/libXfixes |
182 |
x11-libs/libXrandr |
183 |
x11-libs/libXrender |
184 |
x11-libs/libXt |
185 |
sys-apps/lsb-release |
186 |
virtual/opengl |
187 |
libnotify? ( x11-libs/libnotify )" |
188 |
|
189 |
DEPEND="" |
190 |
|
191 |
INSTALL_BASE="opt/google/talkplugin" |
192 |
|
193 |
QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin" |
194 |
|
195 |
QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so" |
196 |
|
197 |
QA_DT_HASH="${INSTALL_BASE}/libnpg.*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 system-libCg; then |
250 |
exeinto "/${INSTALL_BASE}"/lib |
251 |
doexe "${INSTALL_BASE}"/lib/*.so |
252 |
fi |
253 |
|
254 |
if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then |
255 |
ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit" |
256 |
ewarn "please report your experience, good or bad, on bug #402401" |
257 |
fi |
258 |
} |