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