Version bump <http://my.opera.com/desktopteam/blog/2010/06/08/more-bug-fixing>.
authorJeroen Roovers <jer@gentoo.org>
Tue, 8 Jun 2010 17:05:04 +0000 (17:05 +0000)
committerJeroen Roovers <jer@gentoo.org>
Tue, 8 Jun 2010 17:05:04 +0000 (17:05 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux i686

www-client/opera/ChangeLog
www-client/opera/Manifest
www-client/opera/opera-10.54_pre6340-r1.ebuild [deleted file]
www-client/opera/opera-10.60_pre6346.ebuild [deleted file]
www-client/opera/opera-10.60_pre6351.ebuild [moved from www-client/opera/opera-10.60_pre6344.ebuild with 97% similarity]

index 98d445d53efcbb537aae6d6ccfc96a970976b04d..3ff4003cd747eedb09bcb1ab994af3cb739b2722 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.484 2010/06/03 15:37:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.485 2010/06/08 17:05:04 jer Exp $
+
+*opera-10.60_pre6351 (08 Jun 2010)
+
+  08 Jun 2010; Jeroen Roovers <jer@gentoo.org>
+  -opera-10.54_pre6340-r1.ebuild, -opera-10.60_pre6344.ebuild,
+  -opera-10.60_pre6346.ebuild, +opera-10.60_pre6351.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2010/06/08/more-bug-fixing>.
 
 *opera-10.60_pre6347 (03 Jun 2010)
 *opera-10.60_pre6346 (03 Jun 2010)
index 20459cb59638f50221b47fbafb9edf98b96ece1c..7780a5e5985d8992d5d5c0e89fbfcf1e5ef1d4e6 100644 (file)
@@ -13,28 +13,18 @@ DIST opera-10.53-6330.i386.freebsd.tar.bz2 13234238 RMD160 6cf7e6e0b7570a5a5fbf7
 DIST opera-10.53-6330.i386.linux.tar.bz2 13175607 RMD160 f62028d1f23483188688a8d8e4a0fa6f1e613b27 SHA1 dda61ad91c9dba5561ab85bfc118bcf1a99dee44 SHA256 0be054ee8ba155cd8975f67dbf5e874a3d6566b9f8acdef0917cea7ba27bdcb7
 DIST opera-10.53-6330.ppc.linux.tar.bz2 13475840 RMD160 0f5fe941c7a8513835ecb86498c065e5162d20ae SHA1 42737fd4dc5b1695befef9466a089070a4b8cc5c SHA256 4528f9549e4fb0648872a28956f2fb66bebb69940a60dd61f87c726f0a859d0c
 DIST opera-10.53-6330.x86_64.linux.tar.bz2 14161882 RMD160 78cdc69f1c7a1757dcb59b8fd5bd893db7475a8e SHA1 4c58ef2ae4e36d2956b27599261b57d41583ffc0 SHA256 d415398dea5c7e943d052b5a86918dfa032b4ed2e725198bfe775e6b9b3d3ce0
-DIST opera-10.54-6340.i386.freebsd.tar.bz2 13296000 RMD160 90e2ca99f1d3d91b6065c49629268612c325c6ae SHA1 aefb6df804d255b2d76db6a850c6118b7acf4e9d SHA256 2eabe04f9989bd52092ce514a29986b30fb3631eea1fb62ffa607058aa93d3ac
-DIST opera-10.54-6340.i386.linux.tar.bz2 13278044 RMD160 8a54df28446dfd424565a3b907cd8160c9457c02 SHA1 a55180fcec8dd7d8a893e06ef84ba4ff20e67f84 SHA256 174b31b241242aa08859a1a0696963615d0b19cc49eb3720d4e402d41bc121e2
-DIST opera-10.54-6340.ppc.linux.tar.bz2 13583414 RMD160 f11fcefb09a2c466d8b5aa02f679e485a2522a0a SHA1 e1c52587700f152ec4a855f12056c1a84985e328 SHA256 8bf383fb3bc2a82cc4154527a98fb57057b60f223f7b987648c70a03d1d7ddd4
-DIST opera-10.54-6340.x86_64.linux.tar.bz2 14256069 RMD160 3f2d1c93951733e56227e3e1f1dac8f97d045ffb SHA1 87d9fffa6a75efc6ad5f8928828c3ef0a2554f9d SHA256 8cb4101d3934aa744a484a18795dd21f427a2a20b2d8134406a0b54d1ae414aa
-DIST opera-10.60-6344.i386.freebsd.tar.bz2 13369015 RMD160 5d09d1ec892bcc5f118204cc93e58ba25d0ff6c5 SHA1 7afd0e0ce386c425943ea0d7159637ed41c87179 SHA256 8fb7393ad3958f5d49942025dca66df8f0b956482e34376b32cb156a282a2735
-DIST opera-10.60-6344.i386.linux.tar.bz2 13370466 RMD160 9a08433a53501c82456ea2b9a0b95c802348cdd8 SHA1 f92beb2b1b07f0edec4b781c28fca2b41d48545a SHA256 7b00b77464c386df99b7c968a136d679697d7377091f00dd7d1f248a3c847348
-DIST opera-10.60-6344.ppc.linux.tar.bz2 13724746 RMD160 85b7403e9d742172598f235289e4735cc455e09d SHA1 f8c02c388e11e345de66495570e658b954b7e40c SHA256 72903fd52838873561202505eca35e9e04349c57cdb607518d3c97b3bda93d7a
-DIST opera-10.60-6344.x86_64.linux.tar.bz2 14380587 RMD160 5b5271d3adf15c5bb3a052bf7337cca27d74962c SHA1 78424a10a409f6e350c7bf4ff85413cd4985ab1f SHA256 a03f4d48df38dd3384c34f5475a3f01864f8adde22b8420a969fcda6fe831a6e
-DIST opera-10.60-6346.i386.freebsd.tar.bz2 13374170 RMD160 7c65c64610ddf353e679bca9e88039ce1dda1bc7 SHA1 372732781774dd479d6e863cf40b760d59c6b130 SHA256 14c67695319ac1f382b07fd38bfc68e6bff2a2644f2a27ae333f8389a1607af0
-DIST opera-10.60-6346.i386.linux.tar.bz2 13379803 RMD160 4372e50a13d1aaef4f78a79278c19f30a8feb3a1 SHA1 194dc51e2334cebebc7223044dc6d1330a7893ee SHA256 ecebf89f90fabfeb634876af9f168df22159b43bd8a0c2796a5d94bfc242cd83
-DIST opera-10.60-6346.ppc.linux.tar.bz2 13737320 RMD160 3a69eb73ab9a79886f872fd4e47bbb700add27c5 SHA1 d7e1cb2ef6b1ed09e060b48b5a0705381999de9e SHA256 b0744f78d063abe109e87bc4ba7709182a5e1c2935e05727208764b7e504d506
-DIST opera-10.60-6346.x86_64.linux.tar.bz2 14414976 RMD160 e3a0f1771e201b31d21dfdbaf32deba9be2088c6 SHA1 fe1eb28926d6eaf549f360b6dd9b33dbc905b349 SHA256 7806c6fab0cb461dc9945bca5bd8f3913caa95c7847655aff53f56e53039ea7e
 DIST opera-10.60-6347.i386.freebsd.tar.bz2 13372974 RMD160 e069b2b385f3f521fdb7bfbc46aac0a7fd45f342 SHA1 cd65854964cd9ec5922575c838b456d6b1c5cbf7 SHA256 150f391bb90f86daa6eeafcdfc97a53a399246e5bd5fddbaf2af84ff4d9e6add
 DIST opera-10.60-6347.i386.linux.tar.bz2 13383604 RMD160 431eeacc53e1e81b524ccebdf0ed2ba5c6af21c9 SHA1 8ee06ce971af2a209bcade2dab15d26badb3e104 SHA256 7f9dbf1fb301694c3a67df0b651fb95d869775477171ee1a4d911ced3c891fa7
 DIST opera-10.60-6347.ppc.linux.tar.bz2 13741230 RMD160 2b9a00c46de54a1926f21c32d9461e4fd536c04e SHA1 52427f21f0c4909baca238b29f0678a57a79d782 SHA256 caaaaf20639661345fc1ec8a2a71e5753fe75df1242a17697eca504ac42b337f
 DIST opera-10.60-6347.x86_64.linux.tar.bz2 14422846 RMD160 b40c0eb430afd143ca8ac4d25247810ee6b21c98 SHA1 82f877de6e12d292ac028968c00f56a6ce96164f SHA256 baf4d257d481dc7164dd2a1c2b5dece4ffbac38bbf9410f50ad6a009a2365ffa
+DIST opera-10.60-6351.i386.freebsd.tar.bz2 13378592 RMD160 55aebfea4015a2fb5270728b00269888a1857dfe SHA1 995bb25dd82a286443a4b05db794df1a654a24b6 SHA256 ffa27566f7c2fdcaf21dec22457460276cf126e1422a5a5a18a246f9efdec039
+DIST opera-10.60-6351.i386.linux.tar.bz2 13367999 RMD160 c1942fba81c1fc03d9a90d228fb003cc0ac844b3 SHA1 3910c4ef715bcf8eb49b864ad6c84aed7793a32f SHA256 f45cc40f6d116aceaa14c2c37ca2b233f1d96268567658cb07dcb20a5fae478c
+DIST opera-10.60-6351.ppc.linux.tar.bz2 13703547 RMD160 3cce53d0d1193524df6380c3f97207083be1bca4 SHA1 d67321a59798abcdec0b29689b281a4228d5d2a5 SHA256 49595a4a895dd9faa42ceadb5fcd88074240f4865af24f1a1f8a1cd56c4791a4
+DIST opera-10.60-6351.x86_64.linux.tar.bz2 14386087 RMD160 e9d24c6a2c06820f1fcc4de4aa88e8af5af1fdf7 SHA1 773e9422db7257d915fde69b4bd083ee21c2080a SHA256 270897c1b5dab5d7e96516647aa78edf65729ee5461c1887cb01b0c0465ab9b6
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.53_pre6330-r2.ebuild 4773 RMD160 db11da60763d64681347802d6cb9d34b81e2eeed SHA1 51b73ddd3939cdeb29ecb1a03922f263ce4b092d SHA256 67ab337ffb5a4ed072a206b01814f45de2d7588042d4e4f85533d520a591048e
-EBUILD opera-10.54_pre6340-r1.ebuild 4872 RMD160 279d2b490eee587d06f27b7673804aa4435d4624 SHA1 72ac639230eadf34be9db5235f0c54170841e1e1 SHA256 3f12096d1f3b3fcc79117a99391b49581e62ec895a73547e714200869aca4cda
-EBUILD opera-10.60_pre6344.ebuild 4856 RMD160 40535d5411d8ffc3dbd013bb436e3adb61d36f47 SHA1 eb3fce046a7581be3ff7bd221d6cd63b87659ca0 SHA256 15db21e3b3fbf491ff51703b423b1f00794e731c63e7b7448744b34bba168921
-EBUILD opera-10.60_pre6346.ebuild 4867 RMD160 fc73204d816f55721d3b958dd887e010a3ec7dcd SHA1 7095fed16dcdd480af0fc7f7670df32cd9be1c14 SHA256 cc3842b37d1f8c32169704eeedede794d4bb3b157950d56810233007d0e56f74
 EBUILD opera-10.60_pre6347.ebuild 4867 RMD160 645c75f6a5be2c2a12a2577ef019e4833bb0c301 SHA1 a4a7d7f950f2b851474fc7577bd6cb5c0829b66c SHA256 5bfdf3d9c276597763f23f3cdeeffb4771afc066a3a678274fa6ecd9f7fe2682
-MISC ChangeLog 94284 RMD160 d4351f8b4b30586c068582374e27f9b25a88c555 SHA1 02cb2d4e1be36bf85a99500a848f13746a03e035 SHA256 55610bda6b31c768a013a2581ea9e818677887400a0ffe5a63259e2edcc736f9
+EBUILD opera-10.60_pre6351.ebuild 4867 RMD160 0938068c367db018c6c821cefed4b84402b60c96 SHA1 dbe6c479d2606a5c87ba241322ebbb2d86b6e322 SHA256 66335241dca81660e10a59f3e82236866363d9b427a840f6b1ffe128e11aba11
+MISC ChangeLog 94575 RMD160 3817714017fc8bdc4eb0779e9d57c40941f5f6e9 SHA1 68a51ff2b00bec7466cce38eefb8e17310f7670e SHA256 9004beb426ac94519804287c368d878c707b917fc461f740f02399911fc6483b
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
diff --git a/www-client/opera/opera-10.54_pre6340-r1.ebuild b/www-client/opera/opera-10.54_pre6340-r1.ebuild
deleted file mode 100644 (file)
index e9da7a5..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6340-r1.ebuild,v 1.1 2010/05/26 20:27:42 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde"
-
-RESTRICT="mirror test"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-MY_LINGUAS="
-       be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
-       ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
-       zh-TW
-"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-       IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${PV/*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-       amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
-       ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
-       x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
-       x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
-"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-       gtk? (
-               =x11-libs/gtk+-2*
-               dev-libs/atk
-               dev-libs/glib
-               media-libs/glitz
-               media-libs/libpng
-               x11-libs/cairo
-               x11-libs/pango
-               x11-libs/pixman
-       )
-       kde? (
-               kde-base/kdelibs
-       )
-       dev-libs/expat
-       media-libs/fontconfig
-       media-libs/freetype
-       media-plugins/gst-plugins-meta
-       sys-apps/util-linux
-       sys-libs/zlib
-       virtual/opengl
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libXcomposite
-       x11-libs/libXcursor
-       x11-libs/libXdamage
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXi
-       x11-libs/libXmu
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libxcb
-       x11-libs/xcb-util
-       "
-
-opera_linguas() {
-       # Remove unwanted LINGUAS:
-       local LINGUA
-       local LNGDIR="${D}usr/share/${PN}/locale"
-       einfo "Keeping these locales: ${LINGUAS}."
-       for LINGUA in ${MY_LINGUAS}; do
-               if ! use linguas_${LINGUA/-/_}; then
-                       LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-                       rm -r "${LINGUA}"
-               fi
-       done
-}
-
-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}
-       if [[ ! -d ${S} ]]; then
-               cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-               S="$(pwd)"
-               einfo "Setting WORKDIR to ${S}"
-       fi
-}
-
-src_install() {
-       # Remove "license directory" (bug #315473)
-       rm -rf "share/doc/opera"
-
-       # 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"
-
-       # Unzip the man pages before sedding
-       gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
-
-       # Replace PREFIX and SUFFIX in various files
-       sed -i \
-               -e "s:@@{PREFIX}:/usr:g" \
-               -e "s:@@{SUFFIX}::g" \
-               -e "s:@@{_SUFFIX}::g" \
-               -e "s:@@{USUFFIX}::g" \
-               "${D}"/usr/share/mime/packages/opera-widget.xml \
-               "${D}"/usr/share/man/man1/* \
-               "${D}"/usr/share/applications/opera-browser.desktop \
-               "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
-
-       # Sed libdir in opera script
-       sed "${FILESDIR}"/opera \
-               -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
-               || die "sed opera script failed"
-
-       # Sed libdir in defaults/pluginpath.ini
-       sed -i \
-               -e "s|/usr/lib32|${OPREFIX}|g" \
-               "${D}"/usr/share/opera/defaults/pluginpath.ini \
-               || die "sed pluginpath.ini failed"
-
-       # Install startup scripts
-       dobin ${PN} ${PN}-widget-manager || die "dobin failed"
-
-       # Stop revdep-rebuild from checking opera binaries
-       dodir /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
-
-       # Change libz.so.3 to libz.so.1 for gentoo/freebsd
-       if use elibc_FreeBSD; then
-               scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${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 -e 's/libz\.so\.3/libz.so.1/g' "$i"
-               done
-               [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-       fi
-
-       [[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-       elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-       elog "[General] tab, click on [Details...] then [Choose...] and point the"
-       elog "file chooser at /usr/share/opera/locale/, then enter the"
-       elog "directory for the language you want and [Open] the .lng file."
-
-       if use elibc_FreeBSD; then
-               elog
-               elog "To improve shared memory usage please set:"
-               elog "$ sysctl kern.ipc.shm_allow_removed=1"
-       fi
-}
diff --git a/www-client/opera/opera-10.60_pre6346.ebuild b/www-client/opera/opera-10.60_pre6346.ebuild
deleted file mode 100644 (file)
index cec39d8..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6346.ebuild,v 1.1 2010/06/03 15:37:09 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde"
-
-RESTRICT="mirror test"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-MY_LINGUAS="
-       be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
-       ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
-       zh-TW
-"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-       IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/20039_${PV/_pre/-}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-       amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
-       ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
-       x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
-       x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
-"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-       gtk? (
-               =x11-libs/gtk+-2*
-               dev-libs/atk
-               dev-libs/glib
-               media-libs/glitz
-               media-libs/libpng
-               x11-libs/cairo
-               x11-libs/pango
-               x11-libs/pixman
-       )
-       kde? (
-               kde-base/kdelibs
-       )
-       dev-libs/expat
-       media-libs/fontconfig
-       media-libs/freetype
-       media-plugins/gst-plugins-meta
-       sys-apps/util-linux
-       sys-libs/zlib
-       virtual/opengl
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libXcomposite
-       x11-libs/libXcursor
-       x11-libs/libXdamage
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXi
-       x11-libs/libXmu
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libxcb
-       x11-libs/xcb-util
-       "
-
-opera_linguas() {
-       # Remove unwanted LINGUAS:
-       local LINGUA
-       local LNGDIR="${D}usr/share/${PN}/locale"
-       einfo "Keeping these locales: ${LINGUAS}."
-       for LINGUA in ${MY_LINGUAS}; do
-               if ! use linguas_${LINGUA/-/_}; then
-                       LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-                       rm -r "${LINGUA}"
-               fi
-       done
-}
-
-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}
-       if [[ ! -d ${S} ]]; then
-               cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-               S="$(pwd)"
-               einfo "Setting WORKDIR to ${S}"
-       fi
-}
-
-src_install() {
-       # Remove "license directory" (bug #315473)
-       rm -rf "share/doc/opera"
-
-       # 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"
-
-       # Unzip the man pages before sedding
-       gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
-
-       # Replace PREFIX and SUFFIX in various files
-       sed -i \
-               -e "s:@@{PREFIX}:/usr:g" \
-               -e "s:@@{SUFFIX}::g" \
-               -e "s:@@{_SUFFIX}::g" \
-               -e "s:@@{USUFFIX}::g" \
-               "${D}"/usr/share/mime/packages/opera-widget.xml \
-               "${D}"/usr/share/man/man1/* \
-               "${D}"/usr/share/applications/opera-browser.desktop \
-               "${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
-
-       # Sed libdir in opera script
-       sed "${FILESDIR}"/opera \
-               -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
-               || die "sed opera script failed"
-
-       # Sed libdir in defaults/pluginpath.ini
-       sed -i \
-               -e "s|/usr/lib32|${OPREFIX}|g" \
-               "${D}"/usr/share/opera/defaults/pluginpath.ini \
-               || die "sed pluginpath.ini failed"
-
-       # Install startup scripts
-       dobin ${PN} ${PN}-widget-manager || die "dobin failed"
-
-       # Stop revdep-rebuild from checking opera binaries
-       dodir /etc/revdep-rebuild
-       echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
-
-       # Change libz.so.3 to libz.so.1 for gentoo/freebsd
-       if use elibc_FreeBSD; then
-               scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${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 -e 's/libz\.so\.3/libz.so.1/g' "$i"
-               done
-               [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-       fi
-
-       [[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-       elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-       elog "[General] tab, click on [Details...] then [Choose...] and point the"
-       elog "file chooser at /usr/share/opera/locale/, then enter the"
-       elog "directory for the language you want and [Open] the .lng file."
-
-       if use elibc_FreeBSD; then
-               elog
-               elog "To improve shared memory usage please set:"
-               elog "$ sysctl kern.ipc.shm_allow_removed=1"
-       fi
-}
similarity index 97%
rename from www-client/opera/opera-10.60_pre6344.ebuild
rename to www-client/opera/opera-10.60_pre6351.ebuild
index 78b174b2efd36cca51763aee8c13639834fbe08a..de48a68ef92048a651b59563fc7eb8fdcecafd3e 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6344.ebuild,v 1.1 2010/05/31 14:32:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6351.ebuild,v 1.1 2010/06/08 17:05:04 jer Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ for MY_LINGUA in ${MY_LINGUAS}; do
        IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
 done
 
-O_U="http://snapshot.opera.com/unix/10.60a1/"
+O_U="http://snapshot.opera.com/unix/18583_${PV/_pre/-}/"
 O_P="${P/_pre/-}"
 
 SRC_URI="