Use PN instead of hard-coded "opera" where needed in preparation for www-client/opera-next package. Fix /usr/bin/opera wrapper to be able to run opera and opera-next concurrently.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

3 files changed, 37 insertions, 27 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index bc9f06f8b817..efb1960d1667 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.625 2011/04/12 01:54:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.626 2011/05/03 19:35:45 jer Exp $
+
+*opera-11.10.2092-r1 (03 May 2011)
+
+  03 May 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.10.2092.ebuild,
+  +opera-11.10.2092-r1.ebuild:
+  Use PN instead of hard-coded "opera" where needed in preparation for
+  www-client/opera-next package. Fix /usr/bin/opera wrapper to be able to run
+  opera and opera-next concurrently.
 
   12 Apr 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.10.2090.ebuild,
   -opera-11.10.2091.ebuild, opera-11.10.2092.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 7e6d3b2c5de3..5dda40ae3fd5 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -8,13 +8,13 @@ DIST opera-11.10-2092.i386.freebsd.tar.xz 10647968 RMD160 a49e2beec1dd2d77240443
 DIST opera-11.10-2092.i386.linux.tar.xz 10601512 RMD160 72fa1d0fbec77efeb9a953ead91dca891999b92b SHA1 2c9ded02774f767d6144d413ed88db1ae475aae4 SHA256 e3f3f877c0a1e9b04c1444feda2f024718d23aec1de2c50f7bf8a3996c71dd2e
 DIST opera-11.10-2092.x86_64.linux.tar.xz 11361056 RMD160 bf96928cb847b33cfba574ac4f5d89fc88caada4 SHA1 be1a15bf278bc55862ea748542011c0719c5a06a SHA256 399550b98f9c1deb5eed7932d691890af6ddf7f01d6d91a36c72a0fdad1d65da
 EBUILD opera-11.01.1190.ebuild 5811 RMD160 1c7a2f88e0d55e4999729a43c8971292b91500f8 SHA1 b1402dab2b7c9c0a1c4523e9d6158329ae690cd9 SHA256 940d812bffd1a6bf3dace72b44803c03315ac0d6e2e40de2a7c7dda4acdb56d4
-EBUILD opera-11.10.2092.ebuild 5969 RMD160 d181483e11fc80e763457484fa5bb21d9a9d28d8 SHA1 c0d4f092fe28ce5094970e9359ebe3a50597bde1 SHA256 60fa1420f20f2257a7e32b0cf21b1ca6edabd749a2b13c1345b62f94cd350d7b
-MISC ChangeLog 120202 RMD160 48e6cef7ecbd280af1e196821f1f247ee250d9b6 SHA1 3cd1bbba03490af1b5eec79c8bcfa4a66e48eee1 SHA256 b17f652d3013f382585255c8b6c66a147c42c5072e9dc16bed2ceba46f7805e7
+EBUILD opera-11.10.2092-r1.ebuild 5980 RMD160 7eafebfcddf08f10d33ac2bbd0e693d51d5fbfd9 SHA1 f358035af083c24e5b303ab51e5ad93c0ef5d8d7 SHA256 ea93ad9ac7758893f4397cb2f0853a5cb19b2aa7824f96446f3bf6ac021635b0
+MISC ChangeLog 120529 RMD160 c98ae6289b41fc2b167be6acca096ace5f9f78c8 SHA1 602e2677c92311cb9519588fcc5d0f61343b2759 SHA256 3481c8dd1deac3c27a974438a5b3d3c4ae32171cfd27775c79a6967a80b08183
 MISC metadata.xml 641 RMD160 b02a2c03b42c19da338fc0d2c2460ae393b832e3 SHA1 b9225680d057968296b8828308f76fa8d9ea9c56 SHA256 37369b30382e2fb8c54d23e112070997135689468d3cd865ed194a55bb87ed58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2jsOMACgkQVWmRsqeSphN4MgCfaGixb9mlh8tjgukpCoIj8o21
