Version bump

Package-Manager: portage-2.2_rc56/cvs/Linux x86_64

3 files changed, 30 insertions, 19 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/Manifest b/www-client/chromium-bin/Manifest
index 7e86d6b99fb2..fdcb872916bd 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,13 +1,13 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
-DIST chromium-bin-amd64-32003.zip 25141255 RMD160 866ba654c47256c67d4ebf5371e0a4dac4074077 SHA1 68a4bb35f305fd9c78e62825415fa2cf5c74fa1b SHA256 9c03546784c699a31dc313d9e012fc4f61c2a5f899ab4e73f250718ee4f948b8
 DIST chromium-bin-amd64-32167.zip 25182013 RMD160 414dd4b472549beba7eafcbb89b23dae6333ddb6 SHA1 b5a496105a3e1a62b961fd3425d8c7e063b2d714 SHA256 b8f2184db2a1dd87431c624dd5ea68cbe3b0d4362cf90bcdc685e7adea240688
 DIST chromium-bin-amd64-33405.zip 22286187 RMD160 d3799e8fed8226cba105fe52c800527fb473c7b5 SHA1 754ce589697133ec241d8d50b80d160b470d8d53 SHA256 9c9994990071faae0c4dc884c31b822656d8df67e2bcdc624ecc5cf2c5733034
-DIST chromium-bin-x86-32003.zip 22844371 RMD160 61027d7c1aa4a2f4c5cbf085c2609b7b39134f11 SHA1 2f6443550d820d97abfccec471d61c67519869c6 SHA256 dd04e40b8671952572c8b79ee320ea04c6d8621e419ce2624ae9f6a01208ede7
+DIST chromium-bin-amd64-33995.zip 22425359 RMD160 1e4e77854ec4e696d139a995f118a80ba5e51bf5 SHA1 402faadb2b81ac2bca02fd690431e3828a8f9cd9 SHA256 69b38ea10621807b5173c300118255184d5e6f5528167f25fcfd00448e61d4d7
 DIST chromium-bin-x86-32167.zip 22888588 RMD160 c13ea221edc77f2bd1690f6e96bb0b347277b942 SHA1 c6303b4a5eb575c10449b4da25e8875002020b36 SHA256 51770ced68e86673646463af2d6050018bb6596739fbde9059c9463bf8d48078
 DIST chromium-bin-x86-33405.zip 21516753 RMD160 737856824a29f648ff7fbd64de55833d4f9f0ed5 SHA1 dffa8fa84d624701feb275a8863f9264226bd87e SHA256 515649dfdd86dd3e2cacc993160ec3bcd2b0609718707a78681597da2345766e
-EBUILD chromium-bin-4.0.248.0_p32003.ebuild 3223 RMD160 172b9e9bc851376fbc9bc6a2fcd91fa154532010 SHA1 89a63cc50bb1f4f951759f9adc50c4276797cf80 SHA256 034d017394f9dc322d7b7f0d5d65c7e3ad6ba383be1effeef7c7550030c2dffa
+DIST chromium-bin-x86-33995.zip 21650457 RMD160 32db2ac080e68eb9b87a8f1db7bf2c54a5bfa2c4 SHA1 154b983305621e1ef1c1df98028696a4a0aa3987 SHA256 a9236a86d66cca33171fa7f61b99a47ca9c97c1367cb90c32fafcec7ad52e2f3
 EBUILD chromium-bin-4.0.251.0_p32167.ebuild 3423 RMD160 90d560165a90bdcd31f398554ccceb5223493a43 SHA1 cb20c9c920840e1c40d6cb689b7c9f72f90b9f54 SHA256 94ed1428bd3c6d83d275bab14413ac804ef85375f7e4e80043ac6c5ff7c7bed2
 EBUILD chromium-bin-4.0.260.0_p33405.ebuild 3405 RMD160 a2141f2a682bf7d81f5799f8838e87ea3dfe90a3 SHA1 c42960901cc3216297008710a2d0db1144cc6fb6 SHA256 c811c7ba00b867d4264d04444ccd7cad4d1010c0448e5a76f2416ec523b80e4a
+EBUILD chromium-bin-4.0.266.0_p33995.ebuild 3405 RMD160 de184d695a1edb2e043beba3d8820df311becf30 SHA1 1c6e439072994d7a2150cd307ba6a7c3a06ebbc4 SHA256 71f19812ebe4f3f255220aba95a2e97a2f8c462b64185f7b9ce4c7a43135870b
 EBUILD chromium-bin-9999.ebuild 3461 RMD160 8834ba112113e70b20c724bee8811476e09c95f7 SHA1 a8dff8536dbe8b7e191080ff8a88c8ba9343d823 SHA256 735c1e1ceda8bb4c743e205700bc78785436014ad7cb737514c8034188339608
-MISC ChangeLog 11093 RMD160 c82f35cdae70bf042d8385b1d4feb2f791cfc66c SHA1 aece65d731af5d56fbcb74971f64761092a5aacb SHA256 ed837fcec72cc2e74a5e2e5f677eedf280b0b72326a7acbb5ba87766b7d3423c
+MISC ChangeLog 11292 RMD160 3a609e252914c6a9134e5c6c9f88069c5888de89 SHA1 3077ffb59ac5ac2736bae363232640b9141a03fb SHA256 de6ea71cf163c1647905d0cb398e4b6f9684b18bedec50252e85ac078649477e
 MISC metadata.xml 423 RMD160 72f9e5ed12d956dc13010060e44cc23e87da0e18 SHA1 eea81a8e1114e539b3a9863a5d6dc4c725f05f57 SHA256 8d2b773ffe4a7a44e49ad05c0c171b6a6ab23eb1aa7027ea7e1904e853be9cea
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 \