Support new path for nss/nspr libs, thanks to Alexandre Rostovtsev <tetromino@gmail.com> in bug #304526

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

5 files changed, 44 insertions, 14 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index 890137885d94..9c0fab0db432 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.57 2010/02/11 12:21:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.58 2010/02/11 17:01:59 voyageur Exp $
+
+  11 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-bin-4.0.295.0_p35884.ebuild,
+  chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild:
+  Support new path for nss/nspr libs, thanks to Alexandre Rostovtsev
+  <tetromino@gmail.com> in bug #304526
 
   11 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   -chromium-bin-4.0.266.0_p33995.ebuild,
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 709541fde9aa..61e5e9139cd3 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -3,8 +3,8 @@ DIST chromium-bin-amd64-35884.zip 23005383 RMD160 ac472aa28ab42245bc3415d8edc068
 DIST chromium-bin-amd64-37385.zip 23694303 RMD160 ac6311220b977d6c386a68d76cb4e4f4932e9f14 SHA1 97f1313d772a75456fbe281a38cc2437166f4d57 SHA256 aedbcf87d7749d1b51f33b2e878178f5aa967fb6a58d739262ee52d0c53efbf3
 DIST chromium-bin-x86-35884.zip 22214326 RMD160 baf50cac0b74f4afff1940c3bb75b4183f2ee6f1 SHA1 9e69041c9e45f6590c3c72c08f660077fbe2b462 SHA256 6bb7fe923c0aa0e73e62c069ffc9dcc091e12db72515be44fffee031d1c3b196
 DIST chromium-bin-x86-37385.zip 22934874 RMD160 007189f02689f76924db4043c74f0241c90b7f78 SHA1 038f8771a3fb5d7b220ad243f1a0d1b6b8c003c9 SHA256 2b2e99ec12656670dce8e43ca9156cd978a7701c556a5e64dba190eea35c704b
-EBUILD chromium-bin-4.0.295.0_p35884.ebuild 4176 RMD160 0f4e5d2d5614cf98a116a47612fbc5b755d70cda SHA1 533a5f7aee69da2707d80856c04edfc6d6ec8fc7 SHA256 0af22d46e6b5416bd39c0610dffde2eef767892a4e3d5499d5e81272eec99d4f
-EBUILD chromium-bin-5.0.308.0_p37385.ebuild 4277 RMD160 a583603c05e5bed40503795e1843991efa72fef3 SHA1 f479294d6ad987c967b66efa032e2d9e3dd6e9ff SHA256 b56a0c9a35c87f5bd402cf96d2574a494ecb33acf055d02db555a536d4de9b09
-EBUILD chromium-bin-9999.ebuild 4313 RMD160 6850f9a3ec7676ff5bc1ebbafdf4bcec9a04c1a9 SHA1 aeda6f9f482f1f600225b04690e4fa494bc3571c SHA256 bfb99a3dba3b2fa4d8034f45b00636a321208c1479bf75ea6e43a0e08f9198e0
-MISC ChangeLog 13337 RMD160 7c80286a0caf24222917baae296abef89fd71c74 SHA1 f021a221c628ac01e56ac3468b4c1ea7f0f1d161 SHA256 ddbf20160693955958d88901e591c04ae170e2c815e0fb337bc51453848b59b1
+EBUILD chromium-bin-4.0.295.0_p35884.ebuild 4353 RMD160 80056de4e390a7cb9a4fdc6a9e71fe246dbd2840 SHA1 38cb732dea22edb6061173ee45b3c36e0486a2b7 SHA256 2576104822f62d0efaeb82082bedfc061e5847026ceb399ee9722e261d5fa81e
+EBUILD chromium-bin-5.0.308.0_p37385.ebuild 4454 RMD160 b569509c1b65c5889cbf8c43622f1a785afe77e0 SHA1 939153a684484d162519cbdc8c2f720727ae03ff SHA256 879be3586b6f0b7cce364f1cb746e54c920b5e5e6cff1431573290de48e56c18
+EBUILD chromium-bin-9999.ebuild 4490 RMD160 a79272bffac177eedf46697c5a7dbe51c9e605c7 SHA1 3e964dc76bc57211398a0497c5a6bebab6a6db26 SHA256 71646ea1b9f4e392c7771f2b6e96eecb77f82f4f9c762778c8ff4ae858c98542
+MISC ChangeLog 13605 RMD160 9a27302fe5a155b498d6e666f03fc8bf20bf4842 SHA1 0bcd89e91a46014b841b3cb86d3e787766d9b2ae SHA256 33c59d82e655a852e8e32c018dc1b3e222ceb07512cc589d9a1f7e04f9d87114
 MISC metadata.xml 630 RMD160 e9abef5d7ffcbd062f0f93013cc6a9676abc0329 SHA1 c56feb0fd92457e49720a25e50df732078b1dfc8 SHA256 0b723daf2cdb3658db7de722c8901abcfab9b0124d108e7770ff7c33606c66c8
