diff options
author | Raúl Porcel <armin76@gentoo.org> | 2009-04-15 13:37:53 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2009-04-15 13:37:53 +0000 |
commit | f19ddebbfe41d831044a3aa62e1e11e838e1090c (patch) | |
tree | 6654c03d6ff5f5af3df2c2932a06a76cfb1cc70b /dev-libs | |
parent | Try to solve bug 256935. Simply block old pykde. (diff) | |
download | historical-f19ddebbfe41d831044a3aa62e1e11e838e1090c.tar.gz historical-f19ddebbfe41d831044a3aa62e1e11e838e1090c.tar.bz2 historical-f19ddebbfe41d831044a3aa62e1e11e838e1090c.zip |
Version bump
Package-Manager: portage-2.1.6.7/cvs/Linux ia64
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/nspr/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/nspr/nspr-4.7.4.ebuild | 88 | ||||
-rw-r--r-- | dev-libs/nss/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/nss/nss-3.12.3.ebuild | 131 |
4 files changed, 231 insertions, 2 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index d627487e5a44..8e9d33c38a08 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.115 2009/04/12 14:56:15 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.116 2009/04/15 13:35:06 armin76 Exp $ + +*nspr-4.7.4 (15 Apr 2009) + + 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> +nspr-4.7.4.ebuild: + Version bump 12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> nspr-4.7.3.ebuild: Stable on sparc, security bug #262704 and security bug #265165 diff --git a/dev-libs/nspr/nspr-4.7.4.ebuild b/dev-libs/nspr/nspr-4.7.4.ebuild new file mode 100644 index 000000000000..c6d194ab0953 --- /dev/null +++ b/dev-libs/nspr/nspr-4.7.4.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.4.ebuild,v 1.1 2009/04/15 13:35:06 armin76 Exp $ + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="ipv6 debug" + +DEPEND=">=dev-db/sqlite-3.5" + +src_unpack() { + unpack ${A} + cd "${S}" + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.6.1-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + mozilla/nsprpub/config/rules.mk +} + +src_compile() { + cd "${S}"/build + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*) myconf="${myconf} --enable-64bit";; + *32-bit*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + if use ipv6; then + myconf="${myconf} --enable-ipv6" + fi + + myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \ + --enable-system-sqlite" + + ECONF_SOURCE="../mozilla/nsprpub" econf \ + $(use_enable debug) \ + ${myconf} || die "econf failed" + make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die +} + +src_install () { + # Their build system is royally fucked, as usual + MINOR_VERSION=7 + cd "${S}"/build + emake DESTDIR="${D}" install || die "emake install failed" + + cd "${D}"/usr/$(get_libdir)/nspr + for file in *.so; do + mv ${file} ${file}.${MINOR_VERSION} + ln -s ${file}.${MINOR_VERSION} ${file} + done + # cope with libraries being in /usr/lib/nspr + dodir /etc/env.d + echo "LDPATH=/usr/$(get_libdir)/nspr" > "${D}/etc/env.d/08nspr" + + # install nspr-config + dobin "${S}"/build/config/nspr-config + + # create pkg-config file + insinto /usr/$(get_libdir)/pkgconfig/ + doins "${S}"/build/config/nspr.pc + + # Remove stupid files in /usr/bin + rm "${D}"/usr/bin/{prerr.properties,nspr.pc} +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6 +} diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index d73e54be84ce..f9dfdffb9280 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.142 2009/04/12 14:56:16 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.143 2009/04/15 13:37:52 armin76 Exp $ + +*nss-3.12.3 (15 Apr 2009) + + 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> +nss-3.12.3.ebuild: + Version bump 12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> nss-3.12.2.ebuild: Stable on sparc, security bug #262704 and security bug #265165 diff --git a/dev-libs/nss/nss-3.12.3.ebuild b/dev-libs/nss/nss-3.12.3.ebuild new file mode 100644 index 000000000000..6110ee02cfb2 --- /dev/null +++ b/dev-libs/nss/nss-3.12.3.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3.ebuild,v 1.1 2009/04/15 13:37:53 armin76 Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +NSPR_VER="4.7.4" +RTM_NAME="NSS_${PV//./_}_RTM" +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.bz2" +#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2 +# mirror://gentoo/${P}.tar.bz2" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="utils" + +S="${WORKDIR}/${P}" + +DEPEND=">=dev-libs/nspr-${NSPR_VER} + >=dev-db/sqlite-3.5" + +src_unpack() { + unpack ${A} + + cd "${S}"/mozilla/security/coreconf + # hack nspr paths + echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # cope with nspr being in /usr/$(get_libdir)/nspr + sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ + -i location.mk + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.12-config.patch + epatch "${FILESDIR}"/${PN}-3.12-config-1.patch + epatch "${FILESDIR}"/${PN}-mips64-2.patch +} + +src_compile() { + strip-flags + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*) export USE_64=1;; + *32-bit*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + export NSDISTMODE=copy + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + cd "${S}"/mozilla/security/coreconf + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed" + cd "${S}"/mozilla/security/dbm + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed" + cd "${S}"/mozilla/security/nss + emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed" +} + +src_install () { + MINOR_VERSION=12 + cd "${S}"/mozilla/security/dist + + # put all *.a files in /usr/lib/nss (because some have conflicting names + # with existing libraries) + dodir /usr/$(get_libdir)/nss + cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed" + cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed" + cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed" + + # all the include files + insinto /usr/include/nss + doins private/nss/*.h + doins public/nss/*.h + cd "${D}"/usr/$(get_libdir)/nss + for file in *.so; do + mv ${file} ${file}.${MINOR_VERSION} + ln -s ${file}.${MINOR_VERSION} ${file} + done + + # coping with nss being in a different path. We move up priority to + # ensure that nss/nspr are used specifically before searching elsewhere. + dodir /etc/env.d + echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss + + dodir /usr/bin + dodir /usr/$(get_libdir)/pkgconfig + cp "${FILESDIR}"/3.12-nss-config.in "${D}"/usr/bin/nss-config + cp "${FILESDIR}"/3.12-nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc + NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` + NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` + NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` + + sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,\$\{prefix},g" \ + -e "s,@includedir@,\$\{prefix}/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ + -i "${D}"/usr/bin/nss-config + chmod 755 "${D}"/usr/bin/nss-config + + sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,\$\{prefix},g" \ + -e "s,@includedir@,\$\{prefix}/include/nss," \ + -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \ + -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \ + -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc + chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc + + if use utils; then + cd "${S}"/mozilla/security/dist/*/bin/ + for f in *; do + newbin ${f} nss${f} + done + fi +} |