-otUAmwRJU844uCXOhdBdIA9biCeUORkU
-=yc9O
+iEYEARECAAYFAk3AWRcACgkQVWmRsqeSphMGsQCdH3TUhINlWm0BXBEGHzoR1EXn
+MfoAnAzMRS0VjqnEH2weDeuuZRiE+1bs
+=iQVG
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-11.10.2092.ebuild b/www-client/opera/opera-11.10.2092-r1.ebuild
index 82ce5585c7fb..8639b14ee04f 100644
--- a/www-client/opera/opera-11.10.2092.ebuild
+++ b/www-client/opera/opera-11.10.2092-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.10.2092.ebuild,v 1.2 2011/04/12 01:54:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.10.2092-r1.ebuild,v 1.1 2011/05/03 19:35:45 jer Exp $
 
 EAPI="3"
 
@@ -16,7 +16,6 @@ IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
 RESTRICT="test"
 
-# http://snapshot.opera.com/unix/minor_11.01-1160/opera-11.01-1160.i386.linux.tar.xz
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
@@ -113,23 +112,23 @@ src_prepare() {
 	done
 
 	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/opera/LICENSE share/opera/defaults/license.txt
+	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
 	rm -rf share/doc
-	for locale in share/opera/locale/*; do
+	for locale in share/${PN}/locale/*; do
 		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/opera/defaults/license.txt "${locale}/license.txt" \
+		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
 			|| die "ln -sn license.txt"
 	done
 
 	# Remove package directory
-	rm -rf share/opera/package
+	rm -rf share/${PN}/package
 
 	# Leave libopera*.so only if the user chooses
 	if ! use gtk; then
-		rm lib/opera/liboperagtk.so || die "rm liboperagtk.so failed"
+		rm lib/${PN}/liboperagtk.so || die "rm liboperagtk.so failed"
 	fi
 	if ! use kde; then
-		rm lib/opera/liboperakde4.so || die "rm liboperakde4.so failed"
+		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
 	fi
 
 	# Unzip the man pages before sedding
@@ -141,20 +140,22 @@ src_prepare() {
 		-e "s:@@{SUFFIX}::g" \
 		-e "s:@@{_SUFFIX}::g" \
 		-e "s:@@{USUFFIX}::g" \
-		share/mime/packages/opera-widget.xml \
+		share/mime/packages/${PN}-widget.xml \
 		share/man/man1/* \
-		share/applications/opera-browser.desktop \
-		share/applications/opera-widget-manager.desktop \
+		share/applications/${PN}-browser.desktop \
+		share/applications/${PN}-widget-manager.desktop \
 		|| die "sed failed"
 
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > opera
-	echo 'export OPERA_DIR=/usr/share/opera' >> opera
-	echo 'exec '"${OPREFIX}"'/opera/opera "$@"' >> opera
+	# Create /usr/bin/${PN} wrapper
+	echo '#!/bin/sh' > ${PN}
+	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
+	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+		>> ${PN}
+	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
 
 	# Fix libdir in defaults/pluginpath.ini
 	sed -i \
-		share/opera/defaults/pluginpath.ini \
+		share/${PN}/defaults/pluginpath.ini \
 		-e "s|/usr/lib32|${OPREFIX}|g" \
 		-e '/netscape/{s|[0-1]|2|g}' \
 		|| die "sed pluginpath.ini failed"
@@ -188,13 +189,14 @@ src_install() {
 
 	# Stop revdep-rebuild from checking opera binaries
 	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+		> "${D}"/etc/revdep-rebuild/90${PN}
 
 	# Set PaX markings for hardened/PaX (bug #344267)
 	pax-mark m \
-		"${D}/${OPREFIX}/opera/opera" \
-		"${D}/${OPREFIX}/opera/operaplugincleaner" \
-		"${D}/${OPREFIX}/opera/operapluginwrapper"
+		"${D}/${OPREFIX}/${PN}/${PN}" \
+		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
+		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
 }
 
 pkg_preinst() {
@@ -204,7 +206,7 @@ pkg_preinst() {
 pkg_postinst() {
 	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
 	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /usr/share/opera/locale/, then enter the"
+	elog "file chooser at /usr/share/${PN}/locale/, then enter the"
 	elog "directory for the language you want and [Open] the .lng file."
 
 	if use elibc_FreeBSD; then