From 3ae5572ad37d0ecb8bce02afb01147a2025a2c20 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 13 Jan 2012 17:32:28 +0000 Subject: [PATCH] http://my.opera.com/desktopteam/blog/2012/01/13/jason Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- www-client/opera/ChangeLog | 9 +- www-client/opera/Manifest | 13 +- www-client/opera/opera-11.61.1236.ebuild | 222 +++++++++++++++++++++++ www-client/opera/opera-11.61.1237.ebuild | 221 ++++++++++++++++++++++ 4 files changed, 460 insertions(+), 5 deletions(-) create mode 100644 www-client/opera/opera-11.61.1236.ebuild create mode 100644 www-client/opera/opera-11.61.1237.ebuild diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 52bdcade5eb0..537142a46704 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/opera # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.682 2012/01/11 18:26:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.683 2012/01/13 17:32:28 jer Exp $ + +*opera-11.61.1237 (13 Jan 2012) +*opera-11.61.1236 (13 Jan 2012) + + 13 Jan 2012; Jeroen Roovers +opera-11.61.1236.ebuild, + +opera-11.61.1237.ebuild: + http://my.opera.com/desktopteam/blog/2012/01/13/jason *opera-11.61.1234 (11 Jan 2012) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 22713971ebf4..ae0ea9c78665 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -10,16 +10,21 @@ DIST opera-11.61-1222.x86_64.linux.tar.xz 12314540 RMD160 ad10300b0c83879e6bd8c8 DIST opera-11.61-1234.i386.freebsd.tar.xz 11530448 RMD160 fc6bba54c4ffd52f10fedea512bd39dabaccc028 SHA1 00a3f986b9cbb259252433b25f7e2f58e1bdd24a SHA256 912c0714ec8ebe794376574fe2c2ff80d181e3fd3324876b5fdc116b194faf12 DIST opera-11.61-1234.i386.linux.tar.xz 11483424 RMD160 4358e88eaef449f00227721b1991389119da523f SHA1 3c62b93fda73d223d185efccc5642822379f3bce SHA256 4fa72c6c50f043064ac0434ebb9ece34a648bcdb821e3f41585bde8ca25d05c5 DIST opera-11.61-1234.x86_64.linux.tar.xz 12321584 RMD160 a907f3c23d8844a88e2bd7d9d8e97ab26c782668 SHA1 02e675ce12b6a36f9fdef1d5b0c644b714007650 SHA256 e75773644623f767e088a0b88a07a97dd7a373c9c35a73e73a6bc20f74f00f9f +DIST opera-11.61-1236.i386.freebsd.tar.xz 11528172 RMD160 b4798c191af1d2bf7ae90c7d9e193fcb676b4967 SHA1 52d4b6d38d5605e8a1571f24fe77ced6ae463bb9 SHA256 a4b77ae115ca6f66a10eaa85fae6404cac39441bf58ec98e45e5cec038ffd0fb +DIST opera-11.61-1236.i386.linux.tar.xz 11490396 RMD160 b63310ae33d6b3c8fe0b72866a197104e8c4ebae SHA1 49f1d312de1b860ee3262b9098240a968adf6c06 SHA256 46eedc14fecd608056a64e886760929d3f377d75263452c318bebb72bf43a95d +DIST opera-11.61-1237.x86_64.linux.tar.xz 12318040 RMD160 4b2cb125e44a7867f60e8fd53a5d981c0f5e8e10 SHA1 7308fdbfc35c601f72a418e2b1578850c53ca014 SHA256 ca9bc43003a8aed4b904f6527b9fe42b35daa7afaf6c7f4a724d86e1dd0a2fa1 EBUILD opera-11.60.1185.ebuild 5874 RMD160 7b3b4af0b9c79819e7497c2469c150e6a880672e SHA1 d4e4d0297b094cb1cc37b066b6b76f26470b8413 SHA256 e11305f5594a97bfeb1e7daecef9aa2c76c6ef90da1c41a5451f2172a1ee6aef EBUILD opera-11.61.1222.ebuild 5549 RMD160 82b1247cf452fab5669d8e54d6fe114441af29e2 SHA1 7f34e90d89364c543cfea9db7146991e682c2fa1 SHA256 a6a0b0a96a18c8b970e024fc3dd9bda6e6c4422cd10e814579cb32dbf82adc77 EBUILD opera-11.61.1234.ebuild 5542 RMD160 a6397e1c293699d7d9f2ad8b6df3ca78ab1be01a SHA1 16715e064e0100992baa2c2260f5bbc5091caea1 SHA256 37f7f2d97e9cc1a00ccbe293a2b5a4b89ee94b54fd2f1382ff6c82cd67f9adaa -MISC ChangeLog 17768 RMD160 b1dfa3ebf97285cf1ae99dd2a9eedb614bdcacdd SHA1 8392c43d81e2fb7e4282aabfb238e0fbacb570d5 SHA256 6f9e87816c5e4b6dd0e3d5995d51aae6919526d84095f6d98114c19a825045f3 +EBUILD opera-11.61.1236.ebuild 5482 RMD160 2cf1ec784eaa0d33c0f33a26fc4d923d4e2695fc SHA1 82ef0ab2ac80a9b9d5bfeb55dc40bd744e7b2788 SHA256 395e06a6ee5a1d814529707aebca846c9b8106d7f54256593ba8606cf060142b +EBUILD opera-11.61.1237.ebuild 5421 RMD160 a10ab7040731c3dd402ace5d0ad600e7bf067c72 SHA1 488f7bc56a92e699b616536948e6a7d87b215e4f SHA256 2d45d842fe60b0c5358605a384e4c03eced602df61be0201f23d7fa72726e759 +MISC ChangeLog 17991 RMD160 0c91ebb0ec92fbedb15fabb923edf66e538a95a9 SHA1 b05d21e4e1045e851fd886355769b8a62b93c6a4 SHA256 dfa4d1bded0cd7b124216bcba348d7f9137b78ea3e9eae3f467e904a930b8499 MISC ChangeLog-2010 112299 RMD160 e786fcfeb4ac57db285ff420ccd9705b7c1f298c SHA1 09aef1136180ae363fd3c6bdbd3eb27f996f80c5 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk8N1GMACgkQVWmRsqeSphM8mACfZbcpHWhsQ5JdgwDiZ06FwCeK -INUAnAhFbwZ/F8RK3xRYzRo6HdI2ri1F -=4Ixi +iEYEARECAAYFAk8QarIACgkQVWmRsqeSphM8xwCdEL/9hUZHHIaq11wa7jxl+iWF +EIIAn3avtH56MwnbvHLLoFMM5n6/wgZe +=ogg9 -----END PGP SIGNATURE----- diff --git a/www-client/opera/opera-11.61.1236.ebuild b/www-client/opera/opera-11.61.1236.ebuild new file mode 100644 index 000000000000..3de48938582a --- /dev/null +++ b/www-client/opera/opera-11.61.1236.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1236.ebuild,v 1.1 2012/01/13 17:32:28 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="~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="jason_${O_V}-${O_B}" +O_P="${PN}-${O_V}-${O_B}" +O_U="http://snapshot.opera.com/unix/" + +SRC_URI=" + 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 +} diff --git a/www-client/opera/opera-11.61.1237.ebuild b/www-client/opera/opera-11.61.1237.ebuild new file mode 100644 index 000000000000..e44cd28494a9 --- /dev/null +++ b/www-client/opera/opera-11.61.1237.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1237.ebuild,v 1.1 2012/01/13 17:32:28 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" +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="jason_${O_V}-1236" +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 ) +" + +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