Set proper libdir in /usr/share/opera/defaults/pluginpath.ini thanks to Henning Schil...
authorJeroen Roovers <jer@gentoo.org>
Wed, 26 May 2010 20:27:42 +0000 (20:27 +0000)
committerJeroen Roovers <jer@gentoo.org>
Wed, 26 May 2010 20:27:42 +0000 (20:27 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux i686

www-client/opera/ChangeLog
www-client/opera/Manifest
www-client/opera/opera-10.53_pre6330-r2.ebuild [moved from www-client/opera/opera-10.53_pre6330-r1.ebuild with 95% similarity]
www-client/opera/opera-10.54_pre6340-r1.ebuild [moved from www-client/opera/opera-10.54_pre6336-r1.ebuild with 95% similarity]
www-client/opera/opera-10.54_pre6340.ebuild [deleted file]

index d84413469fa70a4967f3c51256f22dc385c6af55..c2c659265f3d2df1a6a8344f669f67a1c81a912b 100644 (file)
@@ -1,6 +1,16 @@
 # 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.481 2010/05/21 17:18:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.482 2010/05/26 20:27:42 jer Exp $
+
+*opera-10.54_pre6340-r1 (26 May 2010)
+*opera-10.53_pre6330-r2 (26 May 2010)
+
+  26 May 2010; Jeroen Roovers <jer@gentoo.org>
+  -opera-10.53_pre6330-r1.ebuild, +opera-10.53_pre6330-r2.ebuild,
+  -opera-10.54_pre6336-r1.ebuild, -opera-10.54_pre6340.ebuild,
+  +opera-10.54_pre6340-r1.ebuild:
+  Set proper libdir in /usr/share/opera/defaults/pluginpath.ini thanks to
+  Henning Schild (bug #321471).
 
 *opera-10.54_pre6340 (21 May 2010)
 
index 0bce4433156c3c5921581f190b34ef0f992b9b78..c3c2ac39cc0f3c058adce38df0101dbc2ae59e6b 100644 (file)
@@ -13,18 +13,13 @@ 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-6336.i386.freebsd.tar.bz2 13299174 RMD160 837a17959df5cf71c9b64a44bbc6d8f322d5ed19 SHA1 d07682ae85c5b9531686d58fde66cb1ca2459d5a SHA256 6191a05b3acf26addd8a345bc5d917ad95effe2ed30c13b5154575383a81b530
-DIST opera-10.54-6336.i386.linux.tar.bz2 13268671 RMD160 5470d627638bfaa0a3ed9ab7b69557dcfe69f946 SHA1 8f7c3edd575c6e79b60c69e1fe3a6bb09e808c85 SHA256 70b3ae27599b09a9edb0ffe4f6985424728a84c966fe7f8e63bffc2bd5042c5c
-DIST opera-10.54-6336.ppc.linux.tar.bz2 13576807 RMD160 df632c494fcf1968ca425321d092137fb2358ff0 SHA1 e372aa7d574dea1c6cfbcc1d73e00e44a8f04939 SHA256 7ac29643f67aa1b15798a5f4a945be04729415387be3b701933306985a20f3a0
-DIST opera-10.54-6336.x86_64.linux.tar.bz2 14239967 RMD160 5fb6d0c4682e8584acb531f47bc5b4da1af897e1 SHA1 744be6c1c401d9d0e4d541dbe5e2eb9907b1e542 SHA256 a7fa219e7d0098f4d8fce7e687d287b7de9a2f7ae951e93e017ef64a80d8d28c
 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
 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-r1.ebuild 4598 RMD160 0f0c884992a7ab4e38e083927128356564bce117 SHA1 fb40b1f66ea4f5e3353728e33424d92a544c4ec9 SHA256 ea9515c2abee597a995e777ecce79df8311bea5db0f7fb48af2bca81508aa48c
-EBUILD opera-10.54_pre6336-r1.ebuild 4697 RMD160 02f59b2364041358d7b2805afe5ab65ed3595495 SHA1 a956e3a62438c3a32ab8a06ffe91504a2e0bf88a SHA256 7224cb209020d2c40c8537d38155775c3b6abc3bc1ee51335f0e7c4578489a88
-EBUILD opera-10.54_pre6340.ebuild 4694 RMD160 0242c7829fa9515464ded20d892f1bf9042b9cf4 SHA1 3cabd3526ddabf7c641b375010d12e5fb797f415 SHA256 f2727ee041992289ef6d7e933fca65a6b30927c52d9c9b55c09927cb602f08b4
-MISC ChangeLog 93336 RMD160 7eac6ab14dea25587454805101e12f8e0a359633 SHA1 dd1f927d8b391c013cabd4f5a660a8fd91e8ff3e SHA256 849ae1620f392bc8e083237cf9d2bdc54d70f872e5f00174c0abab86ee3b9966
+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
+MISC ChangeLog 93730 RMD160 15ee092dc42e66be18355fef484a280d0c69c7e0 SHA1 8f7a191be363244ccdecd56f82c4a988ab211706 SHA256 0835ce2979d65ab741742b12a50fbebad4c9d1e18d9eb3abdebda63f34d7a28d
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
similarity index 95%
rename from www-client/opera/opera-10.53_pre6330-r1.ebuild
rename to www-client/opera/opera-10.53_pre6330-r2.ebuild
index cafcb923f17a395cc8c9743e9d7273982ff42959..6b98047a30b30bbb21f3d63e46b3de8f6eaa6f6b 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.53_pre6330-r1.ebuild,v 1.2 2010/05/18 15:59:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.53_pre6330-r2.ebuild,v 1.1 2010/05/26 20:27:42 jer Exp $
 
 EAPI="2"
 
@@ -137,6 +137,12 @@ src_install() {
                -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"
 
similarity index 95%
rename from www-client/opera/opera-10.54_pre6336-r1.ebuild
rename to www-client/opera/opera-10.54_pre6340-r1.ebuild
index 0c81b2e2247c9b47e87ec8bed4d8bf5d5e01562c..e9da7a554b59d2af472109cc0771037af2de840b 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.54_pre6336-r1.ebuild,v 1.6 2010/05/20 19:24:19 jer Exp $
+# $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"
 
@@ -143,6 +143,12 @@ src_install() {
                -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"
 
diff --git a/www-client/opera/opera-10.54_pre6340.ebuild b/www-client/opera/opera-10.54_pre6340.ebuild
deleted file mode 100644 (file)
index 13aca90..0000000
+++ /dev/null
@@ -1,181 +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.ebuild,v 1.1 2010/05/21 17:18: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/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"
-
-       # 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
-}