diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-07-08 20:13:42 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-07-08 20:13:42 +0000 |
| commit | 6152bdef8d367d1c017cab545a30cb3ce91f78cf (patch) | |
| tree | 20640fb1bd99c9a0e158df4c81efc292b2a0545b /www-client/opera | |
| parent | Add as-needed patch (#152654). (diff) | |
| download | gentoo-2-6152bdef8d367d1c017cab545a30cb3ce91f78cf.tar.gz gentoo-2-6152bdef8d367d1c017cab545a30cb3ce91f78cf.tar.bz2 gentoo-2-6152bdef8d367d1c017cab545a30cb3ce91f78cf.zip | |
Use globbing instead of hardcoded $S.
(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686)
Diffstat (limited to 'www-client/opera')
| -rw-r--r-- | www-client/opera/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/opera/opera-9.51.ebuild | 57 |
2 files changed, 19 insertions, 43 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index f12f4a209181..e70376387813 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/opera # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.261 2008/07/05 15:08:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.262 2008/07/08 20:13:42 jer Exp $ + + 08 Jul 2008; Jeroen Roovers <jer@gentoo.org> opera-9.51.ebuild: + Use globbing instead of hardcoded $S. 05 Jul 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.50.ebuild, -opera-9.50-r1.ebuild, -opera-9.51_pre2061.ebuild: diff --git a/www-client/opera/opera-9.51.ebuild b/www-client/opera/opera-9.51.ebuild index de3705234a0f..a7179198ca36 100644 --- a/www-client/opera/opera-9.51.ebuild +++ b/www-client/opera/opera-9.51.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.51.ebuild,v 1.5 2008/07/05 10:31:15 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.51.ebuild,v 1.6 2008/07/08 20:13:42 jer Exp $ GCONF_DEBUG="no" @@ -95,54 +95,27 @@ RDEPEND="media-libs/libexif ) " -pkg_setup() { - if use amd64; then - if use ia32; then - if use qt-static; then - if use qt3-static; then - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386" - else - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386" - fi - else - if use qt3-static; then - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386" - else - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386" - fi - fi - else - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64" - fi - fi - use ppc && S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.ppc" - use x86-fbsd && S="${WORKDIR}/${P}-${O_SUFF}-freebsd5-shared-qt3.i386" - if use x86; then - if use qt-static; then - if use qt3-static; then - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386" - else - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386" - fi - else - if use qt3-static; then - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386" - else - S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386" - fi - fi - fi +opera_cd() { + cd "${WORKDIR}"/${P}-${O_SUFF}* || die "failed to enter work directory" + S="$(pwd)" + einfo "Working in ${S}" } src_unpack() { unpack ${A} - cd "${S}" + opera_cd - epatch "${FILESDIR}/${PN}-9.00-install.patch" + epatch "${FILESDIR}/${PN}-9.00-install.patch" || \ + die "failed to apply install patch" # bug #181300: - use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" - use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch" + if use elibc_FreeBSD; then + epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch" || \ + die "failed to apply pluginpath patch" + else + epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" || \ + die "failed to apply pluginpath patch" + fi sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \ -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \ |