1 |
armin76 08/06/18 14:57:18 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: nss-3.12.ebuild |
5 |
Removed: nss-3.12_rc4.ebuild nss-3.12_beta3.ebuild |
6 |
nss-3.12_rc3.ebuild nss-3.12_rc2.ebuild |
7 |
Log: |
8 |
Version bump wrt #228083, remove betas |
9 |
(Portage version: 2.1.4.4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.124 dev-libs/nss/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.124&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.124&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.123&r2=1.124 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v |
21 |
retrieving revision 1.123 |
22 |
retrieving revision 1.124 |
23 |
diff -u -r1.123 -r1.124 |
24 |
--- ChangeLog 5 Jun 2008 13:08:22 -0000 1.123 |
25 |
+++ ChangeLog 18 Jun 2008 14:57:17 -0000 1.124 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for dev-libs/nss |
28 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.123 2008/06/05 13:08:22 armin76 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.124 2008/06/18 14:57:17 armin76 Exp $ |
31 |
+ |
32 |
+*nss-3.12 (18 Jun 2008) |
33 |
+ |
34 |
+ 18 Jun 2008; Raúl Porcel <armin76@g.o> -nss-3.12_beta3.ebuild, |
35 |
+ -nss-3.12_rc2.ebuild, -nss-3.12_rc3.ebuild, -nss-3.12_rc4.ebuild, |
36 |
+ +nss-3.12.ebuild: |
37 |
+ Version bump wrt #228083, remove betas |
38 |
|
39 |
*nss-3.12_rc4 (05 Jun 2008) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-libs/nss/nss-3.12.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: nss-3.12.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2008 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.1 2008/06/18 14:57:17 armin76 Exp $ |
54 |
|
55 |
inherit eutils flag-o-matic multilib toolchain-funcs |
56 |
|
57 |
NSPR_VER="4.7.1" |
58 |
RTM_NAME="NSS_${PV//./_}_RTM" |
59 |
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" |
60 |
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" |
61 |
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" |
62 |
|
63 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
66 |
IUSE="utils" |
67 |
|
68 |
DEPEND=">=dev-libs/nspr-${NSPR_VER} |
69 |
>=dev-db/sqlite-3.5.6" |
70 |
|
71 |
src_unpack() { |
72 |
unpack ${A} |
73 |
|
74 |
# hack nspr paths |
75 |
echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ |
76 |
>> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include" |
77 |
|
78 |
# cope with nspr being in /usr/$(get_libdir)/nspr |
79 |
sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ |
80 |
-i "${S}"/mozilla/security/coreconf/location.mk |
81 |
|
82 |
# modify install path |
83 |
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
84 |
-i "${S}"/mozilla/security/coreconf/source.mk |
85 |
|
86 |
cd "${S}" |
87 |
epatch "${FILESDIR}"/${PN}-3.11-config.patch |
88 |
epatch "${FILESDIR}"/${PN}-3.12-config-1.patch |
89 |
epatch "${FILESDIR}"/${PN}-mips64.patch |
90 |
} |
91 |
|
92 |
src_compile() { |
93 |
strip-flags |
94 |
|
95 |
echo > "${T}"/test.c |
96 |
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o |
97 |
case $(file "${T}"/test.o) in |
98 |
*64-bit*) export USE_64=1;; |
99 |
*32-bit*) ;; |
100 |
*) die "FAIL";; |
101 |
esac |
102 |
|
103 |
export NSDISTMODE=copy |
104 |
export NSS_USE_SYSTEM_SQLITE=1 |
105 |
cd "${S}"/mozilla/security/coreconf |
106 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed" |
107 |
cd "${S}"/mozilla/security/dbm |
108 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed" |
109 |
cd "${S}"/mozilla/security/nss |
110 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed" |
111 |
} |
112 |
|
113 |
src_install () { |
114 |
MINOR_VERSION=12 |
115 |
cd "${S}"/mozilla/security/dist |
116 |
|
117 |
# put all *.a files in /usr/lib/nss (because some have conflicting names |
118 |
# with existing libraries) |
119 |
dodir /usr/$(get_libdir)/nss |
120 |
cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed" |
121 |
cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed" |
122 |
cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed" |
123 |
|
124 |
# all the include files |
125 |
insinto /usr/include/nss |
126 |
doins private/nss/*.h |
127 |
doins public/nss/*.h |
128 |
cd "${D}"/usr/$(get_libdir)/nss |
129 |
for file in *.so; do |
130 |
mv ${file} ${file}.${MINOR_VERSION} |
131 |
ln -s ${file}.${MINOR_VERSION} ${file} |
132 |
done |
133 |
|
134 |
# coping with nss being in a different path. We move up priority to |
135 |
# ensure that nss/nspr are used specifically before searching elsewhere. |
136 |
dodir /etc/env.d |
137 |
echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss |
138 |
|
139 |
dodir /usr/bin |
140 |
dodir /usr/$(get_libdir)/pkgconfig |
141 |
cp "${FILESDIR}"/3.12-nss-config.in "${D}"/usr/bin/nss-config |
142 |
cp "${FILESDIR}"/3.12-nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
143 |
NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` |
144 |
NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` |
145 |
NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` |
146 |
|
147 |
sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ |
148 |
-e "s,@prefix@,/usr,g" \ |
149 |
-e "s,@exec_prefix@,\$\{prefix},g" \ |
150 |
-e "s,@includedir@,\$\{prefix}/include/nss,g" \ |
151 |
-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ |
152 |
-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ |
153 |
-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ |
154 |
-i "${D}"/usr/bin/nss-config |
155 |
chmod 755 "${D}"/usr/bin/nss-config |
156 |
|
157 |
sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ |
158 |
-e "s,@prefix@,/usr,g" \ |
159 |
-e "s,@exec_prefix@,\$\{prefix},g" \ |
160 |
-e "s,@includedir@,\$\{prefix}/include/nss," \ |
161 |
-e "s,@NSPR_VERSION@,`nspr-config --version`,g" \ |
162 |
-e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \ |
163 |
-i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
164 |
chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
165 |
|
166 |
if use utils; then |
167 |
cd "${S}"/mozilla/security/dist/*/bin/ |
168 |
for f in *; do |
169 |
newbin ${f} nss${f} |
170 |
done |
171 |
fi |
172 |
} |
173 |
|
174 |
|
175 |
|
176 |
-- |
177 |
gentoo-commits@l.g.o mailing list |