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