From: Raúl Porcel <armin76@gentoo.org>
Date: Sun, 23 Oct 2011 11:54:47 +0000 (+0000)
Subject: Fix linux-3.0 support on stable as well, bug #372001
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3e093a7b62ca543ea84e2bf00c69c849f4df7cf;p=gentoo.git

Fix linux-3.0 support on stable as well, bug #372001

Package-Manager: portage-2.1.10.11/cvs/Linux ia64
---

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index f862089fb83c..e51d7bf4e22a 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.218 2011/09/24 18:50:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.219 2011/10/23 11:54:47 armin76 Exp $
+
+  23 Oct 2011; Raúl Porcel <armin76@gentoo.org> nss-3.12.9-r1.ebuild:
+  Fix linux-3.0 support on stable as well, bug #372001
 
   24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild:
   Avoid brute force install_name_tooling by hacking the makefiles
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 21001933b6f7..0e9a3c1a6c8c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -12,14 +12,14 @@ DIST nss-3.12.9.with.ckbi.1.82.tar.gz 6012144 RMD160 a5392169f240fe804aa4d55229a
 EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b
 EBUILD nss-3.12.11.ebuild 7059 RMD160 c25bd402c4046b78710ce1c51620b2ac223eb11d SHA1 b2f4cb2c5983d4e04d5eb5ab70f2b8327a86171f SHA256 69c181ad7f6f12d48f448888dc26c7765b8cc11720590e8b2568ac35a1b65c6c
 EBUILD nss-3.12.8.ebuild 6615 RMD160 f29d4249af89a8ac8d2f681ff4d954b27998c8f1 SHA1 42b3310d57b05fc3780e35562be4005573bd894b SHA256 05d6eb4d6f0ed6d9d117a3714647a445237ddfb3feb6268ca2c23604ddf24a3f
-EBUILD nss-3.12.9-r1.ebuild 6651 RMD160 e703a80c96a376b8096e6d2025c544c8c28cf298 SHA1 4efbc98b9629df2147966f75cd0a76c3ad9ea076 SHA256 0a7b2685fca3b84b9c6b9b1df77ca98949b0454a5576fc664d35472ef4ef9743
+EBUILD nss-3.12.9-r1.ebuild 6793 RMD160 14bbb410ee3e7794ae463eb834434de50b44bc37 SHA1 7107004afd31fda20cb72124d7c81809ce97e777 SHA256 692c1e4c8756663d73b6be3ed73a62b0939f4d67b7dd54d5b95b445060f80368
 EBUILD nss-3.12.9.ebuild 6624 RMD160 512c34751a753da29043b158c290a222bd0159ed SHA1 729be6566c55e02600ed0552775497a7a98953eb SHA256 385dd1ab26aa17bd61e15f4a9ae3c0683a35d2cb5e71458140e2aee76bdb7bff
-MISC ChangeLog 27705 RMD160 e773b6e4144334c3d330eaabc53e4ffd94801b94 SHA1 1e96ff4a8d12115d3231f808ec73e25150aeeefd SHA256 b722d24b46f4a11b4863d28ea35c35dd339909b13e3aeb910df0f20139bb4c98
+MISC ChangeLog 27832 RMD160 a11cdf1eb7b860ad773377df0f4348025b0ab47e SHA1 44fa0f255c86d2324a094af68ce85876e7b11e45 SHA256 8adee1137e81ea1669a0c73b90f6d1a302f7acbfc05c85baabb49106f8cbfa2a
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5+JmkACgkQX3X2B8XHTolTggCfQRUWC47Am9ejIM7zFHXKW2AW
-wLIAn0vBvSFUsMgqAYUo2m9hLFxUZAbN
-=ynjm
+iEYEARECAAYFAk6kAI0ACgkQuQc30/atMkCT/QCgt9wXqLFtqnBwXZAjnX2v8+Cv
+AMMAoLtSxDzH5wtMSS6JExfdBajzG2Bx
+=CiMe
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.12.9-r1.ebuild b/dev-libs/nss/nss-3.12.9-r1.ebuild
index c66316ee717c..4e3e2361e672 100644
--- a/dev-libs/nss/nss-3.12.9-r1.ebuild
+++ b/dev-libs/nss/nss-3.12.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.9-r1.ebuild,v 1.6 2011/05/14 16:18:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.9-r1.ebuild,v 1.7 2011/10/23 11:54:47 armin76 Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -51,6 +51,10 @@ src_prepare() {
 		lib/ssl/config.mk || die
 	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
 		cmd/platlibs.mk || die
+
+	# Support Linux 3.0, bug #372001
+	cd  "${S}"/mozilla/security/coreconf/
+	ln -sf Linux2.6.mk Linux3.0.mk || die "failed to symlink Linux2.6.mk"
 }
 
 src_compile() {