version bump

Package-Manager: portage-2.2.0_alpha76/cvs/Linux i686

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 0b177f05557a2e9154498ae1cd72c8eb6baaf082..947cacac8422af3a3353694d9d9e34f47c019ae2 100644 (file)
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/google-talkplugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.17 2011/11/16 03:12:59 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.18 2011/11/19 16:41:50 ottxor Exp $
+
+*google-talkplugin-2.5.6.0 (19 Nov 2011)
+
+  19 Nov 2011; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.4.5.0.ebuild, +google-talkplugin-2.5.6.0.ebuild:
+  Version bump
 
 *google-talkplugin-9999 (16 Nov 2011)
 

diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 0572f03d0f87f01170575e8533cedc26f31bf3ce..af9567014afbcaa622d387c52ad835a9eb187b68 100644 (file)
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -11,22 +11,25 @@ DIST google-talkplugin_2.3.2.0-1_amd64.deb 7728830 RMD160 6e6304f8b9f46655286ee9
 DIST google-talkplugin_2.3.2.0-1_i386.deb 6738522 RMD160 ec95ed1d31e42b3b08539a7fdbd0bc9af12382ef SHA1 fc77263ff5dd62264b82ef77acdc679d7d3977a7 SHA256 0cf9d284fae27642c47e6c9104c31b282a36eab9b3be3c118a04716ae9f6e1b1
 DIST google-talkplugin_2.4.5.0-1_amd64.deb 8025096 RMD160 a50cdee3b0ce413ef0a537db79af6ba907b60bea SHA1 75b023a68827173785d62611c39b7385856031e7 SHA256 b5c28d6dbc7ba970d9c8593dd6a0a881e5f50333ef04d7ed38cbb36f02fce866
 DIST google-talkplugin_2.4.5.0-1_i386.deb 7054316 RMD160 bf15a23a3b8b37bb0fe8eb99416727d58881686b SHA1 4186dbc074c1d798a1925d42b08af857ef391699 SHA256 e8c7c3098b544e37779370cd402f42aeba72c10bd5acadf31e18ece102823e1f
+DIST google-talkplugin_2.5.6.0-1_amd64.deb 11341592 RMD160 845691c6aa43d40c6048bc2d2d3c59a154a7b067 SHA1 484151f690ca6eee21cabe8eaeda24a7ab7a1b8b SHA256 bd1ade08d3ca4d89edb875214026c16fd3e66adbf52812095c267378cfd7aada
+DIST google-talkplugin_2.5.6.0-1_i386.deb 10371766 RMD160 2d80e799dcea89760bd0a9a68ad8deca84c60b71 SHA1 c382cfee89b5a33d15ea19762d10dc6bee77a9b9 SHA256 57834794d05dd03062bd5c2fa70cee40185a09ceb7480782a4d4473eaf0d7324
 EBUILD google-talkplugin-1.8.0.0.ebuild 3403 RMD160 ce25948087a2f734a8008df2a4638ab980317c9d SHA1 be60e2083e33a572c98e1f8fa35e4c3deb9f898f SHA256 5014209cc7c768a6839b3057a5da5fcdf795c8e0d1a293bb5dd7bf78902405c5
 EBUILD google-talkplugin-2.1.7.0.ebuild 3202 RMD160 a78183a9c39a4aac941610b1d8a6ec9dc446f347 SHA1 18b54c7bb06c0ffefef6c828dbfc5d9f7e929aea SHA256 2650134aeefec1093b0eb71e4c5bab650d30b871f36e21c5e0d1047e26c3daf7
 EBUILD google-talkplugin-2.2.2.0.ebuild 3189 RMD160 55d9710561aea816722c3df87b7e125fecc83cc2 SHA1 616d4d8b77921f359b2d9285248edc5cee2dffd2 SHA256 2faa248234cec3b41e17f9321fba84b172aaedbd2a08f445295f57b1eef923dd
 EBUILD google-talkplugin-2.3.2.0.ebuild 3249 RMD160 4c53d6004880d33d373b1064c6c4e67301b36406 SHA1 60e2d54648e5300b09848c9ef2aaf9efb0f9a66b SHA256 b0f618154f4f507afc1f728b6c1297154c5e69dcf174049c7e377d93c233c81b
-EBUILD google-talkplugin-2.4.5.0.ebuild 3009 RMD160 5ac2d139b1ed61adfe0650f812e275854f22f98c SHA1 3f83d18284e245431636cea82195b4bdefca67cf SHA256 f9cea5a10f394fab361238d9acf369fec3fe93bce8491ee5bd8745f39b1e52a4
+EBUILD google-talkplugin-2.4.5.0.ebuild 3202 RMD160 4c70f5803c9125077ddf8e4670cb1699fe9a21c7 SHA1 ae7008e067b71b9aa8ff08fe886366637d048c4f SHA256 e5d80978da40b1ee1f6b56107b4de3590281c2fcf9dc9a69797f1d770de29bea
+EBUILD google-talkplugin-2.5.6.0.ebuild 3009 RMD160 41332fd98f8887fc049e8877e066d0a20e7dad23 SHA1 31c8702249a2663796d6fa5e760c390b7e645348 SHA256 f4244e4ea80a826659891e0cd2da2533e8926e63281748d8e5798e7f5dbf16ce
 EBUILD google-talkplugin-9999.ebuild 3006 RMD160 e8228e70939d1b80cdcac691c0a500295661fd19 SHA1 80722b8303c8d6df9846f2b9afd2a5ff48ae9920 SHA256 60970c2ed2479fb09e19bc862b637ef9d1b1d8395aa75a98bbeed586d67b5c80
