[gentoo-commits] gentoo-x86 commit in www-client/opera: ChangeLog opera-9.51.ebuild

["Jeroen Roovers (jer)" <jer@gentoo.org>]

jer         08/07/08 20:13:43

  Modified:             ChangeLog opera-9.51.ebuild
  Log:
  Use globbing instead of hardcoded $S.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686)

Revision  Changes    Path
1.262                www-client/opera/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.262&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.262&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?r1=1.261&r2=1.262

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- ChangeLog	5 Jul 2008 15:08:52 -0000	1.261
+++ ChangeLog	8 Jul 2008 20:13:42 -0000	1.262
@@ -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:



1.6                  www-client/opera/opera-9.51.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.51.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.51.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.51.ebuild?r1=1.5&r2=1.6

Index: opera-9.51.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.51.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opera-9.51.ebuild	5 Jul 2008 10:31:15 -0000	1.5
+++ opera-9.51.ebuild	8 Jul 2008 20:13:42 -0000	1.6
@@ -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 @@
 	)
 	"
 
-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" \



-- 
gentoo-commits@lists.gentoo.org mailing list