summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-03-15 13:10:18 +0000
committerJeroen Roovers <jer@gentoo.org>2012-03-15 13:10:18 +0000
commit6aa11a2417b4fd41841081bd4d00bfe3186774cf (patch)
tree040bc3968be877bbcf26c9c7ad770c2bd8d95957 /www-client/opera
parentStable on amd64 and x86 wrt bug#408347. (diff)
downloadgentoo-2-6aa11a2417b4fd41841081bd4d00bfe3186774cf.tar.gz
gentoo-2-6aa11a2417b4fd41841081bd4d00bfe3186774cf.tar.bz2
gentoo-2-6aa11a2417b4fd41841081bd4d00bfe3186774cf.zip
http://my.opera.com/desktopteam/blog/2012/03/15/thursday-11-62-update
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'www-client/opera')
-rw-r--r--www-client/opera/ChangeLog8
-rw-r--r--www-client/opera/opera-11.62.1309.ebuild218
-rw-r--r--www-client/opera/opera-11.62.1332.ebuild (renamed from www-client/opera/opera-11.62.1307.ebuild)7
3 files changed, 11 insertions, 222 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index de49f05c50da..94aca12bc4db 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
# 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.699 2012/03/09 12:50:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.700 2012/03/15 13:10:18 jer Exp $
+
+*opera-11.62.1332 (15 Mar 2012)
+
+ 15 Mar 2012; Jeroen Roovers <jer@gentoo.org> -opera-11.62.1307.ebuild,
+ -opera-11.62.1309.ebuild, +opera-11.62.1332.ebuild:
+ http://my.opera.com/desktopteam/blog/2012/03/15/thursday-11-62-update
*opera-11.62.1327 (09 Mar 2012)
diff --git a/www-client/opera/opera-11.62.1309.ebuild b/www-client/opera/opera-11.62.1309.ebuild
deleted file mode 100644
index 0d3f2733c166..000000000000
--- a/www-client/opera/opera-11.62.1309.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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.62.1309.ebuild,v 1.1 2012/02/23 15:29: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://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="torsdag_${O_V}-1307"
-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}/opera*
-}
-
-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.62.1307.ebuild b/www-client/opera/opera-11.62.1332.ebuild
index aead3b43e8ff..b4a80eed7abf 100644
--- a/www-client/opera/opera-11.62.1307.ebuild
+++ b/www-client/opera/opera-11.62.1332.ebuild
@@ -1,6 +1,6 @@
# 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.62.1307.ebuild,v 1.1 2012/02/23 15:29:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.62.1332.ebuild,v 1.1 2012/03/15 13:10:18 jer Exp $
EAPI="4"
@@ -11,17 +11,18 @@ HOMEPAGE="http://www.opera.com/"
SLOT="0"
LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~x86 ~x86-fbsd"
+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="torsdag_${O_V}-${O_B}"
+O_D="nymphicushollandicus_${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 )
"