-MISC ChangeLog 2805 RMD160 c0024312b543c6cd454846116c120d2baba6b36d SHA1 94df84600deef5028286d2d8074aef2a21dded5e SHA256 0ff0700a05ba45045e11fbd90dc85e1595e3cf402a775483122d356160df0118
+MISC ChangeLog 2988 RMD160 abf0542b13945d0f8e8c8f513a7ae0ea05e209c8 SHA1 78d5e8a3dabf53f9bff06832ffc74cbd79325284 SHA256 782506cd5b3ae6ac676b2ce896123b824f77d3279bc7d1b3b71dd19fb17cba2d
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOwypBAAoJEOeBhlrCAAWGMfUH/iH+dgHYnVqJy+LomVCasVeo
-JIshQjho4RM2bruRti4OzP/NgJg6gaovulb/J8czTF6EcEC/peiMypXSgNoGXt8E
-K38CAD/BHB3j+Ul6vbm2k3WZsAgD6eg8vNB8v5GaA8q2sJ4a8HPerZnatw2L7/Sy
-Gmr0sURJNUIISTomGRRs4oagpEPJgUgt6HWYZ8oWY/fEQZOlaLzvamQDLqzA2M8X
-re0e9R7fkhg/R91JBEm5fxC6ny7plaoggN32/mD+BLuBfpc5w97OUIsdmD7WokYJ
-ifNlrOFzfrnGZUjfnIMZ0pGjTYN1mleCAttaKoJJOi68XBJwa10dKhKK7Cj4HIA=
-=FvdQ
+iQEcBAEBAgAGBQJOx9xUAAoJEOeBhlrCAAWGSS8H/R8N9KNYdoXE2KTPK5dnTnPz
+j4caOYvgQzuMsaiKOPk72+uGDYXN9u+vnkluGCoL1VQvZ41Jv7G3IZs7zMAkfdzR
+vjTEapH30cL4bQ5TBvfcAD3jr7KF7bgJG5Pp7s/y/A9lG9mXkwC3bIqF2p7uZvoZ
+9xUw7j5hYTRhQQ5M5RBx+vKXy2uiwPg6gcl1CU6kWC/9QtN6hhNepdRUGILbq2/l
+YlWu1UR3f4s3uB/6dgMxMwWJrARN/Jh/ME0LV8wHKkmPm1M71VVeQ9Tci4QGpljP
+6dLlyNEMOo3+DQae07LlGV0VFUwIx/LR/XGrPOz5aJwOMMkxPlCFLwoqp2EaH6s=
+=TnI4
 -----END PGP SIGNATURE-----

diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild
index b18b42cdc5794d0f21e8866505914781f0ac92b3..a5f348f6478c2ad781bcf24b7a58169b9396aa54 100644 (file)
--- a/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4.5.0.ebuild,v 1.1 2011/11/16 02:42:04 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild,v 1.2 2011/11/19 16:41:50 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"
 
 NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib )
        dev-libs/glib:2
@@ -74,9 +74,12 @@ S="${WORKDIR}"
 
 # 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-2.5.6.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0.ebuild
new file mode 100644 (file)
index 0000000..1e3544d
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 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.5.6.0.ebuild,v 1.1 2011/11/19 16:41:50 ottxor Exp $
+
+EAPI=4
+
+inherit nsplugins
+
+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="strip mirror"
+
+NATIVE_DEPS="|| ( 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=""
+
+EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220
+       app-emulation/emul-linux-x86-gtklibs
+       app-emulation/emul-linux-x86-soundlibs
+       app-emulation/emul-linux-x86-xlibs"
+
+#amd64 needs EMUL_DEPS as GoogleTalkPlugin is a 32-bit binary
+RDEPEND="x86? ( ${NATIVE_DEPS} )
+       amd64? ( ${NATIVE_DEPS} ${EMUL_DEPS} )"
+
+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}"
+
+# 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() {
+       if [ "${PV}" != "9999" ]; then
+               unpack ${A}
+       else
+               local pkg="${MY_PKG}"
+               use amd64 && pkg="${pkg/i386/amd64}"
+               einfo "Fetching ${pkg}"
+               wget "${MY_URL}/${pkg}" || die
+               unpack ./"${pkg}"
+       fi
+       unpack ./data.tar.gz
+}
+
+src_install() {
+       #workaround for bug #376741
+       cd usr/share/doc/google-talkplugin || die
+       unpack ./changelog.Debian.gz
+       dodoc changelog.Debian
+       cd -
+
+       exeinto "/${INSTALL_BASE}"
+       doexe "${INSTALL_BASE}"/GoogleTalkPlugin
+       for i in "${INSTALL_BASE}"/libnpg*.so; do
+               doexe "${i}"
+               inst_plugin "/${i}"
+       done
+
+       #install bundled libCg
+       if ! use system-libCg; then
+               exeinto "/${INSTALL_BASE}"/lib
+               doexe "${INSTALL_BASE}"/lib/*.so
+       fi
+}