From 5fc7fdc95df494f50b8b3290199e2da081334f91 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 20 Jul 2012 20:45:56 +0000 Subject: version bump (Portage version: 2.2.0_alpha120/cvs/Linux i686) --- www-plugins/google-talkplugin/ChangeLog | 10 +- .../google-talkplugin-2.9.10.0.ebuild | 125 -------------------- .../google-talkplugin-3.1.4.0.ebuild | 13 ++- .../google-talkplugin-3.2.4.0.ebuild | 129 +++++++++++++++++++++ .../google-talkplugin-9999.ebuild | 25 ++-- 5 files changed, 161 insertions(+), 141 deletions(-) delete mode 100644 www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild create mode 100644 www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog index 055940c0827c..6b2c10be487b 100644 --- a/www-plugins/google-talkplugin/ChangeLog +++ b/www-plugins/google-talkplugin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-plugins/google-talkplugin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.29 2012/06/28 04:27:31 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.30 2012/07/20 20:45:56 ottxor Exp $ + +*google-talkplugin-3.2.4.0 (20 Jul 2012) + + 20 Jul 2012; Christoph Junghans + +google-talkplugin-3.2.4.0.ebuild, -google-talkplugin-2.9.10.0.ebuild, + google-talkplugin-3.1.4.0.ebuild, google-talkplugin-9999.ebuild: + version bump *google-talkplugin-3.1.4.0 (28 Jun 2012) @@ -151,4 +158,3 @@ 15 Feb 2011; Christoph Junghans +google-talkplugin-1.8.0.0.ebuild, +metadata.xml: Initial commit from cj-overlay (bug #333579) - diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild deleted file mode 100644 index 7e867247fda7..000000000000 --- a/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $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 $ - -EAPI=4 - -inherit eutils nsplugins unpacker - -if [ "${PV}" != "9999" ]; then - DEB_PATCH="1" - #http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages - MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}" - MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb" - SRC_URI="x86? ( ${MY_URL}/${MY_PKG} ) - amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )" -else - MY_URL="http://dl.google.com/linux/direct" - MY_PKG="${PN}_current_i386.deb" - SRC_URI="" -fi - -DESCRIPTION="Video chat browser plug-in for Google Talk" - -HOMEPAGE="http://www.google.com/chat/video" -IUSE="libnotify +system-libCg" -SLOT="0" - -KEYWORDS="-* ~amd64 ~x86" -#GoogleTalkPlugin binary contains openssl -LICENSE="google-talkplugin openssl" -RESTRICT="fetch strip" - -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 - media-libs/libpng:1.2 - >=sys-libs/glibc-2.4 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - sys-apps/lsb-release - virtual/opengl - libnotify? ( x11-libs/libnotify )" - -DEPEND="" - -INSTALL_BASE="opt/google/talkplugin" - -QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin" - -QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so" - -QA_DT_HASH="${INSTALL_BASE}/libnpg.*so - ${INSTALL_BASE}/GoogleTalkPlugin" - -S="${WORKDIR}" - -LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl -sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or -ro sr th ur" - -for X in ${LANGS} ; do - IUSE="${IUSE} linguas_${X}" -done - -# nofetch means upstream bumped and thus needs version bump -pkg_nofetch() { - elog "This version is no longer available from Google and the license prevents mirroring." - elog "This ebuild is intended for users who already downloaded it previously and have problems" - elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search" - use amd64 && MY_PKG="${MY_PKG/i386/amd64}" - elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}" - elog "and copy the file ${MY_PKG} to ${DISTDIR}." -} - -src_unpack() { - local pkg="${A:=${MY_PKG}}" - if [ "${PV}" = "9999" ]; then - use amd64 && pkg="${pkg/i386/amd64}" - einfo "Fetching ${pkg}" - wget "${MY_URL}/${pkg}" || die - fi - unpacker ${pkg} -} - -src_install() { - unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz - dodoc changelog.Debian - - exeinto "/${INSTALL_BASE}" - doexe "${INSTALL_BASE}"/GoogleTalkPlugin - for i in "${INSTALL_BASE}"/libnpg*.so; do - doexe "${i}" - inst_plugin "/${i}" - done - - #install screen-sharing stuff - bug #397463 - insinto "/${INSTALL_BASE}" - doins "${INSTALL_BASE}"/windowpicker.glade - - strip-linguas ${LANGS} - for l in ${LINGUAS}; do - insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/ - doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo - done - - #install bundled libCg - if ! use system-libCg; then - exeinto "/${INSTALL_BASE}"/lib - doexe "${INSTALL_BASE}"/lib/*.so - fi - - if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then - ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit" - ewarn "please report your experience, good or bad, on bug #402401" - fi -} diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild index 03831aac1a03..edb33bb74154 100644 --- a/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild +++ b/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild,v 1.2 2012/07/20 20:45:56 ottxor Exp $ EAPI=4 @@ -28,7 +28,7 @@ SLOT="0" KEYWORDS="-* ~amd64 ~x86" #GoogleTalkPlugin binary contains openssl LICENSE="google-talkplugin openssl" -RESTRICT="strip mirror" +RESTRICT="fetch strip" RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/glib:2 @@ -73,9 +73,12 @@ done # nofetch means upstream bumped and thus needs version bump pkg_nofetch() { - einfo "This version is no longer available from Google." - einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." - einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)." + elog "This version is no longer available from Google and the license prevents mirroring." + elog "This ebuild is intended for users who already downloaded it previously and have problems" + elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search" + use amd64 && MY_PKG="${MY_PKG/i386/amd64}" + elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}" + elog "and copy the file ${MY_PKG} to ${DISTDIR}." } src_unpack() { diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild new file mode 100644 index 000000000000..b30e3788d4e1 --- /dev/null +++ b/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $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 $ + +EAPI=4 + +inherit eutils nsplugins unpacker + +if [ "${PV}" != "9999" ]; then + DEB_PATCH="1" + #http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages + MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}" + MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb" + SRC_URI="x86? ( ${MY_URL}/${MY_PKG} ) + amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )" +else + MY_URL="http://dl.google.com/linux/direct" + MY_PKG="${PN}_current_i386.deb" + SRC_URI="" +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" +SLOT="0" + +KEYWORDS="-* ~amd64 ~x86" +#GoogleTalkPlugin binary contains openssl +LICENSE="google-talkplugin openssl" +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 + media-libs/libpng:1.2 + >=sys-libs/glibc-2.4 + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + sys-apps/lsb-release + virtual/opengl + libnotify? ( x11-libs/libnotify )" + +DEPEND="" + +INSTALL_BASE="opt/google/talkplugin" + +QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin" + +QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so" + +QA_DT_HASH="${INSTALL_BASE}/libnpg.*so + ${INSTALL_BASE}/lib/libCg.*so + ${INSTALL_BASE}/GoogleTalkPlugin" + +S="${WORKDIR}" + +LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl +sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or +ro sr th ur" + +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +# nofetch means upstream bumped and thus needs version bump +pkg_nofetch() { + einfo "This version is no longer available from Google." + einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." + einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)." +} + +src_unpack() { + local pkg="${A:=${MY_PKG}}" + if [ "${PV}" = "9999" ]; then + use amd64 && pkg="${pkg/i386/amd64}" + einfo "Fetching ${pkg}" + wget "${MY_URL}/${pkg}" || die + fi + unpacker ${pkg} +} + +src_install() { + unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz + dodoc changelog.Debian + + exeinto "/${INSTALL_BASE}" + doexe "${INSTALL_BASE}"/GoogleTalkPlugin + for i in "${INSTALL_BASE}"/libnpg*.so; do + doexe "${i}" + inst_plugin "/${i}" + done + + #install screen-sharing stuff - bug #397463 + insinto "/${INSTALL_BASE}" + doins "${INSTALL_BASE}"/windowpicker.glade + + strip-linguas ${LANGS} + for l in ${LINGUAS}; do + 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 ba781eb147d9..ac465591d122 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-2012 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.5 2012/06/28 04:27:31 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.6 2012/07/20 20:45:56 ottxor Exp $ EAPI=4 @@ -22,7 +22,7 @@ fi DESCRIPTION="Video chat browser plug-in for Google Talk" HOMEPAGE="http://www.google.com/chat/video" -IUSE="libnotify +system-libCg" +IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon" SLOT="0" KEYWORDS="-* ~amd64 ~x86" @@ -59,6 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin" QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so" QA_DT_HASH="${INSTALL_BASE}/libnpg.*so + ${INSTALL_BASE}/lib/libCg.*so ${INSTALL_BASE}/GoogleTalkPlugin" S="${WORKDIR}" @@ -110,13 +111,19 @@ src_install() { done #install bundled libCg - if ! use system-libCg; then + if use video_cards_radeon || use video_cards_fglrx; then + #hack from #402401 exeinto "/${INSTALL_BASE}"/lib - doexe "${INSTALL_BASE}"/lib/*.so - fi - - if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then - ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit" - ewarn "please report your experience, good or bad, on bug #402401" + 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 } -- cgit v1.2.3-65-gdbad