Improve *SUFFIX replacement (match the upstream install script more closely).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 22 insertions, 241 deletions

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index f753f2de2a82..b2524f9c09b2 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera-next
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.78 2012/04/24 17:25:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.79 2012/04/24 17:49:56 jer Exp $
+
+  24 Apr 2012; Jeroen Roovers <jer@gentoo.org> -opera-next-12.00.1372.ebuild,
+  opera-next-12.00.1386.ebuild:
+  Improve *SUFFIX replacement (match the upstream install script more closely).
 
 *opera-next-12.00.1386 (24 Apr 2012)
 
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 3b3c23ef161a..ecbc662df6cd 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST opera-next-12.00-1372.i386.freebsd.tar.xz 12081680 RMD160 ae2e95d44374eeac7e7b5f58405271956fa073be SHA1 9b19c60010f0ae9307423ff48dd53744d8c450f0 SHA256 4f08d233e272ffea3b7636c3b8b71060b57de39d5dafa5d011bdd26a76732598
-DIST opera-next-12.00-1372.i386.linux.tar.xz 12140928 RMD160 d0f53e7a5baf06beb14cd8f0106c17829e6ea162 SHA1 f2682a3df4de4d45126cec8d48926dce67ec6974 SHA256 7f0beaed8f5d2f7295487666ea23f6f8515bb0db5083824ccaf3e0c8414cb98c
-DIST opera-next-12.00-1372.x86_64.linux.tar.xz 13232356 RMD160 307493e3ef2e5ad15cb81be6ef607e62272a0402 SHA1 9a4276ee5434ec7c6eb5032f8fd86cddd917540d SHA256 0687e7ba974efb51e218db188a3e813643310e7763d21be30f45797848e6e9d5
 DIST opera-next-12.00-1380.i386.freebsd.tar.xz 12126884 RMD160 46bc3de3a396a9e9fa8e796df3aeb0c886b2c5f5 SHA1 a364f2ac654b31a34eef6cc02e543b9f916b4497 SHA256 a5661582af6a441dd0666083a0c69a1eb13c5fbcaf69d8754a58a7c77a4bb5e1
 DIST opera-next-12.00-1380.i386.linux.tar.xz 12176060 RMD160 40c25676ff411e4afb00c6d54be9194036b2d234 SHA1 ba6afdbfe5abfee76f6cca2f7a8b59e7f43ed119 SHA256 d51ba07e46f07f0f99296257bcf51eeec0cd596731771f6db8a7f99007da0664
 DIST opera-next-12.00-1380.x86_64.linux.tar.xz 13256772 RMD160 e8e8cd72a4c314a215d3cc4027f61e05528c9c44 SHA1 102557650a144979dc8747ee07547667e9ca9622 SHA256 6a55065f07e7f2d498c5f2221d1c884a6bb04e4f79242365acea416e3287d036
@@ -16,17 +13,16 @@ DIST opera-next-12.00-1385.x86_64.linux.tar.xz 13489500 RMD160 a4e26c0d98e4912c5
 DIST opera-next-12.00-1386.i386.freebsd.tar.xz 12237832 RMD160 79d1c224ff60c4ee6b3e63c0b27ea3b8d609106c SHA1 246d243fa1203332d3c728b2b3cee3d1c2f9ee9b SHA256 b49cd2735415822af448a1aaf0eb19bb85de92d96a29f85fabc65e04c8f0aa6c
 DIST opera-next-12.00-1386.i386.linux.tar.xz 12271676 RMD160 7653392f28bf35931684ab3cbf2ce7108ccdfb1c SHA1 05008ea23c0bb20b3ff9bd0cca7b2ca6aeeb268b SHA256 ff08933cd0a6ecdf48e91b9b9f01c84e362a7257dabbbad928c864b6fae390f9
 DIST opera-next-12.00-1386.x86_64.linux.tar.xz 13355444 RMD160 b6c395a68d54550bb06076dd0c06912d48e8f319 SHA1 2de7dbd9022d098f40c47dd66fef264a3fab5b91 SHA256 53ca06230d0cbfda86102bfa6356aa25193050ab496c8fa003a515d95499a44e
