old

Package-Manager: portage-2.1.4.4

3 files changed, 2 insertions, 211 deletions

diff --git a/dev-libs/nspr/nspr-4.6.7.ebuild b/dev-libs/nspr/nspr-4.6.7.ebuild
deleted file mode 100644
index 8406612657b0..000000000000
--- a/dev-libs/nspr/nspr-4.6.7.ebuild
+++ /dev/null
@@ -1,95 +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/nspr/nspr-4.6.7.ebuild,v 1.11 2008/03/17 12:10:08 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=""
-
-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.6.1-prtime.patch
-}
-
-src_compile() {
-	cd 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 "FAIL";;
-	esac
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr"
-
-	ECONF_SOURCE="../mozilla/nsprpub" econf \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	cd "${S}/build"
-	make install
-	insinto /usr
-	doins -r dist/*
-	rm -rf "${D}"/usr/bin/lib*.so
-
-	#removing includes/nspr/md as per fedora spec
-	# i.e a waste of space!
-	rm -rf "${D}/usr/include/nspr/md"
-
-	# there have been /usr/lib/nspr changes (like the ldpath below), but never
-	# have I seen any libraries end up in this directory. lets fix that.
-	# note: I tried doing this fix via the build system. It wont work.
-	if [ ! -e "${D}/usr/lib/nspr" ] ; then
-		mkdir -p "${D}/usr/lib/nspr"
-		mv "${D}"/usr/lib/*so* "${D}/usr/lib/nspr"
-		mv "${D}"/usr/lib/*\.a "${D}/usr/lib/nspr"
-	fi
-	# and while we're at it, lets make it actually use the arch's libdir damnit
-	if [ "lib" != "$(get_libdir)" ] ; then
-		mv "${D}/usr/lib" "${D}/usr/$(get_libdir)"
-	fi
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	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
-	insinto	 /usr/bin
-	doins "${S}/build/config/nspr-config"
-	chmod a+x "${D}/usr/bin/nspr-config"
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "${S}/build/config/nspr.pc"
-}
diff --git a/dev-libs/nss/nss-3.11.7.ebuild b/dev-libs/nss/nss-3.11.7.ebuild
deleted file mode 100644
index 4531b805afc7..000000000000
--- a/dev-libs/nss/nss-3.11.7.ebuild
+++ /dev/null
@@ -1,114 +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.11.7.ebuild,v 1.15 2008/04/11 17:15:38 armin76 Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.6.7"
-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.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="utils"
-
-DEPEND=">=dev-libs/nspr-${NSPR_VER}"
-
-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.11.5-config-1.patch
-	epatch "${FILESDIR}"/${PN}-mips64.patch
-}
-
-src_compile() {
-	strip-flags
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		export USE_64=1
-	fi
-	export NSDISTMODE=copy
-	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=11
-	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}"/nss-config.in "${D}"/usr/bin/nss-config
-	cp "${FILESDIR}"/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.11.9.ebuild b/dev-libs/nss/nss-3.11.9.ebuild
index 31eef5be8f38..e68e2253052e 100644
--- a/dev-libs/nss/nss-3.11.9.ebuild
+++ b/dev-libs/nss/nss-3.11.9.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.11.9.ebuild,v 1.10 2008/09/26 06:23:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.9.ebuild,v 1.11 2008/09/26 06:24:41 armin76 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -33,7 +33,7 @@ src_unpack() {
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
 		-i source.mk
 
-        # Respect LDFLAGS
+	# Respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
 
 	cd "${S}"