ottxor 14/04/03 15:12:37 Modified: google-talkplugin-9999.ebuild google-talkplugin-5.2.4.0.ebuild ChangeLog Log: drop system-libCg use flag (bug #506574#c2) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.18 www-plugins/google-talkplugin/google-talkplugin-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild?r1=1.17&r2=1.18 Index: google-talkplugin-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- google-talkplugin-9999.ebuild 4 Sep 2013 14:44:34 -0000 1.17 +++ google-talkplugin-9999.ebuild 3 Apr 2014 15:12:37 -0000 1.18 @@ -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 @@ 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 @@ 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 @@ 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 } 1.2 www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild?r1=1.1&r2=1.2 Index: google-talkplugin-5.2.4.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- google-talkplugin-5.2.4.0.ebuild 3 Apr 2014 14:36:52 -0000 1.1 +++ google-talkplugin-5.2.4.0.ebuild 3 Apr 2014 15:12:37 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ 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 } 1.73 www-plugins/google-talkplugin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.73&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?rev=1.73&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/google-talkplugin/ChangeLog?r1=1.72&r2=1.73 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- ChangeLog 3 Apr 2014 14:39:27 -0000 1.72 +++ ChangeLog 3 Apr 2014 15:12:37 -0000 1.73 @@ -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 <ott...@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 <ott...@gentoo.org> -google-talkplugin-4.7.0.0.ebuild, -google-talkplugin-4.8.3.0.ebuild,