axs         14/06/13 14:19:50

  Modified:             ChangeLog
  Added:                nspr-4.10.6.ebuild nspr-4.10.6-r1.ebuild
  Removed:              nspr-4.10.3.ebuild
  Log:
  version bump, remove old; security bug 512896.  Also added a multilib-minimal 
version for testing and eventual unmasking
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
2B6559ED)

Revision  Changes    Path
1.263                dev-libs/nspr/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.263&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.263&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.262&r2=1.263

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- ChangeLog   24 Mar 2014 14:33:51 -0000      1.262
+++ ChangeLog   13 Jun 2014 14:19:49 -0000      1.263
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.262 2014/03/24 
14:33:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.263 2014/06/13 
14:19:49 axs Exp $
+
+*nspr-4.10.6 (13 Jun 2014)
+*nspr-4.10.6-r1 (13 Jun 2014)
+
+  13 Jun 2014; Ian Stakenvicius (_AxS_) <[email protected]>
+  +files/nspr-4.10.6-solaris.patch, +nspr-4.10.6-r1.ebuild, 
+nspr-4.10.6.ebuild,
+  -nspr-4.10.3.ebuild:
+  version bump, remove old; security bug 512896.  Also added a multilib-minimal
+  version for testing and eventual unmasking
 
   24 Mar 2014; Agostino Sarubbo <[email protected]> nspr-4.10.4.ebuild:
   Stable for ppc64, wrt bug #505072



1.1                  dev-libs/nspr/nspr-4.10.6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild?rev=1.1&content-type=text/plain

Index: nspr-4.10.6.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.1 
2014/06/13 14:19:49 axs Exp $

EAPI=5
WANT_AUTOCONF="2.5"

inherit autotools eutils multilib toolchain-funcs versionator

MIN_PV="$(get_version_component_range 2)"

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-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"

src_prepare() {
        mkdir build inst

        cd "${S}"/nspr
        epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
        epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
        epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
        # epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
        epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
        epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
        # We do not need to pass -L$libdir via nspr-config --libs
        epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch

        # We must run eautoconf to regenerate configure
        eautoconf

        # make sure it won't find Perl out of Prefix
        sed -i -e "s/perl5//g" "${S}"/nspr/configure || die

        # Respect LDFLAGS
        sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
                "${S}"/nspr/config/rules.mk || die
}

src_configure() {
        cd "${S}"/build

        # We use the standard BUILD_xxx but nspr uses HOST_xxx
        tc-export_build_env BUILD_CC
        export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} 
HOST_LDFLAGS=${BUILD_LDFLAGS}
        tc-export AR CC CXX RANLIB
        [[ ${CBUILD} != ${CHOST} ]] \
                && export CROSS_COMPILE=1 \
                || unset CROSS_COMPILE

        local myconf
        einfo "Running a short build test to determine 64bit'ness"
        echo > "${T}"/test.c
        ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
        case $(file "${T}"/test.o) in
                *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" 
--enable-64bit";;
                *32-bit*|*ppc*|*i386*) ;;
                *) die "Failed to detect whether your arch is 64bits or 32bits, 
disable distcc if you're using it, please";;
        esac

        # Ancient autoconf needs help finding the right tools.
        LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
        ac_cv_path_AR="${AR}" \
        econf \
                --libdir="${EPREFIX}/usr/$(get_libdir)" \
                $(use_enable debug) \
                $(use_enable !debug optimize) \
                ${myconf}
}

src_compile() {
        cd "${S}"/build || die
        emake
}

src_install() {
        cd "${S}"/build
        # Their build system is royally confusing, as usual
        MINOR_VERSION=${MIN_PV} # Used for .so version
        emake DESTDIR="${D}" install

        einfo "removing static libraries as upstream has requested!"
        rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static 
libraries."

        # install nspr-config
        dobin config/nspr-config

        # Remove stupid files in /usr/bin
        rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded 
files"
}



1.1                  dev-libs/nspr/nspr-4.10.6-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild?rev=1.1&content-type=text/plain

Index: nspr-4.10.6-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.1 
2014/06/13 14:19:49 axs Exp $

EAPI=5
WANT_AUTOCONF="2.5"

inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal

MIN_PV="$(get_version_component_range 2)"

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-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"

RDEPEND="abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"

src_prepare() {
        cd "${S}"/nspr
        epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
        epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
        epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
        epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
        epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
        # We do not need to pass -L$libdir via nspr-config --libs
        epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch

        # We must run eautoconf to regenerate configure
        eautoconf

        # make sure it won't find Perl out of Prefix
        sed -i -e "s/perl5//g" "${S}"/nspr/configure || die

        # Respect LDFLAGS
        sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
                "${S}"/nspr/config/rules.mk || die
}

multilib_src_configure() {
        # We use the standard BUILD_xxx but nspr uses HOST_xxx
        tc-export_build_env BUILD_CC
        export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} 
HOST_LDFLAGS=${BUILD_LDFLAGS}
        tc-export AR CC CXX RANLIB
        [[ ${CBUILD} != ${CHOST} ]] \
                && export CROSS_COMPILE=1 \
                || unset CROSS_COMPILE

        local myconf
        # use ABI first, this will work for most cases
        case "${ABI}" in
                x32) myconf+=" --enable-x32";;
                s390x|*64) myconf+=" --enable-64bit";;
                default) # no abi actually set, fall back to old check
                        einfo "Running a short build test to determine 
64bit'ness"
                        echo > "${T}"/test.c
                        ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o 
"${T}"/test.o || die
                        case $(file "${T}"/test.o) in
                                *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) 
myconf+=" --enable-64bit";;
                                *32-bit*|*ppc*|*i386*) ;;
                                *) die "Failed to detect whether your arch is 
64bits or 32bits, disable distcc if you're using it, please";;
                        esac ;;
                *) ;;
        esac

        # Ancient autoconf needs help finding the right tools.
        LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
        ac_cv_path_AR="${AR}" \
        econf \
                --libdir="${EPREFIX}/usr/$(get_libdir)" \
                $(use_enable debug) \
                $(use_enable !debug optimize) \
                ${myconf}
}

multilib_src_install() {
        # Their build system is royally confusing, as usual
        MINOR_VERSION=${MIN_PV} # Used for .so version
        emake DESTDIR="${D}" install

        einfo "removing static libraries as upstream has requested!"
        rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static 
libraries."

        # install nspr-config
        is_final_abi && \
        dobin config/nspr-config

        # Remove stupid files in /usr/bin
        rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded 
files"
}




Reply via email to