diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2007-09-06 16:15:41 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2007-09-06 16:15:41 +0000 |
| commit | be1e20ccede8d17a9da1f2cfa0c05f9e1044e641 (patch) | |
| tree | 51c7c59ee59ab5707be9da6216098f359a792ed0 /www-client/opera | |
| parent | Cleanup (diff) | |
| download | gentoo-2-be1e20ccede8d17a9da1f2cfa0c05f9e1044e641.tar.gz gentoo-2-be1e20ccede8d17a9da1f2cfa0c05f9e1044e641.tar.bz2 gentoo-2-be1e20ccede8d17a9da1f2cfa0c05f9e1044e641.zip | |
Changes from bug #191328, comments #5 and #6 applied.
(Portage version: 2.1.2.12)
Diffstat (limited to 'www-client/opera')
| -rw-r--r-- | www-client/opera/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/opera/opera-9.50_alpha1567.ebuild | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 5a330df674cb..9d9b77c29c61 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,9 @@ # 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.130 2007/09/05 03:40:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.131 2007/09/06 16:15:41 jer Exp $ + + 06 Sep 2007; Jeroen Roovers <jer@gentoo.org> opera-9.50_alpha1567.ebuild: + Changes from bug #191328, comments #5 and #6 applied. *opera-9.50_alpha1567 (05 Sep 2007) diff --git a/www-client/opera/opera-9.50_alpha1567.ebuild b/www-client/opera/opera-9.50_alpha1567.ebuild index 25d931080653..12c1544258f6 100644 --- a/www-client/opera/opera-9.50_alpha1567.ebuild +++ b/www-client/opera/opera-9.50_alpha1567.ebuild @@ -1,6 +1,6 @@ # 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.50_alpha1567.ebuild,v 1.1 2007/09/05 03:40:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_alpha1567.ebuild,v 1.2 2007/09/06 16:15:41 jer Exp $ GCONF_DEBUG="no" @@ -13,7 +13,7 @@ SLOT="0" LICENSE="OPERA-9.0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="qt-static spell gnome" +IUSE="qt-static spell gnome elibc_FreeBSD" RESTRICT="strip mirror" O_LNG="" @@ -48,12 +48,11 @@ RDEPEND="x11-libs/libXrandr x11-libs/libSM x11-libs/libICE >=media-libs/fontconfig-2.1.94-r1 - !amd64? ( media-libs/libexif - spell? ( app-text/aspell ) - x86? ( !qt-static? ( =x11-libs/qt-3* ) ) - media-libs/jpeg ) - x86-fbsd? ( =virtual/libstdc++-3* - !qt-static? ( =x11-libs/qt-3* ) )" + !qt-static? ( =x11-libs/qt-3* ) + media-libs/libexif + spell? ( app-text/aspell ) + media-libs/jpeg + x86-fbsd? ( =virtual/libstdc++-3* )" S=${WORKDIR}/${A/.tar.bz2/} @@ -62,7 +61,7 @@ src_unpack() { cd ${S} epatch "${FILESDIR}/${PN}-9.00-install.patch" - epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" + use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \ -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \ @@ -136,7 +135,7 @@ src_install() { 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 use x86-fbsd; then + if use elibc_FreeBSD; 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 ]]; @@ -167,7 +166,7 @@ pkg_postinst() { elog "To use the spellchecker (USE=spell) for non-English simply do" elog "$ emerge app-dicts/aspell-[your language]." - if use x86-fbsd; then + if use elibc_FreeBSD; then elog elog "To improve shared memory usage please set:" elog "$ sysctl kern.ipc.shm_allow_removed=1" |