summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-04-03 15:12:44 +0000
committerChristoph Junghans <ottxor@gentoo.org>2014-04-03 15:12:44 +0000
commit39f4d64b3397fad532ef45361a7038e3284e95dc (patch)
tree547d3bcf0c57f0552b939cb6af8f6c25d81833d9 /www-plugins
parentversion bump (diff)
downloadhistorical-39f4d64b3397fad532ef45361a7038e3284e95dc.tar.gz
historical-39f4d64b3397fad532ef45361a7038e3284e95dc.tar.bz2
historical-39f4d64b3397fad532ef45361a7038e3284e95dc.zip
drop system-libCg use flag (bug #506574#c2)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/google-talkplugin/ChangeLog6
-rw-r--r--www-plugins/google-talkplugin/Manifest20
-rw-r--r--www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild28
-rw-r--r--www-plugins/google-talkplugin/google-talkplugin-9999.ebuild30
4 files changed, 22 insertions, 62 deletions
diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 8e53e67ff942..5ca6a6e23df7 100644
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-plugins/google-talkplugin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.72 2014/04/03 14:39:27 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.73 2014/04/03 15:12:37 ottxor Exp $
+
+ 03 Apr 2014; Christoph Junghans <ottxor@gentoo.org>
+ google-talkplugin-5.2.4.0.ebuild, google-talkplugin-9999.ebuild:
+ drop system-libCg use flag (bug #506574#c2)
03 Apr 2014; Christoph Junghans <ottxor@gentoo.org>
-google-talkplugin-4.7.0.0.ebuild, -google-talkplugin-4.8.3.0.ebuild,
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 88d8971da1d6..319a2134d09c 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -9,18 +9,18 @@ DIST google-talkplugin_5.2.4.0-1_amd64.deb 7639118 SHA256 b4f35588663cb11edcf9b7
DIST google-talkplugin_5.2.4.0-1_i386.deb 6864640 SHA256 5ea418a29a426c9df92c6876cac8b52fd9cbde9bf56541ed9079af48b16ad7d0 SHA512 3102c2354b4e04fbfae4b8fd999dc6a1f00244de769140b2d31786279eac16af79eb70f7e56d999d556d2439fb17b6051315eee0ed367d27977bd3d2c796898c WHIRLPOOL fd03a6da252b8a6a4ad51e894f23aa078e77a101fe7c9b6fb6df5fb7cd64b2f534d6afc248f6a80c0c75cca3ff7cac934b28c6068bde6332b24ffc851429c8bb
EBUILD google-talkplugin-4.4.2.0.ebuild 4386 SHA256 2bb208df8faccb99bc1e4953a8bf687d616409120a76ab42149a6c6a1e1bf630 SHA512 bcefe7c2c4dd543b86a8bf56085b203d39825de015c0baad4c31e68093f83d1e5da7b42cce2bfc9d66d3c5bf2a8360aae12c278d8eb3a905301f41831426a680 WHIRLPOOL 3ea924a41a037814028684a52d29338fa560d3881b4a17e354c58b3137996facc7065a3de2ea1ccb8cf781640087d7e4857524d5ae0377b041f0fdf4af88af2d
EBUILD google-talkplugin-5.1.5.0.ebuild 4391 SHA256 c4cc33b9d8f732926be71d508771f1d0a33f296de4eb8adeaf14ca1196f5d6bf SHA512 7062de4a0982b43e6f5b581ba113742c958d9dde03cf34750703fa99218b5d3d8492cf5977bc4e1d29aad31ec3965c075784649cfb0511ee725d2cd6f2c1f446 WHIRLPOOL aec24b78a1151fc8c8d0bb265f266dfbdc32c330f07571c0fff188fec290edef67a31cf2bb9801edaab05765f15f724891d57aac9c6095af629f1ddd1499adda
-EBUILD google-talkplugin-5.2.4.0.ebuild 4390 SHA256 af411238d6fae6114d45f50b16777d95fc6626e7b888fe90de8d88dad008530f SHA512 2576944943436105d3e6cd4563472925503f6867b49bf1337228bc47dc845c328cfbf3ffeb83844bebd94dcf2109ae073b83d7d9e963a2cae1c22569d597ef26 WHIRLPOOL 8ed182f531c8642cb792185894876aa386917dc27f579f162aa5584119df68dfab3397851c4ca6492ba3d7eae8d797de7a0107a25c40a07c299bf83801140ac0
-EBUILD google-talkplugin-9999.ebuild 4388 SHA256 3c1cd9ee31b0edc4038a9ccf2a14e021646022311431372489c8a26c657c513f SHA512 8429dc2b0c4a35a21a4da0e60c20b1aac7fa5c2947b34375584796d9a973a84a064a20bd72ded5c469340945bcc3d6309492a4b96f196eb9238425724190a9cb WHIRLPOOL afb60a1955b9bc27848c48eb783a47f6d1c00d19e9e7a574736937e3b829597fb5f4380ecb96beb20c68a0eae6b13c4339be675bfb1a0b976098a58ed61c8d53
-MISC ChangeLog 13721 SHA256 82bbca63d3d0c5a2b1065d302ba568e6c6e4ed1ed0cda75d1c74f261503d6926 SHA512 250a13a88bc11889f87f69633a2e43e8a15a8375d36135294bfafb6941e78649d17b9a09425deca55087c83c87b446152524f5fc3f3cd7065050238223683442 WHIRLPOOL 180d07ed2a8765030ea6a0b02f1745c40cec55ce6e6d5fe98c06b3decb7bf80f5cc9a0e5dfee5627bf375ee260b6411bc18e7271a9de6c38392ed635bd97f07f
+EBUILD google-talkplugin-5.2.4.0.ebuild 3457 SHA256 d90c6e362d4dfa6d016b7e41f9b8331dc88505c82884e669345e428b6aa1bbb2 SHA512 01b0bf051eb8202d68a73c0af9896087532961434ee66aee3043d0f953aadd2d7355a74d4880f2a73c3785bcabdd7136599634ff473abf2e3ec8d9ebedc75cda WHIRLPOOL f9557cf844cbe3d18c071f18577bc725f364ace3f68d9b547a7cfe2ce82fec5d4be2e445e825acb3557d632e1bcb32d98075ce0575907916adeb97c5f7a35c69
+EBUILD google-talkplugin-9999.ebuild 3455 SHA256 a6b0cde6c7e0aded155725aab49b2332f37a6635a5b653b796e22e0a05c794a1 SHA512 2a5db92af5bca7dce28d17a6baebc19dd32d48ac6d423533c4563b61f4ed7f7a82c03dbc91eeeca81ae07a76910e73b9506501f1858f58ecb47aa9e0bb3a70bb WHIRLPOOL 993c657ae38070154fc1333885696823b328597140e2e29c0b28fd91241733a38fb26bb787c5248185357d88ec41e717c5a475be97607068d98076218e361ae7
+MISC ChangeLog 13889 SHA256 d8bc3f36b053202931043652f45a1efed0edb9f531afcede14f3a6327d9593ac SHA512 46f348dc443564d6f6bc3a28ea5ae1a36cdd3e1721bd128835b0c1608e1a82e9fa64779146b6542fb0ee8c0abeb523e6b34c4a43777430c5dcc31e9a0d458dd3 WHIRLPOOL edfcce77bd7bed5b083361be687dd0ea81be6d8ba5f8f0090dba4ae429286f375e88805ae6b66a22bcc38693ebd72f643b654aca59327c20123c0ed0ba8e2ba2
MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTPXKgAAoJEOeBhlrCAAWGAJMH/jZUykZI0flWCfmByhshuFJD
-XV9sdOoFaa03Us5Q1Rmif13JtPKGZeHW2rjGqbGz3qmiYZ96tB5WJ3gwd0vyidbY
-PufuNdOcjlWSi+h1KbxhGOtmSh8WB7OSZL76x8dqZmoNQPyE/mtclaCIm+PAL4hr
-/33rcdrC4lYoseXgDKVfFx3WJmo4Q03xLn4BYXTA2OopqSE+/OVlLGZHzbtzGlxm
-9VCLc0imDwHYMNZ1dRukxhyA7Tul9HiO4/hr8nxlLCoaYPMKe1q0GF+GJzFjNg3p
-nUpZs9pRIbSXtsPjGBe4rO67OvoNovn6S/G5vzvL1vOenm33pNB8MqhdXilUn9w=
-=x8Ot
+iQEcBAEBCAAGBQJTPXpnAAoJEOeBhlrCAAWGI3YIAK7N0GGqNxa9AXTWmtVycRZC
+ZD3vFOKfIk8qyPndVKzC5FzSOU1nJ14rCdDsthb85bN9ReI5+QzZGo0iTexSaQoD
+j1kAYFkyvrMhkuTeb+XuWy9hL0C3jwp0K93DD4EtAMPg0KB6tDPA7pM2tqYfZ5Nb
+RAau4WNuy9dCls76MVRLSuV1ChrAFcCV0poIpP+sZ8vTgepxy3CZ1HCJjbatkxdH
+6WM0VAC4sYh9VS6WdwiQuNWoye3AmNd9ba2bHFmUfbpJfqQoV+riNSPXFabMKZk2
+Za9/Z5h5QaANNu5hodZqzVJVJvbmUkAQxUJr5OzE2DHH/a/ih/4gg3rF2Jq0fkk=
+=cke7
-----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
index 5782097a9445..82022611e286 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild,v 1.1 2014/04/03 14:36:52 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild,v 1.2 2014/04/03 15:12:37 ottxor Exp $
EAPI=5
@@ -23,21 +23,18 @@ fi
DESCRIPTION="Video chat browser plug-in for Google Talk"
HOMEPAGE="http://www.google.com/chat/video"
-IUSE="libnotify system-libCg video_cards_fglrx video_cards_radeon"
+IUSE="libnotify"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
#GoogleTalkPlugin binary contains openssl and celt
-LICENSE="Google-TOS openssl BSD system-libCg? ( NVIDIA-r1 )"
+LICENSE="Google-TOS openssl BSD"
OBSOLETE="no"
[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
dev-libs/glib:2
- system-libCg? ( media-gfx/nvidia-cg-toolkit )
- media-libs/fontconfig
- media-libs/freetype:2
sys-libs/glibc
x11-libs/cairo
x11-libs/gdk-pixbuf
@@ -47,10 +44,8 @@ RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXrender
- x11-libs/libXt
x11-libs/pango
sys-apps/lsb-release
- virtual/opengl
libnotify? ( x11-libs/libnotify )"
DEPEND=""
@@ -117,21 +112,4 @@ src_install() {
insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/
doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo
done
-
- #install bundled libCg
- if use video_cards_radeon || use video_cards_fglrx; then
- #hack from #402401
- exeinto "/${INSTALL_BASE}"/lib
- doexe "${INSTALL_BASE}"/lib/libCg*.so
- if use system-libCg; then
- ewarn "There seems to be a problem with ati cards and USE='-system-libCG,"
- ewarn "so we install the bundled version of libCG anyway. (bug #402401)"
- fi
- echo "O3D_OVERRIDE_RENDER_MODE=2D" > "${ED}/opt/google/talkplugin/envvars"
- ewarn "We have set O3D_OVERRIDE_RENDER_MODE=2D in ${EROOT}opt/google/talkplugin/envvars"
- ewarn "please report your experience, good or bad, with this workaround on bug #402401"
- elif ! use system-libCg; then
- exeinto "/${INSTALL_BASE}"/lib
- doexe "${INSTALL_BASE}"/lib/libCg*.so
- fi
}
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index 7ffa32446615..be4688bae84e 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.17 2013/09/04 14:44:34 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.18 2014/04/03 15:12:37 ottxor Exp $
EAPI=5
@@ -23,21 +23,18 @@ fi
DESCRIPTION="Video chat browser plug-in for Google Talk"
HOMEPAGE="http://www.google.com/chat/video"
-IUSE="libnotify system-libCg video_cards_fglrx video_cards_radeon"
+IUSE="libnotify"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
#GoogleTalkPlugin binary contains openssl and celt
-LICENSE="Google-TOS openssl BSD system-libCg? ( NVIDIA-r1 )"
+LICENSE="Google-TOS openssl BSD"
OBSOLETE="no"
[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
dev-libs/glib:2
- system-libCg? ( media-gfx/nvidia-cg-toolkit )
- media-libs/fontconfig
- media-libs/freetype:2
sys-libs/glibc
x11-libs/cairo
x11-libs/gdk-pixbuf
@@ -47,10 +44,8 @@ RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXrender
- x11-libs/libXt
x11-libs/pango
sys-apps/lsb-release
- virtual/opengl
libnotify? ( x11-libs/libnotify )"
DEPEND=""
@@ -117,21 +112,4 @@ src_install() {
insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/
doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo
done
-
- #install bundled libCg
- if use video_cards_radeon || use video_cards_fglrx; then
- #hack from #402401
- exeinto "/${INSTALL_BASE}"/lib
- doexe "${INSTALL_BASE}"/lib/libCg*.so
- if use system-libCg; then
- ewarn "There seems to be a problem with ati cards and USE='-system-libCG,"
- ewarn "so we install the bundled version of libCG anyway. (bug #402401)"
- fi
- echo "O3D_OVERRIDE_RENDER_MODE=2D" > "${ED}/opt/google/talkplugin/envvars"
- ewarn "We have set O3D_OVERRIDE_RENDER_MODE=2D in ${EROOT}opt/google/talkplugin/envvars"
- ewarn "please report your experience, good or bad, with this workaround on bug #402401"
- elif ! use system-libCg; then
- exeinto "/${INSTALL_BASE}"/lib
- doexe "${INSTALL_BASE}"/lib/libCg*.so
- fi
}