diff --git a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
index 657cb8d8c23d..4b633c560deb 100644
--- a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
+++ b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.295.0_p35884.ebuild,v 1.6 2010/02/11 12:21:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.7 2010/02/11 17:01:59 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib portability
@@ -81,8 +81,16 @@ src_install() {
 
 	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/nss-nspr
-	NSS_DIR=/usr/$(get_libdir)/nss
-	NSPR_DIR=/usr/$(get_libdir)/nspr
+	if has_version ">=dev-libs/nss-3.12.5-r1"; then
+		NSS_DIR=/usr/$(get_libdir)
+	else
+		NSS_DIR=/usr/$(get_libdir)/nss
+	fi
+	if has_version ">=dev-libs/nspr-4.8.3-r2"; then
+		NSPR_DIR=/usr/$(get_libdir)
+	else
+		NSPR_DIR=/usr/$(get_libdir)/nspr
+	fi
 
 	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
 	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d
diff --git a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
index 982e391af3e6..d92864dd62fd 100644
--- a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
+++ b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.3 2010/02/11 12:21:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.4 2010/02/11 17:01:59 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib portability
@@ -84,8 +84,16 @@ src_install() {
 
 	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/nss-nspr
-	NSS_DIR=/usr/$(get_libdir)/nss
-	NSPR_DIR=/usr/$(get_libdir)/nspr
+	if has_version ">=dev-libs/nss-3.12.5-r1"; then
+		NSS_DIR=/usr/$(get_libdir)
+	else
+		NSS_DIR=/usr/$(get_libdir)/nss
+	fi
+	if has_version ">=dev-libs/nspr-4.8.3-r2"; then
+		NSPR_DIR=/usr/$(get_libdir)
+	else
+		NSPR_DIR=/usr/$(get_libdir)/nspr
+	fi
 
 	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
 	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d
diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild
index fb7ecfa84aa2..f72e27cb2976 100644
--- a/www-client/chromium-bin/chromium-bin-9999.ebuild
+++ b/www-client/chromium-bin/chromium-bin-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.33 2010/02/11 12:21:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.34 2010/02/11 17:01:59 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib portability
@@ -89,8 +89,16 @@ src_install() {
 
 	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/nss-nspr
-	NSS_DIR=/usr/$(get_libdir)/nss
-	NSPR_DIR=/usr/$(get_libdir)/nspr
+	if has_version ">=dev-libs/nss-3.12.5-r1"; then
+		NSS_DIR=/usr/$(get_libdir)
+	else
+		NSS_DIR=/usr/$(get_libdir)/nss
+	fi
+	if has_version ">=dev-libs/nspr-4.8.3-r2"; then
+		NSPR_DIR=/usr/$(get_libdir)
+	else
+		NSPR_DIR=/usr/$(get_libdir)/nspr
+	fi
 
 	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
 	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d