diff options
| -rw-r--r-- | www-client/chromium-bin/ChangeLog | 9 | ||||
| -rw-r--r-- | www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild (renamed from www-client/chromium-bin/chromium-bin-4.0.248.0_p32003.ebuild) | 32 |
2 files changed, 26 insertions, 15 deletions
diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog index 251b36832e56..e0e293d2290d 100644 --- a/www-client/chromium-bin/ChangeLog +++ b/www-client/chromium-bin/ChangeLog @@ -1,6 +1,13 @@ # 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.47 2009/12/01 15:59:21 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.48 2009/12/08 10:33:57 voyageur Exp $ + +*chromium-bin-4.0.266.0_p33995 (08 Dec 2009) + + 08 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> + -chromium-bin-4.0.248.0_p32003.ebuild, + +chromium-bin-4.0.266.0_p33995.ebuild: + Version bump 01 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> chromium-bin-4.0.260.0_p33405.ebuild, chromium-bin-9999.ebuild: diff --git a/www-client/chromium-bin/chromium-bin-4.0.248.0_p32003.ebuild b/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild index 68aa9afbaa9c..b519b329d836 100644 --- a/www-client/chromium-bin/chromium-bin-4.0.248.0_p32003.ebuild +++ b/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild @@ -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-4.0.248.0_p32003.ebuild,v 1.2 2009/11/17 14:27:25 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild,v 1.1 2009/12/08 10:33:57 voyageur Exp $ EAPI="2" inherit eutils multilib @@ -24,7 +24,7 @@ RDEPEND="gnome-base/gconf >=media-libs/alsa-lib-1.0.19 >=sys-devel/gcc-4.2 >=dev-libs/nspr-4.7 - >=dev-libs/nss-3.12 + >=dev-libs/nss-3.12.3 x11-libs/pango x11-themes/gnome-icon-theme" @@ -49,24 +49,28 @@ src_install() { dodir ${CHROMIUM_HOME} cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder" + # Man page (rename to prevent collision with chromium) + newman chrome-linux/chrome.1 chromium-bin.1 + rm "${D}"${CHROMIUM_HOME}/chrome-linux/chrome.1 + # Plugins symlink dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins # Create symlinks for needed libraries - dodir ${CHROMIUM_HOME}/lib - NSS_DIR=../../../usr/$(get_libdir)/nss - NSPR_DIR=../../../usr/$(get_libdir)/nspr - - 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 + dodir ${CHROMIUM_HOME}/nss-nspr + NSS_DIR=/usr/$(get_libdir)/nss + NSPR_DIR=/usr/$(get_libdir)/nspr + + dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d + dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d + dosym ${NSPR_DIR}/libplds4.so ${CHROMIUM_HOME}/nss-nspr/libplds4.so.0d + dosym ${NSS_DIR}/libnss3.so ${CHROMIUM_HOME}/nss-nspr/libnss3.so.1d + dosym ${NSS_DIR}/libnssutil3.so ${CHROMIUM_HOME}/nss-nspr/libnssutil3.so.1d + dosym ${NSS_DIR}/libsmime3.so ${CHROMIUM_HOME}/nss-nspr/libsmime3.so.1d + dosym ${NSS_DIR}/libssl3.so ${CHROMIUM_HOME}/nss-nspr/libssl3.so.1d # Create chromium-bin wrapper - make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/lib:${CHROMIUM_HOME}/chrome-linux + make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/nss-nspr:${CHROMIUM_HOME}/chrome-linux newicon "${FILESDIR}"/chromium.png ${PN}.png make_desktop_entry chromium-bin "Chromium (bin)" ${PN} "Network;WebBrowser" sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ |