From: Jeroen Roovers Date: Wed, 11 Apr 2007 13:37:22 +0000 (+0000) Subject: Version bump (fixing bugs #173505 and #168484). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6462e8151e3e8f4821894dc5e1cb19f83c988ad9;p=gentoo.git Version bump (fixing bugs #173505 and #168484). Package-Manager: portage-2.1.2.2 --- diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index be6b7095b370..1682d35c539f 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/opera # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.81 2007/04/05 04:52:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.82 2007/04/11 13:37:22 jer Exp $ + +*opera-9.20 (11 Apr 2007) + + 11 Apr 2007; Jeroen Roovers +opera-9.20.ebuild: + Version bump (fixing bugs #173505 and #168484). 05 Apr 2007; Jeroen Roovers opera-9.10.ebuild: Patch from Toffanin for x86-fbsd (bug #171841). diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index edac1fce288a..9d0379033a08 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -16,14 +16,24 @@ DIST opera-9.10-20061214.1-static-qt.ppc-en.tar.bz2 6768592 RMD160 6b570dc360aff DIST opera-9.10-20061214.1-static-qt.sparc-en.tar.bz2 6665822 RMD160 70d3fb8119105b6c8ab033de0647a1810e225aed SHA1 3f567849ce6c28b9872f02c2cd348046a15ef073 SHA256 72412222538de10be2764c391bfb11a087b2a50a110cbe84f690513e81303c92 DIST opera-9.10-20061214.4-shared-qt.i386.freebsd-en.tar.bz2 5070029 RMD160 89455be5dca73a536d1bd4f74f6f0088fde0807e SHA1 0cd5b4e0782a6b1bfd53b2e3e807374571d36cf8 SHA256 eef25201c0c45d6ff5eae4739844dc9ef624cea8d7e9f9809506a9789f2cb7e4 DIST opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2 5141554 RMD160 e7ffc8a1773a8e803263deae03ab3954d317b62b SHA1 a66caf047b19a58174f6dd17065fbecc3f71fb07 SHA256 df88e002895c01e7ac34cc52378f2234ae95a606c87d57470eae04c805764785 +DIST opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435 RMD160 b2d4d0791ea63a3727e7cfa708d2b2833a0972f7 SHA1 04163b6dc56cc2ac9e6d78e50cfd7971e2f9e371 SHA256 4ea0e5d407e11e3df247a643412eac19962c923177f2f22c23566a776dc8945f +DIST opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395 RMD160 d7063b7a7da24d8b18b175511f500e15f0614a4e SHA1 37b5e2a3673cf6cbe4ae5060d94fe21b6de522c2 SHA256 434dadf22984dea89a08a850da8a1359f4e89b963509270da680ea348a9ebc35 +DIST opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346 RMD160 af7f1d4fe9d1337621b2b6e1b22b42b1d70294a8 SHA1 c1b4c153cb909bae8c2071d55676a6741b539e56 SHA256 2300c15a76faa728fd6d90232df586f06a052715bafe1851aac920606e2849c2 +DIST opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208 RMD160 4c9ccb4a84d875c76dd34ba936b2a5eb2d0b8dc4 SHA1 0265412de769b40319ec312eda2f6e5b210bfe56 SHA256 5b7c588345006c6b610ecb4e483335fa6962cb5756d58fbba4004a69e13b7f3c +DIST opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848 RMD160 b6334db5e7cfd551d03d9709d55ecb62fbbb4d54 SHA1 f92b522ea36e26edabc3c0125924bd762ffabd6e SHA256 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41 +DIST opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714 RMD160 c2bea2262311a4689fac12b94eb429102807acd2 SHA1 251c6bb5a0db01b6900c89ce80e09081a79ffe8d SHA256 31232712ac42928288f3042c51bf258da6be1af0168d45a8f5969addd1655c83 EBUILD opera-9.10.ebuild 5040 RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b SHA1 4fc31b1bbf768e859b1353a0ba5047ef258e5dd8 SHA256 5b0ebd67ac24e765eec5d0b2ead87a7baf76b3f371a6fe3778830bedaaf239e9 MD5 e2e73cc0b2f13e2938a948d54439b57b opera-9.10.ebuild 5040 RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b opera-9.10.ebuild 5040 SHA256 5b0ebd67ac24e765eec5d0b2ead87a7baf76b3f371a6fe3778830bedaaf239e9 opera-9.10.ebuild 5040 -MISC ChangeLog 24956 RMD160 ff49e8778f2e1fb4bbfb746afab497e869e76d67 SHA1 35d52f24d7522035c44d33069333539113c42a79 SHA256 6502936b68069c235e732260405bf9279bd120c9473d33e40af5972bb5e6947a -MD5 e71939ca4b87c69ddb7a8150d7ff0811 ChangeLog 24956 -RMD160 ff49e8778f2e1fb4bbfb746afab497e869e76d67 ChangeLog 24956 -SHA256 6502936b68069c235e732260405bf9279bd120c9473d33e40af5972bb5e6947a ChangeLog 24956 +EBUILD opera-9.20.ebuild 5044 RMD160 1a54c670f352b63dfd5cf5888a4ff4e8f7c45d7d SHA1 1ec9bfc225b3739cab3cdd09f74b0de26e8d8704 SHA256 d0abfb74b7d31aab543a7ad9a5779522e81594dfc73d7d2f362422eba612e772 +MD5 19d0f03a2496247de612eea361c46567 opera-9.20.ebuild 5044 +RMD160 1a54c670f352b63dfd5cf5888a4ff4e8f7c45d7d opera-9.20.ebuild 5044 +SHA256 d0abfb74b7d31aab543a7ad9a5779522e81594dfc73d7d2f362422eba612e772 opera-9.20.ebuild 5044 +MISC ChangeLog 25101 RMD160 7367b4dd5f59bd429e8750862910e1fd7f8e64ba SHA1 f5c2492cc743f87cae087b5b57afc20c9bfea3e9 SHA256 5e36caab3a9779940d8b72995e389240dacc600ee21f6e59cd75b77ce98add2a +MD5 4e79e29cc59c5e440f997ead2d5a1073 ChangeLog 25101 +RMD160 7367b4dd5f59bd429e8750862910e1fd7f8e64ba ChangeLog 25101 +SHA256 5e36caab3a9779940d8b72995e389240dacc600ee21f6e59cd75b77ce98add2a ChangeLog 25101 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314 @@ -31,3 +41,6 @@ SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8 metadata MD5 91c1c6f603acd417e0838501d3bdf023 files/digest-opera-9.10 1998 RMD160 562e1dfa4a5ffdff9252df5d4e1a3ea529224a3b files/digest-opera-9.10 1998 SHA256 aa4af149ddf2a7d58c7089756e5616687cde714c6fadc0b4c3572da5de3289c9 files/digest-opera-9.10 1998 +MD5 f2f96e9fb4cbf8d8fb5ada1b447238d2 files/digest-opera-9.20 1998 +RMD160 a5ee69aa49105718ccbaba3a73e2166a16f7db9c files/digest-opera-9.20 1998 +SHA256 80936f89483d2f8dff6cf50325712076ba40645fd637a6a1e1686ae99fdf4fa8 files/digest-opera-9.20 1998 diff --git a/www-client/opera/files/digest-opera-9.20 b/www-client/opera/files/digest-opera-9.20 new file mode 100644 index 000000000000..499f0e89936a --- /dev/null +++ b/www-client/opera/files/digest-opera-9.20 @@ -0,0 +1,18 @@ +MD5 dd5365a5ca0f31b373deafdb80a17ac7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435 +RMD160 b2d4d0791ea63a3727e7cfa708d2b2833a0972f7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435 +SHA256 4ea0e5d407e11e3df247a643412eac19962c923177f2f22c23566a776dc8945f opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435 +MD5 21892c3663f9ce73719045de65bcd259 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395 +RMD160 d7063b7a7da24d8b18b175511f500e15f0614a4e opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395 +SHA256 434dadf22984dea89a08a850da8a1359f4e89b963509270da680ea348a9ebc35 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395 +MD5 cc5be6d9ec178eb7cb02bc20e0238c26 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346 +RMD160 af7f1d4fe9d1337621b2b6e1b22b42b1d70294a8 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346 +SHA256 2300c15a76faa728fd6d90232df586f06a052715bafe1851aac920606e2849c2 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346 +MD5 43c9cc58c26979db270f05141ee7cc99 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208 +RMD160 4c9ccb4a84d875c76dd34ba936b2a5eb2d0b8dc4 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208 +SHA256 5b7c588345006c6b610ecb4e483335fa6962cb5756d58fbba4004a69e13b7f3c opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208 +MD5 ae34b8fde421b3d27b9090ec0ad6fb17 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848 +RMD160 b6334db5e7cfd551d03d9709d55ecb62fbbb4d54 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848 +SHA256 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848 +MD5 3d4b6805d97f72f104a4d1dfe4c61f62 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714 +RMD160 c2bea2262311a4689fac12b94eb429102807acd2 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714 +SHA256 31232712ac42928288f3042c51bf258da6be1af0168d45a8f5969addd1655c83 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714 diff --git a/www-client/opera/opera-9.20.ebuild b/www-client/opera/opera-9.20.ebuild new file mode 100644 index 000000000000..2d8a2ed9cd74 --- /dev/null +++ b/www-client/opera/opera-9.20.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.20.ebuild,v 1.1 2007/04/11 13:37:22 jer Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Opera web browser." +HOMEPAGE="http://www.opera.com" + +SLOT="0" +LICENSE="OPERA-9.0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" + +IUSE="qt-static spell gnome" +RESTRICT="strip mirror" + +OPERALNG="en" +OPERASUFF="638" +OPERAVER="9.20-20070409" +OPERAFTPDIR="920/final/${OPERALNG}" + +OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/" +SRC_URI=" + x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) ) + x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) ) + amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) ) + amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) ) + sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}.tar.bz2 ) + ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 ) + x86-fbsd? ( !qt-static? ( mirror://opera/unix/freebsd/${OPERAFTPDIR}/shared/opera-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) ) + x86-fbsd? ( qt-static? ( mirror://opera/unix/freebsd/${OPERAFTPDIR}/static/opera-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) )" + +DEPEND=">=sys-apps/sed-4 + amd64? ( sys-apps/setarch )" + +RDEPEND="|| ( ( x11-libs/libXrandr + x11-libs/libXp + x11-libs/libXmu + x11-libs/libXi + x11-libs/libXft + x11-libs/libXext + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE + ) + virtual/x11 + ) + >=media-libs/fontconfig-2.1.94-r1 + amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs ) + !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) ) + !amd64? ( media-libs/libexif + spell? ( app-text/aspell ) + x86? ( !qt-static? ( =x11-libs/qt-3* ) ) + media-libs/jpeg )" + +S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF} + +src_unpack() { + unpack ${A} + cd ${S} + epatch "${FILESDIR}/${PN}-9.00-install.patch" + sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \ + -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \ + -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \ + -e "s:/usr/share/icons:${D}/usr/share/icons:g" \ + -e "s:/etc/X11:${D}/etc/X11:g" \ + -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \ + -e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \ + -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \ + -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \ + -e 's:read str_answer:return 0:' \ + -e "s:/opt/kde:${D}/usr/kde:" \ + -e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \ + install.sh || die +} + +src_compile() { + true +} + +src_install() { + # Prepare installation directories for Opera's installer script. + dodir /etc + + # Opera's native installer. + if [ ${ARCH} = "amd64" ]; then + linux32 ./install.sh --prefix="${D}"/opt/opera || die + else + ./install.sh --prefix="${D}"/opt/opera || die + fi + + # java workaround + sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' ${D}/opt/opera/bin/opera + + dosed /opt/opera/bin/opera + dosed /opt/opera/share/opera/java/opera.policy + + # Install the icons + insinto /usr/share/pixmaps + doins images/opera.xpm + for res in 16x16 22x22 32x32 48x48 ; do + insinto /usr/share/icons/hicolor/${res}/apps/ + newins images/opera_${res}.png opera.png + done + + # Install the menu entry + insinto /usr/share/applications + doins ${FILESDIR}/opera.desktop + + # Install a symlink /usr/bin/opera + dodir /usr/bin + dosym /opt/opera/bin/opera /usr/bin/opera + + # fix plugin path + echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc + + # enable spellcheck + if use spell; then + if use qt-static; then + DIR=$OPERAVER.1 + else + use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5 + fi + echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini + fi + + dodir /etc/revdep-rebuild + echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/revdep-rebuild/90opera + + # Change libz.so.3 to libz.so.1 for gentoo/freebsd + if [ ${ARCH} = "x86-fbsd" ]; then + scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${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 +} + +pkg_postinst() { + use gnome && gnome2_pkg_postinst + + elog "For localized language files take a look at:" + elog "http://www.opera.com/download/languagefiles/index.dml?platform=linux" + elog + elog "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini" + elog "and emerge app-dicts/aspell-language." +} + + +pkg_postrm() { + use gnome && gnome2_pkg_postrm +}