| 1 |
armin76 07/12/12 14:14:22 |
| 2 |
|
| 3 |
Modified: nss-3.12_alpha2_p2.ebuild ChangeLog |
| 4 |
nss-3.11.7.ebuild |
| 5 |
Log: |
| 6 |
Quoting |
| 7 |
(Portage version: 2.1.3.19) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-libs/nss/nss-3.12_alpha2_p2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: nss-3.12_alpha2_p2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- nss-3.12_alpha2_p2.ebuild 12 Dec 2007 14:01:13 -0000 1.1 |
| 23 |
+++ nss-3.12_alpha2_p2.ebuild 12 Dec 2007 14:14:21 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild,v 1.1 2007/12/12 14:01:13 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_alpha2_p2.ebuild,v 1.2 2007/12/12 14:14:21 armin76 Exp $ |
| 29 |
|
| 30 |
inherit eutils flag-o-matic multilib |
| 31 |
|
| 32 |
@@ -12,7 +12,7 @@ |
| 33 |
|
| 34 |
LICENSE="MPL-1.1 GPL-2 LGPL-2.1" |
| 35 |
SLOT="0" |
| 36 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" |
| 37 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 38 |
IUSE="utils" |
| 39 |
|
| 40 |
DEPEND=">=dev-libs/nspr-${NSPR_VER}" |
| 41 |
@@ -24,20 +24,20 @@ |
| 42 |
|
| 43 |
# hack nspr paths |
| 44 |
echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ |
| 45 |
- >> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include" |
| 46 |
+ >> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include" |
| 47 |
|
| 48 |
# cope with nspr being in /usr/$(get_libdir)/nspr |
| 49 |
sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ |
| 50 |
- -i ${S}/mozilla/security/coreconf/location.mk |
| 51 |
+ -i "${S}"/mozilla/security/coreconf/location.mk |
| 52 |
|
| 53 |
# modify install path |
| 54 |
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
| 55 |
- -i ${S}/mozilla/security/coreconf/source.mk |
| 56 |
+ -i "${S}"/mozilla/security/coreconf/source.mk |
| 57 |
|
| 58 |
- cd ${S} |
| 59 |
- epatch ${FILESDIR}/${PN}-3.11-config.patch |
| 60 |
- epatch ${FILESDIR}/${PN}-3.11.5-config-1.patch |
| 61 |
- epatch ${FILESDIR}/${PN}-mips64.patch |
| 62 |
+ cd "${S}" |
| 63 |
+ epatch "${FILESDIR}"/${PN}-3.11-config.patch |
| 64 |
+ epatch "${FILESDIR}"/${PN}-3.11.5-config-1.patch |
| 65 |
+ epatch "${FILESDIR}"/${PN}-mips64.patch |
| 66 |
} |
| 67 |
|
| 68 |
src_compile() { |
| 69 |
@@ -46,30 +46,30 @@ |
| 70 |
export USE_64=1 |
| 71 |
fi |
| 72 |
export NSDISTMODE=copy |
| 73 |
- cd ${S}/mozilla/security/coreconf |
| 74 |
+ cd "${S}"/mozilla/security/coreconf |
| 75 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed" |
| 76 |
- cd ${S}/mozilla/security/dbm |
| 77 |
+ cd "${S}"/mozilla/security/dbm |
| 78 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed" |
| 79 |
- cd ${S}/mozilla/security/nss |
| 80 |
+ cd "${S}"/mozilla/security/nss |
| 81 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "nss make failed" |
| 82 |
} |
| 83 |
|
| 84 |
src_install () { |
| 85 |
MINOR_VERSION=11 |
| 86 |
- cd ${S}/mozilla/security/dist |
| 87 |
+ cd "${S}"/mozilla/security/dist |
| 88 |
|
| 89 |
# put all *.a files in /usr/lib/nss (because some have conflicting names |
| 90 |
# with existing libraries) |
| 91 |
dodir /usr/$(get_libdir)/nss |
| 92 |
- cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed" |
| 93 |
- cp -L */lib/*.chk ${D}/usr/$(get_libdir)/nss || die "copying chk files failed" |
| 94 |
- cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed" |
| 95 |
+ cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed" |
| 96 |
+ cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed" |
| 97 |
+ cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed" |
| 98 |
|
| 99 |
# all the include files |
| 100 |
insinto /usr/include/nss |
| 101 |
doins private/nss/*.h |
| 102 |
doins public/nss/*.h |
| 103 |
- cd ${D}/usr/$(get_libdir)/nss |
| 104 |
+ cd "${D}"/usr/$(get_libdir)/nss |
| 105 |
for file in *.so; do |
| 106 |
mv ${file} ${file}.${MINOR_VERSION} |
| 107 |
ln -s ${file}.${MINOR_VERSION} ${file} |
| 108 |
@@ -78,12 +78,12 @@ |
| 109 |
# coping with nss being in a different path. We move up priority to |
| 110 |
# ensure that nss/nspr are used specifically before searching elsewhere. |
| 111 |
dodir /etc/env.d |
| 112 |
- echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/08nss |
| 113 |
+ echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss |
| 114 |
|
| 115 |
dodir /usr/bin |
| 116 |
dodir /usr/$(get_libdir)/pkgconfig |
| 117 |
- cp ${FILESDIR}/nss-config.in ${D}/usr/bin/nss-config |
| 118 |
- cp ${FILESDIR}/nss.pc.in ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 119 |
+ cp "${FILESDIR}"/nss-config.in "${D}"/usr/bin/nss-config |
| 120 |
+ cp "${FILESDIR}"/nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 121 |
NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` |
| 122 |
NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` |
| 123 |
NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` |
| 124 |
@@ -95,8 +95,8 @@ |
| 125 |
-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ |
| 126 |
-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ |
| 127 |
-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ |
| 128 |
- -i ${D}/usr/bin/nss-config |
| 129 |
- chmod 755 ${D}/usr/bin/nss-config |
| 130 |
+ -i "${D}"/usr/bin/nss-config |
| 131 |
+ chmod 755 "${D}"/usr/bin/nss-config |
| 132 |
|
| 133 |
sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ |
| 134 |
-e "s,@prefix@,/usr,g" \ |
| 135 |
@@ -104,11 +104,11 @@ |
| 136 |
-e "s,@includedir@,\$\{prefix}/include/nss," \ |
| 137 |
-e "s,@NSPR_VERSION@,`nspr-config --version`,g" \ |
| 138 |
-e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \ |
| 139 |
- -i ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 140 |
- chmod 644 ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 141 |
+ -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 142 |
+ chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 143 |
|
| 144 |
if use utils; then |
| 145 |
- cd ${S}/mozilla/security/dist/*/bin/ |
| 146 |
+ cd "${S}"/mozilla/security/dist/*/bin/ |
| 147 |
for f in *; do |
| 148 |
newbin ${f} nss${f} |
| 149 |
done |
| 150 |
|
| 151 |
|
| 152 |
|
| 153 |
1.105 dev-libs/nss/ChangeLog |
| 154 |
|
| 155 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.105&view=markup |
| 156 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.105&content-type=text/plain |
| 157 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.104&r2=1.105 |
| 158 |
|
| 159 |
Index: ChangeLog |
| 160 |
=================================================================== |
| 161 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v |
| 162 |
retrieving revision 1.104 |
| 163 |
retrieving revision 1.105 |
| 164 |
diff -u -r1.104 -r1.105 |
| 165 |
--- ChangeLog 12 Dec 2007 14:01:13 -0000 1.104 |
| 166 |
+++ ChangeLog 12 Dec 2007 14:14:21 -0000 1.105 |
| 167 |
@@ -1,6 +1,10 @@ |
| 168 |
# ChangeLog for dev-libs/nss |
| 169 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 170 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.104 2007/12/12 14:01:13 armin76 Exp $ |
| 171 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.105 2007/12/12 14:14:21 armin76 Exp $ |
| 172 |
+ |
| 173 |
+ 12 Dec 2007; Raúl Porcel <armin76@g.o> nss-3.11.7.ebuild, |
| 174 |
+ nss-3.12_alpha2_p2.ebuild: |
| 175 |
+ Quoting |
| 176 |
|
| 177 |
*nss-3.12_alpha2_p2 (12 Dec 2007) |
| 178 |
|
| 179 |
|
| 180 |
|
| 181 |
|
| 182 |
1.12 dev-libs/nss/nss-3.11.7.ebuild |
| 183 |
|
| 184 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild?rev=1.12&view=markup |
| 185 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild?rev=1.12&content-type=text/plain |
| 186 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild?r1=1.11&r2=1.12 |
| 187 |
|
| 188 |
Index: nss-3.11.7.ebuild |
| 189 |
=================================================================== |
| 190 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild,v |
| 191 |
retrieving revision 1.11 |
| 192 |
retrieving revision 1.12 |
| 193 |
diff -u -r1.11 -r1.12 |
| 194 |
--- nss-3.11.7.ebuild 16 Oct 2007 17:19:36 -0000 1.11 |
| 195 |
+++ nss-3.11.7.ebuild 12 Dec 2007 14:14:21 -0000 1.12 |
| 196 |
@@ -1,6 +1,6 @@ |
| 197 |
# Copyright 1999-2007 Gentoo Foundation |
| 198 |
# Distributed under the terms of the GNU General Public License v2 |
| 199 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild,v 1.11 2007/10/16 17:19:36 armin76 Exp $ |
| 200 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.7.ebuild,v 1.12 2007/12/12 14:14:21 armin76 Exp $ |
| 201 |
|
| 202 |
inherit eutils flag-o-matic multilib |
| 203 |
|
| 204 |
@@ -22,20 +22,20 @@ |
| 205 |
|
| 206 |
# hack nspr paths |
| 207 |
echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ |
| 208 |
- >> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include" |
| 209 |
+ >> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include" |
| 210 |
|
| 211 |
# cope with nspr being in /usr/$(get_libdir)/nspr |
| 212 |
sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ |
| 213 |
- -i ${S}/mozilla/security/coreconf/location.mk |
| 214 |
+ -i "${S}"/mozilla/security/coreconf/location.mk |
| 215 |
|
| 216 |
# modify install path |
| 217 |
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ |
| 218 |
- -i ${S}/mozilla/security/coreconf/source.mk |
| 219 |
+ -i "${S}"/mozilla/security/coreconf/source.mk |
| 220 |
|
| 221 |
- cd ${S} |
| 222 |
- epatch ${FILESDIR}/${PN}-3.11-config.patch |
| 223 |
- epatch ${FILESDIR}/${PN}-3.11.5-config-1.patch |
| 224 |
- epatch ${FILESDIR}/${PN}-mips64.patch |
| 225 |
+ cd "${S}" |
| 226 |
+ epatch "${FILESDIR}"/${PN}-3.11-config.patch |
| 227 |
+ epatch "${FILESDIR}"/${PN}-3.11.5-config-1.patch |
| 228 |
+ epatch "${FILESDIR}"/${PN}-mips64.patch |
| 229 |
} |
| 230 |
|
| 231 |
src_compile() { |
| 232 |
@@ -44,30 +44,30 @@ |
| 233 |
export USE_64=1 |
| 234 |
fi |
| 235 |
export NSDISTMODE=copy |
| 236 |
- cd ${S}/mozilla/security/coreconf |
| 237 |
+ cd "${S}"/mozilla/security/coreconf |
| 238 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed" |
| 239 |
- cd ${S}/mozilla/security/dbm |
| 240 |
+ cd "${S}"/mozilla/security/dbm |
| 241 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed" |
| 242 |
- cd ${S}/mozilla/security/nss |
| 243 |
+ cd "${S}"/mozilla/security/nss |
| 244 |
emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "nss make failed" |
| 245 |
} |
| 246 |
|
| 247 |
src_install () { |
| 248 |
MINOR_VERSION=11 |
| 249 |
- cd ${S}/mozilla/security/dist |
| 250 |
+ cd "${S}"/mozilla/security/dist |
| 251 |
|
| 252 |
# put all *.a files in /usr/lib/nss (because some have conflicting names |
| 253 |
# with existing libraries) |
| 254 |
dodir /usr/$(get_libdir)/nss |
| 255 |
- cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed" |
| 256 |
- cp -L */lib/*.chk ${D}/usr/$(get_libdir)/nss || die "copying chk files failed" |
| 257 |
- cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed" |
| 258 |
+ cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed" |
| 259 |
+ cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed" |
| 260 |
+ cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed" |
| 261 |
|
| 262 |
# all the include files |
| 263 |
insinto /usr/include/nss |
| 264 |
doins private/nss/*.h |
| 265 |
doins public/nss/*.h |
| 266 |
- cd ${D}/usr/$(get_libdir)/nss |
| 267 |
+ cd "${D}"/usr/$(get_libdir)/nss |
| 268 |
for file in *.so; do |
| 269 |
mv ${file} ${file}.${MINOR_VERSION} |
| 270 |
ln -s ${file}.${MINOR_VERSION} ${file} |
| 271 |
@@ -76,12 +76,12 @@ |
| 272 |
# coping with nss being in a different path. We move up priority to |
| 273 |
# ensure that nss/nspr are used specifically before searching elsewhere. |
| 274 |
dodir /etc/env.d |
| 275 |
- echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/08nss |
| 276 |
+ echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss |
| 277 |
|
| 278 |
dodir /usr/bin |
| 279 |
dodir /usr/$(get_libdir)/pkgconfig |
| 280 |
- cp ${FILESDIR}/nss-config.in ${D}/usr/bin/nss-config |
| 281 |
- cp ${FILESDIR}/nss.pc.in ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 282 |
+ cp "${FILESDIR}"/nss-config.in "${D}"/usr/bin/nss-config |
| 283 |
+ cp "${FILESDIR}"/nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 284 |
NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` |
| 285 |
NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` |
| 286 |
NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` |
| 287 |
@@ -93,8 +93,8 @@ |
| 288 |
-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ |
| 289 |
-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ |
| 290 |
-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ |
| 291 |
- -i ${D}/usr/bin/nss-config |
| 292 |
- chmod 755 ${D}/usr/bin/nss-config |
| 293 |
+ -i "${D}"/usr/bin/nss-config |
| 294 |
+ chmod 755 "${D}"/usr/bin/nss-config |
| 295 |
|
| 296 |
sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ |
| 297 |
-e "s,@prefix@,/usr,g" \ |
| 298 |
@@ -102,11 +102,11 @@ |
| 299 |
-e "s,@includedir@,\$\{prefix}/include/nss," \ |
| 300 |
-e "s,@NSPR_VERSION@,`nspr-config --version`,g" \ |
| 301 |
-e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \ |
| 302 |
- -i ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 303 |
- chmod 644 ${D}/usr/$(get_libdir)/pkgconfig/nss.pc |
| 304 |
+ -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 305 |
+ chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc |
| 306 |
|
| 307 |
if use utils; then |
| 308 |
- cd ${S}/mozilla/security/dist/*/bin/ |
| 309 |
+ cd "${S}"/mozilla/security/dist/*/bin/ |
| 310 |
for f in *; do |
| 311 |
newbin ${f} nss${f} |
| 312 |
done |
| 313 |
|
| 314 |
|
| 315 |
|
| 316 |
-- |
| 317 |
gentoo-commits@g.o mailing list |
Archives