-EBUILD opera-next-12.00.1372.ebuild 5454 RMD160 70ea281f78f4dcad9f76d6c46c4b4a54312ebdfa SHA1 8ee4f4376fe86b9d49d158a19d131e31c91ebb6b SHA256 cb756e92e004bd55f61a8aa5a58809f31cbb1c65c4d3e292f69b0bbf679b2b17
 EBUILD opera-next-12.00.1380.ebuild 5454 RMD160 77e4f00de1e47f056f6434eda5d053109f300d11 SHA1 99b3326850cb9ba01cc52c50b85df1ce66dbf39a SHA256 21261b42e98754541ff09d99827d44af3b67fd8c369df66637a8e8f719cb1a84
 EBUILD opera-next-12.00.1383.ebuild 5470 RMD160 840521faa12475940100b098edf98da17eb66fd7 SHA1 aba6b597461121fcb2fa962c3fbfd15f960875d8 SHA256 ac28af0a0402d8c174be06d62e10a2403ab1f7a42d0dca36f5e5e64b1fbd0b6b
 EBUILD opera-next-12.00.1385.ebuild 5471 RMD160 e84cb1cc80a9fe2766d0d855574e786b1cd40c70 SHA1 21684ae911d5ce36b2c27889a361b876531bf84b SHA256 862739e2d5b3e78a68e69edfd1022ebfee9beaa0ac3ea96e7d8b1b8c0a050198
-EBUILD opera-next-12.00.1386.ebuild 5469 RMD160 4ffda4623a5ff52fdc29f80eb646be647f7b5ce1 SHA1 02d6cdc7900ba93b921843a0af182260d7ae02d5 SHA256 52519ea398be2991379777f4f5acacbd48100560c5950ad7d9e998b8ca30a24c
-MISC ChangeLog 16279 RMD160 4ff91192b7c87f454d7efe66912c7a889eeda776 SHA1 ad094aa7065eda57124561af783c23c1c36661fb SHA256 c7628353b32e023c396ed52aa22f7f11efa0714d6506295a783d0ff59bee580d
+EBUILD opera-next-12.00.1386.ebuild 5504 RMD160 75bcefa8da6e8e73d37cb8db537f4887413bc036 SHA1 43e208bdc82bff0c8f7d09355b8890bf624b9f53 SHA256 77f8d64e46a4396064f6370f585ca0ad4512cc040cf28ecf52f986315b6d8088
+MISC ChangeLog 16470 RMD160 d01810de7f663e5227c8941c2a87868207ac74c9 SHA1 ffc741e29d25a5127252121010d27b8d458bc073 SHA256 18280c8ccf084aa7923a6cbb03d680198a6d7c05f969d7ecdd4eae1da135e544
 MISC metadata.xml 1583 RMD160 dd5554bed2dcc35aecefd6128071453321f0fe72 SHA1 23df98cede689a9f06fdf2f82288ac7f59b23c3a SHA256 bdd625fc4e2581a5b7449ad13b227a1991da039d9c1d07b459eace4771429359
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+W4isACgkQVWmRsqeSphPxAQCcDQtP3kXGa8oeG4zH36Fl2LT5
-XC8AnAzS50VAdejBYqgIwIbBsybwOzA0
-=IEhS
+iEYEARECAAYFAk+W58kACgkQVWmRsqeSphN6aQCeNc4vGj5uDkIqrrZ5/BN7c4LW
+0oAAn00gGG0NtIPNt2Mg9g6GTEf8x0MJ
+=cgTI
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-next/opera-next-12.00.1372.ebuild b/www-client/opera-next/opera-next-12.00.1372.ebuild
deleted file mode 100644
index b98f63796187..000000000000
--- a/www-client/opera-next/opera-next-12.00.1372.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1372.ebuild,v 1.1 2012/04/17 15:42:48 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
-
-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
-
-O_D="smile_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Replace "Opera" with "Opera Next"
-	if [[ ${PN} = opera-next ]]; then
-		sed -i share/applications/${PN}-*.desktop \
-			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
-	fi
-
-	# Create /usr/bin/opera 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}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	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}/${PN}/opera*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1386.ebuild b/www-client/opera-next/opera-next-12.00.1386.ebuild
index 02989b9e0724..419015c2b0a8 100644
--- a/www-client/opera-next/opera-next-12.00.1386.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1386.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1386.ebuild,v 1.1 2012/04/24 17:25:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1386.ebuild,v 1.2 2012/04/24 17:49:56 jer Exp $
 
 EAPI="4"
 
@@ -140,23 +140,24 @@ src_prepare() {
 	# Unzip the man pages before sedding
 	gunzip share/man/man1/* || die
 
+	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+	if [[ ${PN} = opera-next ]]; then
+		OPERA_SUFFIX="-next"
+		OPERA__SUFFIX=" Next"
+		OPERA_USUFFIX="-NEXT"
+	fi
+
 	# Replace PREFIX, SUFFIX and PN in various files
 	sed -i \
 		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
+		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
 		share/man/man1/* \
+		share/mime/packages/* \
 		share/applications/${PN}-*.desktop \
 		|| die
 
-	# Replace "Opera" with "Opera Next"
-	if [[ ${PN} = opera-next ]]; then
-		sed -i share/applications/${PN}-*.desktop \
-			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
-	fi
-
 	# Create /usr/bin/opera wrapper
 	echo '#!/bin/sh' > ${PN}
 	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}