summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-01-19 14:16:28 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-01-19 14:16:28 +0000
commit801552ab22237a4218352d87704a2a4ba4181681 (patch)
tree78fb9bd09aefd5f6f6dcff308ae6c01252d42009 /dev-libs/nss
parentUnpack correctly with the htmlhandbook set. (diff)
downloadgentoo-2-801552ab22237a4218352d87704a2a4ba4181681.tar.gz
gentoo-2-801552ab22237a4218352d87704a2a4ba4181681.tar.bz2
gentoo-2-801552ab22237a4218352d87704a2a4ba4181681.zip
fix beta1
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-libs/nss')
-rw-r--r--dev-libs/nss/ChangeLog9
-rw-r--r--dev-libs/nss/files/3.12-nss-config.in8
-rw-r--r--dev-libs/nss/files/3.12-nss.pc.in2
-rw-r--r--dev-libs/nss/files/digest-nss-3.12_beta1-r1 (renamed from dev-libs/nss/files/digest-nss-3.12_beta1)0
-rw-r--r--dev-libs/nss/nss-3.12_beta1-r1.ebuild (renamed from dev-libs/nss/nss-3.12_beta1.ebuild)2
5 files changed, 18 insertions, 3 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index fd569967df92..ebb333e656b5 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/nss
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.109 2008/01/18 21:42:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.110 2008/01/19 14:16:27 armin76 Exp $
+
+*nss-3.12_beta1-r1 (19 Jan 2008)
+
+ 19 Jan 2008; Raúl Porcel <armin76@gentoo.org> files/3.12-nss.pc.in,
+ files/3.12-nss-config.in, -nss-3.12_beta1.ebuild,
+ +nss-3.12_beta1-r1.ebuild:
+ fix beta1
*nss-3.12_beta1 (18 Jan 2008)
diff --git a/dev-libs/nss/files/3.12-nss-config.in b/dev-libs/nss/files/3.12-nss-config.in
index 664fafeed06e..3a88aaacd290 100644
--- a/dev-libs/nss/files/3.12-nss-config.in
+++ b/dev-libs/nss/files/3.12-nss-config.in
@@ -22,6 +22,7 @@ Dynamic Libraries:
nss
ssl
smime
+ nssutil
EOF
exit $1
}
@@ -33,6 +34,7 @@ fi
lib_ssl=yes
lib_smime=yes
lib_nss=yes
+lib_nssutil=yes
while test $# -gt 0; do
case "$1" in
@@ -83,6 +85,9 @@ while test $# -gt 0; do
nss)
lib_nss=yes
;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
*)
usage 1 1>&2
;;
@@ -132,6 +137,9 @@ if test "$echo_libs" = "yes"; then
if test -n "$lib_nss"; then
libdirs="$libdirs -lnss${major_version}"
fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
echo $libdirs
fi
diff --git a/dev-libs/nss/files/3.12-nss.pc.in b/dev-libs/nss/files/3.12-nss.pc.in
index 1c5ac9626409..ab0726c9ffa2 100644
--- a/dev-libs/nss/files/3.12-nss.pc.in
+++ b/dev-libs/nss/files/3.12-nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
Description: Network Security Services
Version: @NSS_VERSION@
Requires: nspr >= @NSPR_VERSION@
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
Cflags: -I${includedir}
diff --git a/dev-libs/nss/files/digest-nss-3.12_beta1 b/dev-libs/nss/files/digest-nss-3.12_beta1-r1
index b4ca34cc5629..b4ca34cc5629 100644
--- a/dev-libs/nss/files/digest-nss-3.12_beta1
+++ b/dev-libs/nss/files/digest-nss-3.12_beta1-r1
diff --git a/dev-libs/nss/nss-3.12_beta1.ebuild b/dev-libs/nss/nss-3.12_beta1-r1.ebuild
index 2e6d960d151d..bdaf1b828a9d 100644
--- a/dev-libs/nss/nss-3.12_beta1.ebuild
+++ b/dev-libs/nss/nss-3.12_beta1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_beta1.ebuild,v 1.1 2008/01/18 21:42:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_beta1-r1.ebuild,v 1.1 2008/01/19 14:16:27 armin76 Exp $
inherit eutils flag-o-matic multilib