License change. Version bump <http://my.opera.com/desktopteam/blog/happy-new-year>.

(Portage version: 2.2_rc61/cvs/Linux i686)

4 files changed, 175 insertions, 8 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index c761a9158e72..8c5e0f3b737f 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/opera
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.430 2009/12/15 02:05:27 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.431 2010/01/02 16:54:58 jer Exp $
+
+*opera-10.50_pre6177 (02 Jan 2010)
+
+  02 Jan 2010; Jeroen Roovers <jer@gentoo.org> opera-10.10.ebuild,
+  opera-10.20_pre4744.ebuild, +opera-10.50_pre6177.ebuild:
+  License change. Version bump
+  <http://my.opera.com/desktopteam/blog/happy-new-year>.
 
   15 Dec 2009; Jeroen Roovers <jer@gentoo.org> opera-10.20_pre4744.ebuild:
   Do not use escape sequences in elog messages (bug #296916).
diff --git a/www-client/opera/opera-10.10.ebuild b/www-client/opera/opera-10.10.ebuild
index 2b6c5aa099c5..ec1501581240 100644
--- a/www-client/opera/opera-10.10.ebuild
+++ b/www-client/opera/opera-10.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v 1.7 2009/12/09 14:50:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v 1.8 2010/01/02 16:54:58 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="A standards-compliant graphical Web browser"
 HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
-LICENSE="OPERA-10.00"
+LICENSE="OPERA-10.10"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RESTRICT="mirror test"
diff --git a/www-client/opera/opera-10.20_pre4744.ebuild b/www-client/opera/opera-10.20_pre4744.ebuild
index 2f5409d62114..9ab16ba56b5c 100644
--- a/www-client/opera/opera-10.20_pre4744.ebuild
+++ b/www-client/opera/opera-10.20_pre4744.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild,v 1.3 2009/12/15 02:05:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild,v 1.4 2010/01/02 16:54:58 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="A standards-compliant graphical Web browser"
 HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
-LICENSE="OPERA-10.00"
+LICENSE="OPERA-10.10"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="mirror test"
diff --git a/www-client/opera/opera-10.50_pre6177.ebuild b/www-client/opera/opera-10.50_pre6177.ebuild
new file mode 100644
index 000000000000..20c2816e7c51
--- /dev/null
+++ b/www-client/opera/opera-10.50_pre6177.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.50_pre6177.ebuild,v 1.1 2010/01/02 16:54:58 jer Exp $
+
+EAPI="2"
+
+OPREFIX="/usr/lib"
+
+inherit eutils
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-10.10 LGPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RESTRICT="mirror test"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+IUSE="elibc_FreeBSD"
+
+MY_LINGUAS="en zh-CN zh-HK zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/labs-${PV/*_pre}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_P}.linux.x86_64.tar.bz2 )
+	x86? ( ${O_U}${O_P}.linux.i386.tar.bz2 )
+	x86-fbsd? ( ${O_U}${O_P}.freebsd.i386.tar.bz2 )
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base
+	media-libs/glitz
+	media-libs/libpng
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/cairo
+	=x11-libs/gtk+-2*
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/xcb-util
+	virtual/opengl
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}usr/share/${PN}/locale"
+	einfo "Keeping these locales: ${LINGUAS}."
+	for LINGUA in ${MY_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}"
+		fi
+	done
+}
+
+pkg_setup() {
+	echo -e \
+		" ${GOOD}****************************************************${NORMAL}"
+	elog "If you seek support, please file a bug report at"
+	elog "https://bugs.gentoo.org and post the output of"
+	elog " \`emerge --info =${CATEGORY}/${P}'"
+	echo -e \
+		" ${GOOD}****************************************************${NORMAL}"
+}
+
+src_unpack() {
+	unpack ${A}
+	if [[ ! -d ${S} ]]; then
+		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+		S="$(pwd)"
+		einfo "Setting WORKDIR to ${S}"
+	fi
+}
+
+src_prepare() {
+	sed -i opera \
+		-e 's|=usr/lib/opera|=/usr/lib/opera|g' || \
+		die "sed opera script failed"
+}
+
+src_install() {
+	# This alpha build hardcodes /usr as prefix
+	mv -v etc/ usr/ "${D}"/ || die "mv etc/ usr/ failed"
+
+	make_desktop_entry ${PN} Opera ${PN} # TODO
+
+	# Install startup script
+	dobin ${PN}
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${D}"/etc/revdep-rebuild/90opera
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${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 -e 's/libz\.so\.3/libz.so.1/g' "$i"
+		done
+		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
+	fi
+
+	# Special for this build, otherwise opera won't find its files
+	dodir /etc/env.d
+	echo "OPERA_DIR=\"/usr/share/${PN}\"" >> "${D}"/etc/env.d/90opera
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+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 ${OPREFIX}/opera/share/opera/locale/, then enter the"
+	elog "directory for the language you want and [Open] the .lng file."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+}