From 557feacb8b3f1b4e392b9086af008afe4600aab1 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Wed, 16 Feb 2011 10:36:55 +0000 Subject: [PATCH] google-talkplugin: synced with cj-overlay --- www-plugins/google-talkplugin/Manifest | 7 +- .../google-talkplugin-1.7.1.0.ebuild | 235 ------------------ .../google-talkplugin-1.8.0.0.ebuild | 35 ++- 3 files changed, 23 insertions(+), 254 deletions(-) delete mode 100644 www-plugins/google-talkplugin/google-talkplugin-1.7.1.0.ebuild diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest index 18a175b78..5cbfb6dc8 100644 --- a/www-plugins/google-talkplugin/Manifest +++ b/www-plugins/google-talkplugin/Manifest @@ -1,8 +1,3 @@ -DIST google-talkplugin-1.7.1.0-1.i386.rpm 6197255 RMD160 8b844436077ba8c73908f53aa25d6cb2c0c5c106 SHA1 b9b6de90a750673c21cf0bfec0dae9ef00cb28bd SHA256 19800dc5a9b64997afc75d658d71263d238d76b6a7264effd4c7d93d923f8e21 -DIST google-talkplugin-1.7.1.0-1.x86_64.rpm 7190356 RMD160 113c8acfad966de9f9334fd4a40beb1c32f18cf2 SHA1 c8182e99f8196d392c88ab781a7c17084ef9bd79 SHA256 8ff73489429fe721e3d5bef5b5992c51141a8f449466bc9783c36a111fc09d29 -DIST google-talkplugin_1.7.1.0-1_amd64.deb 7227392 RMD160 9fa135c92e7026b8066990722b4e3da2f0b64fbe SHA1 2af308e8c7abf6d2e19a7e675df2ee70e6f76357 SHA256 83c6ed667e43dd58d4a453cc0949b3b18ca34b2b0b92340a00161e9e8720f952 -DIST google-talkplugin_1.7.1.0-1_i386.deb 6217084 RMD160 3c22d014bc813df55a82be75a1be40cd6ed267c0 SHA1 29fc3b1787ce8f937522c249d321b300da0a0131 SHA256 a0c3476484dcf64fc199b61ecffb49aea586a1bcdc603a6d1e45ef2adf654f41 DIST google-talkplugin_1.8.0.0-1_amd64.deb 7315012 RMD160 5d45807b7848e50244dd35fa8a0c8b66287af9b0 SHA1 a70053aa28468475838728bf52867ed68c9a6c66 SHA256 506707b75d6f29cd66318689cd1a9b7162c22e95b1bed82e6407a1c6b6efa39f DIST google-talkplugin_1.8.0.0-1_i386.deb 6304798 RMD160 7dfc10989f4ffed819f40b175b1949281691ad85 SHA1 582c029d03aa72d3e470c131ca9637aa7394071e SHA256 87bf5f08a38c44ea4891f4190b4221da24bbec4577eb3d6f1ea4c96bc9b9b55b -EBUILD google-talkplugin-1.7.1.0.ebuild 6478 RMD160 a80c5a017cd2fd6972e6d99db15292793b444b85 SHA1 31774c1112f41605e83b043fb3c3f73c1b4dd330 SHA256 3be826e98e186d740f790eead9a84a78b86241e6e25848f5efbb1b103b2495a8 -EBUILD google-talkplugin-1.8.0.0.ebuild 2443 RMD160 70101ca1f744d7535a558a95e1a9b3c1c64cfdcb SHA1 a42b6c481e56d0d1c417becd4b08e79a24d3983c SHA256 decf83f2de9502717981e580911b972ce530d3facd813dbed17ed9c5e0c86fb1 +EBUILD google-talkplugin-1.8.0.0.ebuild 2895 RMD160 68b0f87954cf0f1ce75b5181b4f35f9bddbdc9c3 SHA1 dc350d64a7d393c70a909a2fcf476e0f957b14f9 SHA256 8944462df5ef5544616d9e80cf46af37525a2229516c31fbb2b40940b1c8ccbd diff --git a/www-plugins/google-talkplugin/google-talkplugin-1.7.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-1.7.1.0.ebuild deleted file mode 100644 index a92fc051c..000000000 --- a/www-plugins/google-talkplugin/google-talkplugin-1.7.1.0.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit multilib nsplugins rpm - -if [ "${PV}" != "9999" ]; then - #http://dl.google.com/linux/talkplugin/rpm/stable/x86_64/repodata/other.xml.gz - RPM_URL="http://dl.google.com/linux/talkplugin/rpm/stable/i386" - RPM_PATCH="1" - RPM_32B_PKG="${P}-${RPM_PATCH}.i386.rpm" - RPM_64B_PKG="${P}-${RPM_PATCH}.x86_64.rpm" - #http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages - DEB_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}" - DEB_PATCH="1" - DEB_32B_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb" - DEB_64B_PKG="${PN}_${PV}-${DEB_PATCH}_amd64.deb" -else - DEB_URL="http://dl.google.com/linux/direct" - RPM_URL="http://dl.google.com/linux/direct" - RPM_32B_PKG="${PN}_current_i386.rpm" - RPM_64B_PKG="${PN}_current_x86_64.rpm" - DEB_32B_PKG="${PN}_current_i386.deb" - DEB_64B_PKG="${PN}_current_amd64.deb" -fi - -DESCRIPTION="Video chat browser plug-in for Google Talk" -SRC_URI="rpm? ( - x86? ( ${RPM_URL}/${RPM_32B_PKG} ) - amd64? ( - multilib? ( - 32bit? ( ${RPM_URL}/${RPM_32B_PKG} ) - 64bit? ( ${RPM_URL/i386/x86_64}/${RPM_64B_PKG} ) - ) - !multilib? ( ${RPM_URL/i386/x86_64}/${RPM_64B_PKG} ) - ) -) !rpm? ( - x86? ( ${DEB_URL}/${DEB_32B_PKG} ) - amd64? ( - multilib? ( - 32bit? ( ${DEB_URL}/${DEB_32B_PKG} ) - 64bit? ( ${DEB_URL}/${DEB_64B_PKG} ) - ) - !multilib? ( ${DEB_URL}/${DEB_64B_PKG} ) - ) -)" - -HOMEPAGE="http://www.google.com/chat/video" -IUSE="multilib nspluginwrapper -rpm +system-libCg 32bit 64bit" -SLOT="0" - -KEYWORDS="-* ~amd64 ~x86" -LICENSE="UNKNOWN" -RESTRICT="strip mirror" - -#to get these run: -#for i in $(scanelf -n /opt/google/talkplugin/* | awk '/^ET/{gsub(/,/,"\n",$2);print $2}' | sort -u) -#do -# find /lib /usr/lib -maxdepth 1 -name $i -exec qfile -S {} \; -#done | awk '{print $1}' | sort -u -#also see debian control file -NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib ) - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:1.2 - >=sys-libs/glibc-2.4 - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXt - system-libCg? ( media-gfx/nvidia-cg-toolkit ) - sys-apps/lsb-release" - -DEPEND="amd64? ( nspluginwrapper? ( www-plugins/nspluginwrapper ) ) - rpm? ( >=app-arch/rpm2targz-9.0.0.4g )" - -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 always needs EMUL_DEPS GoogleTalkPlugin is always a 32-bit binary -RDEPEND="x86? ( ${NATIVE_DEPS} ) - amd64? ( - multilib? ( - 64bit? ( ${NATIVE_DEPS} ${EMUL_DEPS} ) - 32bit? ( ${EMUL_DEPS} ) - ) - !multilib? ( ${NATIVE_DEPS} ${EMUL_DEPS} ) - )" - -INSTALL_BASE="opt/google/talkplugin" - -[ "${ARCH}" = "amd64" ] && SO_SUFFIX="64" || SO_SUFFIX="" - -QA_TEXTRELS="${INSTALL_BASE}/libnpgtpo3dautoplugin.so - ${INSTALL_BASE}/libnpgoogletalk${SO_SUFFIX}.so" - -QA_TEXTRELS_amd64="${INSTALL_BASE}32/libnpgtpo3dautoplugin.so - ${INSTALL_BASE}32/libnpgoogletalk.so" - -rm_nswrapper_plugin() { - #remove all wrapped plugins - local i plugin - if use amd64 && has_version 'www-plugins/nspluginwrapper'; then - for i in libnpgtpo3dautoplugin.so libnpgoogletalk.so; do - plugin=$(nspluginwrapper -l | grep -e "^/.*$i") - if [[ -f ${plugin} ]]; then - einfo "Removing 32-bit plugin wrapper: ${plugin}" - nspluginwrapper -r "${plugin}" - fi - done - fi -} - -pkg_setup() { - if use x86; then - export MY_INSTALL_TYPE="native" - elif use amd64; then - if use multilib; then - if use 32bit && use 64bit; then - export MY_INSTALL_TYPE="both" - elif use 64bit; then - export MY_INSTALL_TYPE="native" - elif use 32bit; then - export MY_INSTALL_TYPE="cross" - else - eerror "You must select at least one library USE flag (32bit or 64bit)" - die "No library version selected [-32bit -64bit]" - fi - else - export MY_INSTALL_TYPE="native" - fi - fi -} - -src_unpack() { - if [ "${MY_INSTALL_TYPE}" = "native" ]; then - if use rpm; then - rpm_unpack ${A} - else - unpack ${A} ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz - fi - else # cross or both - mkdir 32bit - cd 32bit - if use rpm; then - rpm_unpack "${RPM_32B_PKG}" - else - unpack "${DEB_32B_PKG}" ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz - fi - cd .. - fi - - if [ "${MY_INSTALL_TYPE}" = "both" ]; then - if use rpm; then - rpm_unpack "${RPM_64B_PKG}" - else - unpack "${DEB_64B_PKG}" ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz - fi - fi -} - -src_install() { - if [ "${MY_INSTALL_TYPE}" != "cross" ]; then #native or both - use rpm || dodoc ./usr/share/doc/google-talkplugin/changelog.Debian - - cd "./${INSTALL_BASE}" - exeinto "${EROOT}${INSTALL_BASE}" - doexe GoogleTalkPlugin libnpgtpo3dautoplugin.so libnpgoogletalk"${SO_SUFFIX}".so - inst_plugin "${EROOT}${INSTALL_BASE}"/libnpgtpo3dautoplugin.so - inst_plugin "${EROOT}${INSTALL_BASE}"/libnpgoogletalk"${SO_SUFFIX}".so - - #install bundled libCg - if ! use system-libCg; then - cd lib - exeinto "${EROOT}${INSTALL_BASE}/lib" - doexe *.so - fi - fi - - if [ "${MY_INSTALL_TYPE}" != "native" ]; then #cross or both - oldabi="${ABI}" - ABI="x86" - - cd 32bit - - cd "./${INSTALL_BASE}" - exeinto "${EROOT}${INSTALL_BASE}32" - doexe GoogleTalkPlugin libnpgtpo3dautoplugin.so libnpgoogletalk.so - inst_plugin "${EROOT}${INSTALL_BASE}"32/libnpgtpo3dautoplugin.so - inst_plugin "${EROOT}${INSTALL_BASE}"32/libnpgoogletalk.so - - #install bundled libCg - if ! use system-libCg; then - cd lib - exeinto "${EROOT}${INSTALL_BASE}"32/lib - doexe *.so - fi - ABI="${oldabi}" - fi -} - -pkg_prerm() { - rm_nswrapper_plugin -} - -pkg_postinst() { - local i - if use amd64; then - if [ "${MY_INSTALL_TYPE}" = "cross" ]; then - if has_version 'www-plugins/nspluginwrapper'; then - #install 32bit plugins for 64bit browsers - oldabi="${ABI}" - ABI="x86" - einfo "nspluginwrapper detected: Installing plugin wrapper" - for i in libnpgtpo3dautoplugin.so libnpgoogletalk.so; do - nspluginwrapper -i "${EROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/${i}" - done - ABI="${oldabi}" - else - einfo "To use the 32-bit plugins in a native 64-bit firefox," - einfo "you must install www-plugins/nspluginwrapper and run" - for i in libnpgtpo3dautoplugin.so libnpgoogletalk.so; do - einfo "nspluginwrapper -i '${EROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/${i}'" - done - fi - else #both or native - rm_nswrapper_plugin - fi - fi -} diff --git a/www-plugins/google-talkplugin/google-talkplugin-1.8.0.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-1.8.0.0.ebuild index fc580490c..19788a3d0 100644 --- a/www-plugins/google-talkplugin/google-talkplugin-1.8.0.0.ebuild +++ b/www-plugins/google-talkplugin/google-talkplugin-1.8.0.0.ebuild @@ -25,7 +25,7 @@ IUSE="+system-libCg" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -LICENSE="UNKNOWN" +LICENSE="google-talkplugin" RESTRICT="strip mirror" #to get these run: @@ -58,30 +58,39 @@ EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220 RDEPEND="x86? ( ${NATIVE_DEPS} ) amd64? ( ${NATIVE_DEPS} ${EMUL_DEPS} )" -INSTALL_BASE="opt/google/talkplugin" +INSTALL_BASE="/opt/google/talkplugin" [ "${ARCH}" = "amd64" ] && SO_SUFFIX="64" || SO_SUFFIX="" -QA_TEXTRELS="${INSTALL_BASE}/libnpgtpo3dautoplugin.so - ${INSTALL_BASE}/libnpgoogletalk${SO_SUFFIX}.so" +QA_EXECSTACK="${INSTALL_BASE#/}/GoogleTalkPlugin" + +QA_TEXTRELS="${INSTALL_BASE#/}/libnpgtpo3dautoplugin.so + ${INSTALL_BASE#/}/libnpgoogletalk${SO_SUFFIX}.so" + +# 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() { - unpack ${A} ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz + unpack ${A} ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz || die } src_install() { dodoc ./usr/share/doc/google-talkplugin/changelog.Debian - cd "./${INSTALL_BASE}" - exeinto "${EROOT}${INSTALL_BASE}" - doexe GoogleTalkPlugin libnpgtpo3dautoplugin.so libnpgoogletalk"${SO_SUFFIX}".so - inst_plugin "${EROOT}${INSTALL_BASE}"/libnpgtpo3dautoplugin.so - inst_plugin "${EROOT}${INSTALL_BASE}"/libnpgoogletalk"${SO_SUFFIX}".so + cd "./${INSTALL_BASE#/}" || die + exeinto "${INSTALL_BASE}" || die + doexe GoogleTalkPlugin libnpgtpo3dautoplugin.so libnpgoogletalk"${SO_SUFFIX}".so || die + inst_plugin "${INSTALL_BASE}"/libnpgtpo3dautoplugin.so || die + inst_plugin "${INSTALL_BASE}"/libnpgoogletalk"${SO_SUFFIX}".so || die #install bundled libCg if ! use system-libCg; then - cd lib - exeinto "${EROOT}${INSTALL_BASE}/lib" - doexe *.so + cd lib || die + exeinto "${INSTALL_BASE}/lib" || die + doexe *.so || die fi }