From: Jeroen Roovers Date: Tue, 2 Aug 2011 17:02:34 +0000 (+0000) Subject: Add an "experimental" ebuild that does not change pluginpath.ini (bugs #363387 and... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14de3466f3a14931ca7cb2c1f6e23f3df734e2c3;p=gentoo.git Add an "experimental" ebuild that does not change pluginpath.ini (bugs #363387 and #321465). Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64 --- diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog index 46e7b5ec2429..1f1a207e45f3 100644 --- a/www-client/opera-next/ChangeLog +++ b/www-client/opera-next/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/opera-next # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.33 2011/07/27 15:27:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.34 2011/08/02 17:02:34 jer Exp $ + +*opera-next-12.00.1033-r1 (02 Aug 2011) + + 02 Aug 2011; Jeroen Roovers + +opera-next-12.00.1033-r1.ebuild: + Add an "experimental" ebuild that does not change pluginpath.ini (bugs + #363387 and #321465). *opera-next-12.00.1033 (27 Jul 2011) diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest index 5461ff97563c..1f1b2f460a2c 100644 --- a/www-client/opera-next/Manifest +++ b/www-client/opera-next/Manifest @@ -20,13 +20,14 @@ EBUILD opera-next-11.50.1074.ebuild 6199 RMD160 790193982d0445f3087cea0b03dfe01e EBUILD opera-next-12.00.1017.ebuild 6201 RMD160 d789458dbd1a8d4e35f03dfb4b8f40d3888c0415 SHA1 9da734fd4d669f0023e753e3f0345b0157320ec2 SHA256 4a3bcdf39cfdf1282ed2bc8317d9641d03a291b913860b73c673e35a1b14b549 EBUILD opera-next-12.00.1020.ebuild 6186 RMD160 d110707d9cdd8fbc9ddd5bd6aea81ed1fe922e40 SHA1 8e16d17d0f7e4371d671b79f8358c1c00e1942d0 SHA256 f114223c77d02c55af3f55de0f313d72bc2304d7625a644450509e08e37bd82e EBUILD opera-next-12.00.1027.ebuild 6179 RMD160 f34a032afc90274ef4a9e255109e0a1ce890020a SHA1 d10b42a50aeecd9c22bdee271f5dde280d155128 SHA256 769648221cf591a131abf2206baba2e301b5a50c07c9bd96d434df8145235650 +EBUILD opera-next-12.00.1033-r1.ebuild 6514 RMD160 f28a03be2fb432e57b452f648a5a558d38dd8e0a SHA1 3a5036de2111c3607a233e841630a40d6508a0a7 SHA256 8e5f84bb94d777acd9634ec729705b2c858ba38da7fee11c010a31392ec95140 EBUILD opera-next-12.00.1033.ebuild 6182 RMD160 0fb21fd9ebd851169e8e2a0b5d95a432146630c1 SHA1 ee3b38835627e387ea7021fafa2a640956c242ae SHA256 5da2ccd0cadd7dbac59fb0ce785ae17044ca4fba65edc0af64b4b834b8e60f4e -MISC ChangeLog 6568 RMD160 73d42116fcebec9a837f59a8fb0fd4b9881be2aa SHA1 56a72dd4b68ddb2a1cd8df803906aee8547218ca SHA256 79f74bf8be05ce88f1cf4b513510703b413973723da63fb337001b5d8d9282cd +MISC ChangeLog 6790 RMD160 3d47fc495ce55626a452d2cddbab907679b265a8 SHA1 ecce8127e7dad2391014902bc9d1c3fc025c7efa SHA256 ba45dd57ef0c0c13d50a0eaa24d0a1f38e3b29c620df3cdb46ba3807022ab44e MISC metadata.xml 1547 RMD160 465d146bcfdb6553f7f0ab2dddd68c4dcb2e7731 SHA1 1afb7e0ccc0833ba0eb73be38b282b66ad629ff6 SHA256 5cfc6e7cbf3c454d563eb407b4569f0f5a9b3ce7770026d6055f27211d481915 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4wLlMACgkQVWmRsqeSphNL6ACdHwPMX3P0KB6njj4c7KO0ljNr -TEAAnRMeRY2f+6FJTzzjxASE4KEXufkk -=NEMP +iEYEARECAAYFAk44LbAACgkQVWmRsqeSphPiWACfYyyrdgUeh0IdUj0XNAP9atVr +EuEAn3pRKlgSiv2K1nCrlh83J2oX221f +=qul7 -----END PGP SIGNATURE----- diff --git a/www-client/opera-next/opera-next-12.00.1033-r1.ebuild b/www-client/opera-next/opera-next-12.00.1033-r1.ebuild new file mode 100644 index 000000000000..b10cc949f30e --- /dev/null +++ b/www-client/opera-next/opera-next-12.00.1033-r1.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1033-r1.ebuild,v 1.1 2011/08/02 17:02:34 jer Exp $ + +EAPI="4" + +inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator + +DESCRIPTION="A fast and secure web browser and Internet suite" +HOMEPAGE="http://my.opera.com/ruario/blog/2011/06/29/i-need-feedback-from-gentoo-and-sabayon-users" +SLOT="0" +LICENSE="OPERA-11 LGPL-2 LGPL-3" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="elibc_FreeBSD gtk kde +gstreamer" + +O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00 +O_B="$(get_version_component_range 3)" # Build version, i.e. 1156 + +O_D="QRESYNC_${O_V}-${O_B}" +O_P="${PN}-${O_V}-${O_B}" +O_U="http://snapshot.opera.com/unix/" + +SRC_URI=" + amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz ) + x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz ) + x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz ) +" + +OPREFIX="/usr/$(get_libdir)" + +QA_DT_HASH="${OPREFIX}/${PN}/.*" +QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" + +O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi +hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te +th tl tr uk uz vi zh-CN zh-TW zu" + +for O_LINGUA in ${O_LINGUAS}; do + IUSE="${IUSE} linguas_${O_LINGUA/-/_}" +done + +DEPEND=" + >=sys-apps/sed-4 + app-arch/xz-utils +" +GTKRDEPEND=" + dev-libs/atk + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango + x11-libs/pixman +" +KDERDEPEND=" + kde-base/kdelibs + x11-libs/qt-core + x11-libs/qt-gui +" +GSTRDEPEND=" + dev-libs/glib + dev-libs/libxml2 + media-plugins/gst-plugins-meta + media-libs/gstreamer +" +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-apps/util-linux + sys-libs/zlib + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + gtk? ( ${GTKRDEPEND} ) + kde? ( ${KDERDEPEND} ) + gstreamer? ( ${GSTRDEPEND} ) +" + +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} + mv -v ${PN}* "${S}" || die +} + +src_prepare() { + local LNGDIR="share/${PN}/locale" + + # Count linguas + count() { echo ${#}; } + local lingua_count=$(count ${O_LINGUAS} en) + local locale_count=$(count ${LNGDIR}/*) + [[ ${lingua_count} = ${locale_count} ]] \ + || die "Number of LINGUAS does not match number of locales" + unset count + + # Remove unwanted linguas + einfo "Keeping these locales (linguas): ${LINGUAS}." + for LINGUA in ${O_LINGUAS}; do + if ! use linguas_${LINGUA/-/_}; then + LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) + rm -r "${LINGUA}" || die "The list of linguas needs to be fixed" + fi + done + + # Remove doc directory but keep the LICENSE under another name (bug #315473) + mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt + rm -rf share/doc + for locale in share/${PN}/locale/*; do + rm -f "${locale}/license.txt" + ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \ + || die "ln -sn license.txt" + done + + # Remove package directory + rm -rf share/${PN}/package + + # Leave libopera*.so only if the user chooses + if ! use gtk; then + rm lib/${PN}/liboperagtk2.so || die "rm liboperagtk.so failed" + fi + if ! use kde; then + rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed" + fi + + # Unzip the man pages before sedding + gunzip share/man/man1/* || die "gunzip failed" + + # Replace PREFIX, SUFFIX and PN in various files + sed -i \ + -e "s:@@{PREFIX}:/usr:g" \ + -e "s:@@{SUFFIX}::g" \ + -e "s:@@{_SUFFIX}::g" \ + -e "s:@@{USUFFIX}::g" \ + -e "s:opera:${PN}:g" \ + share/man/man1/* \ + share/applications/${PN}-browser.desktop \ + || die "sed failed" + + # Create /usr/bin/opera wrapper + echo '#!/bin/sh' > ${PN} + echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN} + echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ + >> ${PN} + echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} + + # Change libz.so.3 to libz.so.1 for gentoo/freebsd + if use elibc_FreeBSD; then + scanelf -qR -N libz.so.3 -F "#N" lib/${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 \ + "$i" \ + -e 's/libz\.so\.3/libz.so.1/g' + done + [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \ + && die "failed to change libz.so.3 to libz.so.1" + fi +} + +src_install() { + # 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" + + # Install startup scripts + dobin ${PN} + + # Stop revdep-rebuild from checking opera binaries + dodir /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \ + > "${D}"/etc/revdep-rebuild/90${PN} + + # Set PaX markings for hardened/PaX (bug #344267) + pax-mark m \ + "${D}/${OPREFIX}/${PN}/${PN}" \ + "${D}/${OPREFIX}/${PN}/operaplugincleaner" \ + "${D}/${OPREFIX}/${PN}/operapluginwrapper" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + elog "Contrary to all previous ebuilds, this experimental ebuild does not" + elog "change the default plugin paths as found in" + elog "." + elog + elog "To help test the assumption that changing the default pluginpath.ini" + elog "causes the problems with www-plugins/adobe-flash, please move your" + elog "\$HOME/.${PN} directory aside, launch ${PN} and try out" + elog "some websites that offer Adobe Flash content." + elog + elog "If you find this ebuild, and moving away your \$HOME/.${PN} directory" + elog "fixes the issue, then please file a new bug report with all the usual" + elog "information, or visit" + elog "${HOMEPAGE}" + elog "and report your findings there, but always mention this special ebuild." + + if use elibc_FreeBSD; then + elog + elog "To improve shared memory usage please set:" + elog "$ sysctl kern.ipc.shm_allow_removed=1" + fi + + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +}