From 79759416684157467d3074c60ebc985222b3550e Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 8 Nov 2011 15:01:22 +0000 Subject: [PATCH] http://my.opera.com/desktopteam/blog/2011/11/08/small-update-in-11-60 Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- www-client/opera/ChangeLog | 7 +- www-client/opera/Manifest | 12 +- www-client/opera/opera-11.60.1144.ebuild | 233 +++++++++++++++++++++++ 3 files changed, 247 insertions(+), 5 deletions(-) create mode 100644 www-client/opera/opera-11.60.1144.ebuild diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 281f29070961..fbcee57ed958 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.657 2011/11/08 13:37:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.658 2011/11/08 15:01:22 jer Exp $ + +*opera-11.60.1144 (08 Nov 2011) + + 08 Nov 2011; Jeroen Roovers +opera-11.60.1144.ebuild: + http://my.opera.com/desktopteam/blog/2011/11/08/small-update-in-11-60 *opera-11.60.1139 (08 Nov 2011) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index f86ef46e1fe1..bd21e3cc6cba 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -10,15 +10,19 @@ DIST opera-11.60-1134.x86_64.linux.tar.xz 12226704 RMD160 f7e6cad59b7bfce9dd03b6 DIST opera-11.60-1139.i386.freebsd.tar.xz 11586148 RMD160 40489c4b2105348a509e4029404cb35ad8cbbc8e SHA1 8e22861282cfae9c895a8642a0218a3744ce3a6b SHA256 4cc6a541fe0d67bf6b2789f3326dc1dab31c3c4afaa110d2f3a8184d2caf8a13 DIST opera-11.60-1139.i386.linux.tar.xz 11554244 RMD160 5dfb938680e5e83c85179b0d0b8d80da000fc372 SHA1 0af2e2f00113a6435825085dc90fd18b71769b7d SHA256 9e0de4a17208f0ed89d61d07416edf413c40291235db804418d844eb1706430b DIST opera-11.60-1139.x86_64.linux.tar.xz 12433644 RMD160 6d414883855eec378a7335631e41226aa96e262d SHA1 12b64c57f685be791d56dabfdd4bd1c619596952 SHA256 add6d45cd0a7e53422d2023f1fe9329b50397cf73943ded5ff90bc59fea2032d +DIST opera-11.60-1144.i386.freebsd.tar.xz 11593076 RMD160 2fdd708b21c5ecbbd02d351d472a3ef0931abecc SHA1 8d338fac23505ac7a5cf7b96574883357833b211 SHA256 a4c2d9d5ff0e024b58df50a2ee10eecd465fa585a1dc5c90f8dda6184e0c69e6 +DIST opera-11.60-1144.i386.linux.tar.xz 11577164 RMD160 5ccf119c4856ae3ed18e8879fca523e1a0cc8990 SHA1 b6c51bf6f27cb6406a9d8905089dc73bc92f4e2a SHA256 5910b00175eda29ab06f1119fb946d86407db64022b4b82ec2dbf7ee7ad1ff90 +DIST opera-11.60-1144.x86_64.linux.tar.xz 12460648 RMD160 2da55f12b5d80d69b3a1c1b3ad3d39b119054329 SHA1 51237800d286042eef5de146e4e78b8ec45921fc SHA256 59442a958e0be19c8d2507560592eb38669a60029f617d4c63028b77cc31d53b EBUILD opera-11.52.1100.ebuild 5700 RMD160 643a472817d7a959cabd8a927de31e17d8815428 SHA1 1709aabca35aee159583918d29572475e1a7764b SHA256 bc156a0c65f58d895c47d71351a42fa48c8ff07c4ef968e1486b4ed1a464a51b EBUILD opera-11.60.1134.ebuild 5787 RMD160 aaf27885f0060c39b1f14c0b5ef54d92d13aa46c SHA1 48a748cf01be89f9bd3af2b6d5d07922fdb4f273 SHA256 c9d355b51629ae87088a2e702f827eb73a624e19bf490edb612c458dd68e7d4a EBUILD opera-11.60.1139.ebuild 5914 RMD160 67904c987b61c9d93de3b5164207965afd28c30f SHA1 9bb5baa3880c0e4b5c95ff6bd58ecf112c0faac9 SHA256 4bbea81d811af19fa11121e7b057a30bc6ba9d1bc7a041f4f30814c5bba84790 -MISC ChangeLog 125496 RMD160 0b513bdb1f8d6e4f5c7472b7045a1c35b7743b45 SHA1 e467eec41f837b87a7647803c99769f2863ea23b SHA256 af028e6cc12eeaac1c82a7739fc0815530d45e1161b5456ecb94ecd1603e8fbc +EBUILD opera-11.60.1144.ebuild 5918 RMD160 63b82a6866e690a28564e14e84244b35056a5db0 SHA1 29a52b5e8e4d682a7e6e7925b8f42c1ed7923a13 SHA256 61a563d9f35adf287a2f81b036a2ef68beef4320c468803da480e3c86096011f +MISC ChangeLog 125675 RMD160 44d75681ab3eb6bafa030c22995d06fdfceb3e79 SHA1 c388d2d0195d0adab033e041760face7d583e95a SHA256 01d1e98422ed624bcfa870149b14a4477543da34b5986cfc8f082760540860f4 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk65MLAACgkQVWmRsqeSphPuvACfflCkJtkWk/jjeywU5MmxWph8 -xRYAnAihvaMI14AFGxCOycIXfx5X415N -=5nUO +iEYEARECAAYFAk65REgACgkQVWmRsqeSphNYhgCfdweJzy0tVg4GyGkKnRYkWeWC +S9sAnR2Zy85hG5PzGvWQo5Z+RqhIDjuq +=R0Gi -----END PGP SIGNATURE----- diff --git a/www-client/opera/opera-11.60.1144.ebuild b/www-client/opera/opera-11.60.1144.ebuild new file mode 100644 index 000000000000..647faa59aa34 --- /dev/null +++ b/www-client/opera/opera-11.60.1144.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/opera-11.60.1144.ebuild,v 1.1 2011/11/08 15:01:22 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="fragrance_${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 + 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} ) + gtk3? ( ${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 + 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 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${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