From dd9c1a979570c8def9ac3c8eef3100df2ff5df98 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 23 Dec 2011 15:54:15 +0000 Subject: [PATCH] http://my.opera.com/desktopteam/blog/2011/12/23/lillejulaften Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- www-client/opera/ChangeLog | 7 +- www-client/opera/Manifest | 12 +- www-client/opera/opera-11.61.1222.ebuild | 223 +++++++++++++++++++++++ 3 files changed, 237 insertions(+), 5 deletions(-) create mode 100644 www-client/opera/opera-11.61.1222.ebuild diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 09e744e732b7..e161c8ea6c02 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/opera # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.679 2011/12/17 13:52:31 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.680 2011/12/23 15:54:15 jer Exp $ + +*opera-11.61.1222 (23 Dec 2011) + + 23 Dec 2011; Jeroen Roovers +opera-11.61.1222.ebuild: + http://my.opera.com/desktopteam/blog/2011/12/23/lillejulaften 17 Dec 2011; Jeroen Roovers opera-11.60.1185.ebuild: Revert LD_PRELOAD hack (bug #394963). diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index f64cfcd3a096..10b399b01b76 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -4,13 +4,17 @@ Hash: SHA1 DIST opera-11.60-1185.i386.freebsd.tar.xz 11537236 RMD160 9b8dc467f698cf540c0f537a98677930a077a0c4 SHA1 befc0d908b76d930bf9a0ac753ccfc2b086189fb SHA256 eb38671f9b5e06ba7b905bd9ff22262e9ef335c37414bbb0ea4234aa2b2ba46d DIST opera-11.60-1185.i386.linux.tar.xz 11505432 RMD160 f645c292f34a08a2bc44107f3ca57f4f0a1a55bd SHA1 96e3366afff3b738db9fadbd1046623827afaf00 SHA256 a73584938a558d1b9c6f250d1bf127b02fc6ca5c0378c4ee3009c178fe1c8a74 DIST opera-11.60-1185.x86_64.linux.tar.xz 12347432 RMD160 50de639af506a0493843763cadc2c8e74d201538 SHA1 dc6d2cf74ed98dfb3625529a03a6d9107a4d01cf SHA256 a3ede13b6abe92633e4728773b472c8e0571717161ced7935ac3bc7ff728c642 +DIST opera-11.61-1222.i386.freebsd.tar.xz 11526792 RMD160 728ee5d69bfa9f1ff6be55729d158bed74a407ed SHA1 88dfe4af7a7e9c6ef8e60de82c3b7739c3ccc861 SHA256 3516025cb1089080dc14f037f89d505cdf322a7730d33af01d822f035ed7382c +DIST opera-11.61-1222.i386.linux.tar.xz 11489688 RMD160 2e2662ddcc0f9f7abee3de514acdd823614d66d8 SHA1 1bc9f00a7fb6d032eeaaad93cd163c1828762b92 SHA256 f536f15dc242faf7fb55a1992f2baaa339652cc3f669b532b784845e8fddfa00 +DIST opera-11.61-1222.x86_64.linux.tar.xz 12314540 RMD160 ad10300b0c83879e6bd8c8fb40e5526cd5d0941d SHA1 4c63794365e8f2090d49fc17a43fc50fe817e04f SHA256 0b4f14774ac9f0731a692475f92ef325c35bef13feb959b4d5ca82221baf47e1 EBUILD opera-11.60.1185.ebuild 5874 RMD160 7b3b4af0b9c79819e7497c2469c150e6a880672e SHA1 d4e4d0297b094cb1cc37b066b6b76f26470b8413 SHA256 e11305f5594a97bfeb1e7daecef9aa2c76c6ef90da1c41a5451f2172a1ee6aef -MISC ChangeLog 129375 RMD160 9350b3b3bfe5a9142d3985140b3852315fc68b04 SHA1 d5aa27e669a58a15112b6c6a4b8a26851d009cd2 SHA256 3d4623542c7d1ad50bdb9dd588ab36b7a3f60732cc9d892af76cce3da6605cb9 +EBUILD opera-11.61.1222.ebuild 5549 RMD160 82b1247cf452fab5669d8e54d6fe114441af29e2 SHA1 7f34e90d89364c543cfea9db7146991e682c2fa1 SHA256 a6a0b0a96a18c8b970e024fc3dd9bda6e6c4422cd10e814579cb32dbf82adc77 +MISC ChangeLog 129546 RMD160 3e816a76c0ad0f519bf31e591922443513154884 SHA1 a30c0ef6e2ba033e224c9b4f07d85184b4709ea1 SHA256 e1409104101c9eb04e58a9933c3d9a9fdc21cc95648bfda3ebdd4586c7b31278 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7snqUACgkQVWmRsqeSphPfDgCdELveM6syxYUcaCxj9hKuhO3d -5LEAn39HTeatMD9ej1UNmbWT/X3aT7cO -=krL3 +iEYEARECAAYFAk70pC4ACgkQVWmRsqeSphN3AACcDe+2SYEN+h2+7NimKoSOLx7E +btEAnjfKd4hmpntOe1QFv/kaEBL/9pbm +=Zsrv -----END PGP SIGNATURE----- diff --git a/www-client/opera/opera-11.61.1222.ebuild b/www-client/opera/opera-11.61.1222.ebuild new file mode 100644 index 000000000000..3187585efbff --- /dev/null +++ b/www-client/opera/opera-11.61.1222.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1222.ebuild,v 1.1 2011/12/23 15:54:15 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://www.opera.com/" + +SLOT="0" +LICENSE="OPERA-11 LGPL-2 LGPL-3" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="elibc_FreeBSD gtk gtk3 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="lillejulaften_${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 + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + x11-libs/pango + x11-libs/pixman +" +KDERDEPEND=" + kde-base/kdelibs + x11-libs/qt-core + x11-libs/qt-gui +" +GSTRDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + media-libs/gst-plugins-base + media-libs/gstreamer + media-plugins/gst-plugins-meta +" +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 + x11-libs/libXt + gtk? ( ${GTKRDEPEND} ) + gtk3? ( ${GTKRDEPEND} ) + kde? ( ${KDERDEPEND} ) + gstreamer? ( ${GSTRDEPEND} ) +" +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 + done + + # Remove package directory + rm -rf share/${PN}/package + + # Optional libraries + if ! use gtk; then + rm lib/${PN}/liboperagtk2.so || die + fi + if ! use gtk3; then + rm lib/${PN}/liboperagtk3.so || die + fi + if ! use kde; then + rm lib/${PN}/liboperakde4.so || die + fi + if ! use gstreamer; then + rm -r lib/${PN}/gstreamer || die + fi + + # Unzip the man pages before sedding + gunzip share/man/man1/* || die + + # 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}-*.desktop \ + || die + + # Replace "Opera" with "Opera Next" + if [[ ${PN} = opera-next ]]; then + sed -i share/applications/${PN}-*.desktop \ + -e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die + fi + + # 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 + 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 share/ "${D}/usr/" || die + + # 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() { + 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 +} -- 2.26.2