add security revision, bug #74076

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index dcf32f2f8909b63fa5dbd1784b2f3a99a3ea441e..916b211678c451fdff8aa1c6b5543967f77d9883 100644 (file)
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.86 2004/12/05 10:34:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.87 2004/12/13 12:50:01 lanius Exp $
+
+*opera-7.54-r1 (13 Dec 2004)
+
+  13 Dec 2004; lanius@gentoo.org +opera-7.54-r1.ebuild:
+  add security revision, bug #74076
 
   05 Dec 2004; lanius@gentoo.org opera-7.60_alpha4.ebuild:
   fix src_uri for amd64

diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 65bdff149428b29efa31ecedef94a2894a092b0d..ced02993b99808bcbc317d08425de4629aa401f1 100644 (file)
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,7 +1,9 @@
 MD5 b9b38aab6a2fa717ee18b089dd2a4a48 opera-7.60_alpha4.ebuild 3955
 MD5 fe11763302728a8146c30c11ee88d0fd opera-7.54.ebuild 4905
-MD5 645ac3e169f0a5c8619b9b446f0eba84 ChangeLog 13857
+MD5 893b3162e7cd0aa58128a0e12b33ac78 opera-7.54-r1.ebuild 4905
+MD5 c0373c5d4cf7493b45113b8e64af0e7f ChangeLog 13980
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 0bb743783b49ab8cfc992cce68a57129 files/digest-opera-7.54 372
 MD5 1017258128c35d96ee187880d7d56b77 files/digest-opera-7.60_alpha4 466
+MD5 fd3a3140488e36606b9f45f45d2ae428 files/digest-opera-7.54-r1 372
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135

diff --git a/net-www/opera/files/digest-opera-7.54-r1 b/net-www/opera/files/digest-opera-7.54-r1
new file mode 100644 (file)
index 0000000..b9eee7b
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.54-r1
@@ -0,0 +1,4 @@
+MD5 fcf99a5dd13ef6fbb7494992a05bd0ea opera-7.54-20041210.1-static-qt.i386-en.tar.bz2 4880472
+MD5 98a000472a45bd175061aee68c2371d8 opera-7.54-20041210.5-shared-qt.i386-en.tar.bz2 3679750
+MD5 9ddaa675f622ffc18149adb4e91976ef opera-7.54-20041210.1-static-qt.ppc-en.tar.bz2 4927010
+MD5 31726ea7c4f932b96ba51b327e6fa63f opera-7.54-20041210.1-static-qt.sparc-en.tar.bz2 4872683

diff --git a/net-www/opera/opera-7.54-r1.ebuild b/net-www/opera/opera-7.54-r1.ebuild
new file mode 100644 (file)
index 0000000..556d3b0
--- /dev/null
+++ b/net-www/opera/opera-7.54-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.54-r1.ebuild,v 1.1 2004/12/13 12:50:01 lanius Exp $
+
+IUSE="static spell"
+
+OPERAVER="7.54-20041210"
+OPERAFTPDIR="754u1"
+
+S=${WORKDIR}/${A/.tar.bz2/}
+
+DESCRIPTION="Opera web browser."
+HOMEPAGE="http://www.opera.com/linux/"
+
+# that's an ugly workaround for the broken src_uri syntax
+SRC_URI="
+       x86? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+       x86? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+       amd64? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
+       ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
+       sparc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
+
+# ppc shared version does not work as it uses gcc-2.95 - lanius
+#      ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
+#      ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
+
+# amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
+#      amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+#      amd64? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+
+# sparc shared version does not work for me as it uses gcc-2.95 - eradicator
+#      sparc? ( static?  ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
+#      sparc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
+
+
+# Dependencies may be augmented later (see below).
+DEPEND=">=sys-apps/sed-4
+       amd64? ( sys-apps/linux32 )"
+
+RDEPEND="virtual/x11
+       >=media-libs/fontconfig-2.1.94-r1
+       media-libs/libexif
+       x11-libs/openmotif
+       spell? ( app-text/aspell )
+       amd64? ( app-emulation/emul-linux-x86-xlibs )
+       !amd64? ( !sparc? ( !static? ( =x11-libs/qt-3* ) ) )"
+
+#      static? (
+#              amd64? ( app-emulation/emul-linux-x86-xlibs ) )
+#      !static? (
+#              amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
+#              !amd64? ( =x11-libs/qt-3* ) )
+
+SLOT="0"
+LICENSE="OPERA"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       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:#\(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:" \
+              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
+
+       rm ${D}/opt/opera/share/doc/opera/help
+       dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
+
+       dosed /opt/opera/bin/opera
+       dosed /opt/opera/share/opera/java/opera.policy
+
+       # Install the icons
+       insinto /usr/share/pixmaps
+       doins images/opera.xpm
+
+       # 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 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
+}
+
+pkg_postinst() {
+       einfo "For localized language files take a look at:"
+       einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
+       einfo
+       einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
+       einfo "and emerge app-text/aspell-language."
+       einfo
+       ewarn "This update will overwrite your search.ini if you"
+       ewarn "do not change the \"File Version\" to 4 in the file."
+}