From: "Bernard Cafarelli (voyageur)" <voyageur@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium-bin: ChangeLog chromium-bin-9999.ebuild chromium-bin-0_p18366.ebuild
Date: Sun, 14 Jun 2009 20:49:20 +0000 [thread overview]
Message-ID: <E1MFwdk-0004PF-0T@stork.gentoo.org> (raw)
voyageur 09/06/14 20:49:20
Modified: ChangeLog chromium-bin-9999.ebuild
Added: chromium-bin-0_p18366.ebuild
Log:
Bump, and add a few missing parts for amd64 (not keyworded yet)
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.8 www-client/chromium-bin/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 9 Jun 2009 09:01:05 -0000 1.7
+++ ChangeLog 14 Jun 2009 20:49:19 -0000 1.8
@@ -1,6 +1,14 @@
# ChangeLog for www-client/chromium-bin
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.7 2009/06/09 09:01:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.8 2009/06/14 20:49:19 voyageur Exp $
+
+*chromium-bin-0_p18366 (14 Jun 2009)
+
+ 14 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+ +chromium-bin-0_p18366.ebuild, chromium-bin-9999.ebuild:
+ Bump, and add a few missing parts for amd64. Not keyworded yet, it depends
+ on masked emul-libs, and you will also need some 32bit libORBit-2.so.0 and
+ libgconf-2.so.4 in /opt/chromium.org/lib/
*chromium-bin-0_p17935 (09 Jun 2009)
1.9 www-client/chromium-bin/chromium-bin-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?r1=1.8&r2=1.9
Index: chromium-bin-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- chromium-bin-9999.ebuild 9 Jun 2009 09:01:05 -0000 1.8
+++ chromium-bin-9999.ebuild 14 Jun 2009 20:49:19 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.8 2009/06/09 09:01:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.9 2009/06/14 20:49:19 voyageur Exp $
EAPI="2"
inherit eutils multilib
@@ -12,14 +12,24 @@
KEYWORDS="-* ~x86"
IUSE=""
+AMD64_DEPEND="amd64? (
+ || ( www-plugins/adobe-flash[32bit]
+ www-client/mozilla-firefox-bin
+ net-libs/xulrunner-bin )
+ >=app-emulation/emul-linux-x86-gtklibs-20081109
+ app-emulation/emul-linux-x86-soundlibs
+ )"
+
DEPEND="app-arch/unzip
- net-misc/curl"
-RDEPEND=">=dev-libs/nspr-4.7
- >=dev-libs/nss-3.12
- gnome-base/gconf
- media-fonts/corefonts
+ net-misc/curl
+ ${AMD64_DEPEND}"
+RDEPEND="media-fonts/corefonts
>=sys-devel/gcc-4.2
- x11-libs/pango"
+ x86? ( >=dev-libs/nspr-4.7
+ >=dev-libs/nss-3.12
+ gnome-base/gconf
+ x11-libs/pango )
+ ${AMD64_DEPEND}"
S=${WORKDIR}
@@ -44,9 +54,23 @@
if use x86; then
NSS_DIR=../../../usr/$(get_libdir)/nss
NSPR_DIR=../../../usr/$(get_libdir)/nspr
+ elif use amd64; then
+ # amd64: we still miss gconf
+ if has_version www-client/mozilla-firefox-bin; then
+ einfo "Using NSS/NSPR libraries from www-client/mozilla-firefox-bin"
+ NSS_DIR=../../../opt/firefox
+ NSPR_DIR=../../../opt/firefox
+ elif has_version net-libs/xulrunner-bin; then
+ einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin"
+ NSS_DIR=../../../opt/xulrunner
+ NSPR_DIR=../../../opt/xulrunner
+ else
+ einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash"
+ NSS_DIR=../../../opt/flash-libcompat
+ NSPR_DIR=../../../opt/flash-libcompat
+ fi
+
fi
- # amd64: firefox-bin, xulrunner-bin, adobe-flash[32bit] could
- # provide these, but we miss gconf
dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d
dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d
1.1 www-client/chromium-bin/chromium-bin-0_p18366.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild?rev=1.1&content-type=text/plain
Index: chromium-bin-0_p18366.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v 1.1 2009/06/14 20:49:19 voyageur Exp $
EAPI="2"
inherit eutils multilib
# Latest revision id can be found at
# http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST
MY_PV="${PV/0\_p}"
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://code.google.com/chromium/"
SRC_URI="http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${MY_PV}/chrome-linux.zip -> ${PN}-${MY_PV}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~x86"
IUSE=""
AMD64_DEPEND="amd64? (
|| ( www-plugins/adobe-flash[32bit]
www-client/mozilla-firefox-bin
net-libs/xulrunner-bin )
>=app-emulation/emul-linux-x86-gtklibs-20081109
app-emulation/emul-linux-x86-soundlibs
)"
DEPEND="app-arch/unzip
${AMD64_DEPEND}"
RDEPEND="media-fonts/corefonts
>=sys-devel/gcc-4.2
x86? ( >=dev-libs/nspr-4.7
>=dev-libs/nss-3.12
gnome-base/gconf
x11-libs/pango )
${AMD64_DEPEND}"
S=${WORKDIR}
QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome"
src_install() {
declare CHROMIUM_HOME=/opt/chromium.org
dodir ${CHROMIUM_HOME}
cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder"
# Create symbol links for necessary libraries
dodir ${CHROMIUM_HOME}/lib
if use x86; then
NSS_DIR=../../../usr/$(get_libdir)/nss
NSPR_DIR=../../../usr/$(get_libdir)/nspr
elif use amd64; then
# amd64: we still miss gconf
if has_version www-client/mozilla-firefox-bin; then
einfo "Using NSS/NSPR libraries from www-client/mozilla-firefox-bin"
NSS_DIR=../../../opt/firefox
NSPR_DIR=../../../opt/firefox
elif has_version net-libs/xulrunner-bin; then
einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin"
NSS_DIR=../../../opt/xulrunner
NSPR_DIR=../../../opt/xulrunner
else
einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash"
NSS_DIR=../../../opt/flash-libcompat
NSPR_DIR=../../../opt/flash-libcompat
fi
fi
dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/lib/libnspr4.so.0d
dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/lib/libplc4.so.0d
dosym ${NSPR_DIR}/libplds4.so ${CHROMIUM_HOME}/lib/libplds4.so.0d
dosym ${NSS_DIR}/libnss3.so ${CHROMIUM_HOME}/lib/libnss3.so.1d
dosym ${NSS_DIR}/libnssutil3.so ${CHROMIUM_HOME}/lib/libnssutil3.so.1d
dosym ${NSS_DIR}/libsmime3.so ${CHROMIUM_HOME}/lib/libsmime3.so.1d
dosym ${NSS_DIR}/libssl3.so ${CHROMIUM_HOME}/lib/libssl3.so.1d
# Create chromium-bin wrapper
make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/lib
newicon "${FILESDIR}"/chromium.png ${PN}.png
make_desktop_entry chromium-bin "Chromium" ${PN}.png "Network;WebBrowser"
}
pkg_postinst() {
ewarn "This binary requires the C++ runtime from >=sys-devel/gcc-4.2"
ewarn "If you get the \"version \`GLIBCXX_3.4.9' not found\" error message,"
ewarn "switch your active gcc to a version >=4.2 with gcc-config"
}
next reply other threads:[~2009-06-14 20:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-14 20:49 Bernard Cafarelli (voyageur) [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-17 16:14 [gentoo-commits] gentoo-x86 commit in www-client/chromium-bin: ChangeLog chromium-bin-9999.ebuild chromium-bin-0_p18366.ebuild Bernard Cafarelli (voyageur)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1MFwdk-0004PF-0T@stork.gentoo.org \
--to=voyageur@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox