From c7388fc6756709ab445d3f7fa65a64f05a860836 Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Wed, 2 Apr 2008 17:53:20 +0000 Subject: Restore keywords, remove old (Portage version: 2.1.4.4) --- dev-libs/nss/ChangeLog | 6 +- dev-libs/nss/nss-3.12_beta2.ebuild | 124 ------------------------------------- dev-libs/nss/nss-3.12_beta3.ebuild | 4 +- 3 files changed, 7 insertions(+), 127 deletions(-) delete mode 100644 dev-libs/nss/nss-3.12_beta2.ebuild (limited to 'dev-libs') diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 52ae4771d16f..20fc8831a54c 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.118 2008/03/26 23:38:20 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.119 2008/04/02 17:53:20 armin76 Exp $ + + 02 Apr 2008; Raúl Porcel -nss-3.12_beta2.ebuild, + nss-3.12_beta3.ebuild: + Restore keywords, remove old 26 Mar 2008; Markus Meier nss-3.11.9.ebuild: amd64 stable, bug #213601 diff --git a/dev-libs/nss/nss-3.12_beta2.ebuild b/dev-libs/nss/nss-3.12_beta2.ebuild deleted file mode 100644 index 74485393207e..000000000000 --- a/dev-libs/nss/nss-3.12_beta2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_beta2.ebuild,v 1.2 2008/03/17 12:12:24 armin76 Exp $ - -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.7.1_beta1" -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="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" - -DEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5" - -S="${WORKDIR}" - -src_unpack() { - unpack ${A} - - # hack nspr paths - echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ - >> "${S}"/mozilla/security/coreconf/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 "${S}"/mozilla/security/coreconf/location.mk - - # modify install path - sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i "${S}"/mozilla/security/coreconf/source.mk - - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.11-config.patch - epatch "${FILESDIR}"/${PN}-3.12-config-1.patch - epatch "${FILESDIR}"/${PN}-mips64.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 "FAIL";; - esac - - export NSDISTMODE=copy - export NSS_USE_SYSTEM_SQLITE=1 - cd "${S}"/mozilla/security/coreconf - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed" - cd "${S}"/mozilla/security/nss - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || 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 -} diff --git a/dev-libs/nss/nss-3.12_beta3.ebuild b/dev-libs/nss/nss-3.12_beta3.ebuild index 8cf397ca90ae..8c67731b33e5 100644 --- a/dev-libs/nss/nss-3.12_beta3.ebuild +++ b/dev-libs/nss/nss-3.12_beta3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_beta3.ebuild,v 1.1 2008/03/17 12:12:24 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_beta3.ebuild,v 1.2 2008/04/02 17:53:20 armin76 Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="utils" DEPEND=">=dev-libs/nspr-${NSPR_VER} -- cgit v1.2.3-65-gdbad