From: Jeroen Roovers Date: Wed, 30 Jun 2010 12:57:01 +0000 (+0000) Subject: . X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14e8a7152743dfac0f9ac1cceba1a5b354cae1e8;p=gentoo.git . Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 4256973e7542..c7f6ba5250b9 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/opera # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.505 2010/06/29 15:37:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.506 2010/06/30 12:57:01 jer Exp $ + +*opera-10.60_pre6385 (30 Jun 2010) + + 30 Jun 2010; Jeroen Roovers +opera-10.60_pre6385.ebuild: + . 29 Jun 2010; Jeroen Roovers opera-10.11.ebuild: But only whe USE=qt-static thanks to Rafał Mużyło (bug #325569). diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 9d98871e9c64..bd82613c4b78 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -13,7 +13,12 @@ DIST opera-10.60-6384.i386.freebsd.tar.bz2 13809868 RMD160 d01df9c21673c88f20a36 DIST opera-10.60-6384.i386.linux.tar.bz2 13748412 RMD160 413fca33e1cdc134984e1c4a65085975c1236325 SHA1 9f90dbc1bfca51ac782b4c0e69ff017922996020 SHA256 b62db8bf2db68df9b737db36471a55f140b0b03bcabcbf9be7b7ebe7dded9917 DIST opera-10.60-6384.ppc.linux.tar.bz2 14089258 RMD160 bf587849846e70a204bc770fa78cfeeb2476f0fc SHA1 e2bd88479f37992995596a89df24a049a49d7979 SHA256 cad71da0979fecc58da2dc7cb93c03b7de03e87c7e673c7d751a415710b8fe12 DIST opera-10.60-6384.x86_64.linux.tar.bz2 14782607 RMD160 1302381cfa9bb463c8c21b7af209e473cfb51d77 SHA1 46209c17f77b309819fa911f30acea9e22d7eb7e SHA256 579fda42ab138b142e0b199a777bd132bac516e5c2eea6584e091cf466d1bece +DIST opera-10.60-6385.i386.freebsd.tar.bz2 12720611 RMD160 94dfd0cbb3253c15dcaed839f22d30111503e4c9 SHA1 51f4a490fca6d462a695e152da48f6ce6d9927c0 SHA256 e553e043232a4c7abe8fd24d01e5133449f0240ac2a7d0e85172b52462bd6f4b +DIST opera-10.60-6385.i386.linux.tar.bz2 12651755 RMD160 0f940c90e786a3601c2348149d64b8a349fdca03 SHA1 b531da14b1099186b9bd28300f22dbc325001428 SHA256 ff98a0cc5c0e48ddfb8cc30beeb9d05d8ef805c95c633f25bdb36348d4b12f6b +DIST opera-10.60-6385.ppc.linux.tar.bz2 12986965 RMD160 285de266bfc7c2c6f409114a0dfb62195ec37ff7 SHA1 bf85f168f8d07da0a81ca5b93ec0ae785e825e19 SHA256 50aeb592e833be0cf5dab06d77f6d48faa631434824c9e3c244efbe14c87d329 +DIST opera-10.60-6385.x86_64.linux.tar.bz2 13681047 RMD160 2036ca72e5c6eeb89f1fa438276acffcff6e205a SHA1 b05d95bae6c1ac84b017bef2e431119a38f3139d SHA256 f793f89b47fea99ead0309d4e5359913770d8ffeb0bf55b143c1f1d5140f8275 EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 SHA1 c3b88e01930c067585647ec7e527c35cd346dc72 SHA256 8d1bb4b49055f5542c3398233513ec51f95d8e7d565e46f74d1cd3b01d099fe3 EBUILD opera-10.60_pre6384.ebuild 4872 RMD160 e5534102e53160768c447e97e792425bf17139d3 SHA1 f20b8282ea2580ee9eae9ca4f5254a2f4ea1eb81 SHA256 4e256661d39d0c83efcbf528dbb6f8752a90647973f2e5a39e32ab39ee8fcac1 -MISC ChangeLog 97946 RMD160 2284077111d44f370d1df6ad692b80e8a0739a64 SHA1 6a166afe5b5bd10fd7a235487af46fe580c15755 SHA256 6c3a4bb1ef4364626764722b434d897f1fee641d2d9f547da82707dafd4bbcec +EBUILD opera-10.60_pre6385.ebuild 4868 RMD160 ed075fd710c2396aa844a151cd0c1576126a7902 SHA1 5e3ccc553c891ccd0cdc90973dba5582d1e5531b SHA256 31c2bd62b915a5a99892ce1add5cb2212a4ff5eb1403b1672873aa7ef303db1a +MISC ChangeLog 98117 RMD160 cbd8f7a245dfd9850dbda6b16a5df323daffc49f SHA1 a79ac16c5df2e78bd505e2793e194a5cac4b1e60 SHA256 02d435303c63cfcb27d3baf5a36b7e3b10049578cf227f97c1547da7820ac13d MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a diff --git a/www-client/opera/opera-10.60_pre6385.ebuild b/www-client/opera/opera-10.60_pre6385.ebuild new file mode 100644 index 000000000000..32e09a341edb --- /dev/null +++ b/www-client/opera/opera-10.60_pre6385.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6385.ebuild,v 1.1 2010/06/30 12:57:01 jer Exp $ + +EAPI="2" + +inherit eutils multilib + +DESCRIPTION="A standards-compliant graphical Web browser" +HOMEPAGE="http://www.opera.com/" + +SLOT="0" +LICENSE="OPERA-10.53 LGPL-2 LGPL-3" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="elibc_FreeBSD gtk kde" + +RESTRICT="mirror test" + +OPREFIX="/usr/$(get_libdir)" + +QA_DT_HASH="${OPREFIX}/${PN}/.*" +QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" + +MY_LINGUAS=" + be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka + ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK + zh-TW +" + +for MY_LINGUA in ${MY_LINGUAS}; do + IUSE="${IUSE} linguas_${MY_LINGUA/-/_}" +done + +O_U="http://snapshot.opera.com/unix/ticket_${PV/_pre/-}/" +O_P="${P/_pre/-}" + +SRC_URI=" + amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 ) + ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 ) + x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 ) + x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 ) +" + +DEPEND=">=sys-apps/sed-4" + +RDEPEND=" + gtk? ( + =x11-libs/gtk+-2* + dev-libs/atk + dev-libs/glib + media-libs/glitz + media-libs/libpng + x11-libs/cairo + x11-libs/pango + x11-libs/pixman + ) + kde? ( + kde-base/kdelibs + ) + dev-libs/expat + media-libs/fontconfig + media-libs/freetype + media-plugins/gst-plugins-meta + sys-apps/util-linux + sys-libs/zlib + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libxcb + x11-libs/xcb-util + " + +opera_linguas() { + # Remove unwanted LINGUAS: + local LINGUA + local LNGDIR="${D}usr/share/${PN}/locale" + einfo "Keeping these locales: ${LINGUAS}." + for LINGUA in ${MY_LINGUAS}; do + if ! use linguas_${LINGUA/-/_}; then + LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) + rm -r "${LINGUA}" + fi + done +} + +pkg_setup() { + echo -e \ + " ${GOOD}****************************************************${NORMAL}" + elog "If you seek support, please file a bug report at" + elog "https://bugs.gentoo.org and post the output of" + elog " \`emerge --info =${CATEGORY}/${P}'" + echo -e \ + " ${GOOD}****************************************************${NORMAL}" +} + +src_unpack() { + unpack ${A} + if [[ ! -d ${S} ]]; then + cd "${WORKDIR}"/${PN}* || die "failed to enter work directory" + S="$(pwd)" + einfo "Setting WORKDIR to ${S}" + fi +} + +src_install() { + # Remove "license directory" (bug #315473) + rm -rf "share/doc/opera" + + # We install into usr instead of opt as Opera does not support the latter + dodir /usr + mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed" + mv share/ "${D}/usr/" || die "mv share/ failed" + + # Unzip the man pages before sedding + gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed" + + # Replace PREFIX and SUFFIX in various files + sed -i \ + -e "s:@@{PREFIX}:/usr:g" \ + -e "s:@@{SUFFIX}::g" \ + -e "s:@@{_SUFFIX}::g" \ + -e "s:@@{USUFFIX}::g" \ + "${D}"/usr/share/mime/packages/opera-widget.xml \ + "${D}"/usr/share/man/man1/* \ + "${D}"/usr/share/applications/opera-browser.desktop \ + "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed" + + # Sed libdir in opera script + sed "${FILESDIR}"/opera \ + -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \ + || die "sed opera script failed" + + # Sed libdir in defaults/pluginpath.ini + sed -i \ + -e "s|/usr/lib32|${OPREFIX}|g" \ + "${D}"/usr/share/opera/defaults/pluginpath.ini \ + || die "sed pluginpath.ini failed" + + # Install startup scripts + dobin ${PN} ${PN}-widget-manager || die "dobin failed" + + # Stop revdep-rebuild from checking opera binaries + dodir /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera + + # Change libz.so.3 to libz.so.1 for gentoo/freebsd + if use elibc_FreeBSD; then + scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${PN}/ | \ + while read i; do + if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; + then + export SANITY_CHECK_LIBZ_FAILED=1 + break + fi + sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i" + done + [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1" + fi + + [[ -z MY_LINGUAS ]] || opera_linguas +} + +pkg_postinst() { + elog "To change the UI language, choose [Tools] -> [Preferences], open the" + elog "[General] tab, click on [Details...] then [Choose...] and point the" + elog "file chooser at /usr/share/opera/locale/, then enter the" + elog "directory for the language you want and [Open] the .lng file." + + if use elibc_FreeBSD; then + elog + elog "To improve shared memory usage please set:" + elog "$ sysctl kern.ipc.shm_allow_removed=1" + fi +}