From c92755f8352d65496804d076c1d7cbe1f8161de6 Mon Sep 17 00:00:00 2001 From: Stuart Longland Date: Mon, 17 Dec 2007 23:34:06 +0000 Subject: Mark 4.6.7 stable on MIPS. Fix quoting issues in all versions. (Portage version: 2.1.3.19) --- dev-libs/nspr/ChangeLog | 6 +++++- dev-libs/nspr/nspr-4.6.5-r1.ebuild | 28 +++++++++++++-------------- dev-libs/nspr/nspr-4.6.7.ebuild | 30 ++++++++++++++--------------- dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild | 4 ++-- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 3ad8474fb57a..f834163efd90 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.87 2007/12/12 13:57:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.88 2007/12/17 23:34:06 redhatter Exp $ + + 17 Dec 2007; Stuart Longland nspr-4.6.5-r1.ebuild, + nspr-4.6.7.ebuild, nspr-4.7.0_pre20071016.ebuild: + Mark 4.6.7 stable on MIPS. Fix quoting issues in all versions. *nspr-4.7.0_pre20071016 (12 Dec 2007) diff --git a/dev-libs/nspr/nspr-4.6.5-r1.ebuild b/dev-libs/nspr/nspr-4.6.5-r1.ebuild index d07017d7b9d5..04040799d938 100644 --- a/dev-libs/nspr/nspr-4.6.5-r1.ebuild +++ b/dev-libs/nspr/nspr-4.6.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.5-r1.ebuild,v 1.11 2007/04/20 12:09:39 redhatter Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.5-r1.ebuild,v 1.12 2007/12/17 23:34:06 redhatter Exp $ inherit eutils multilib @@ -49,45 +49,45 @@ src_compile() { src_install () { # Their build system is royally fucked, as usual MINOR_VERSION=6 - cd ${S}/build + cd "${S}/build" make install insinto /usr doins -r dist/* - rm -rf ${D}/usr/bin/lib*.so + 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 + 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 + 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) + 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 + 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 + 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 + 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 + doins "${S}/build/config/nspr.pc" } diff --git a/dev-libs/nspr/nspr-4.6.7.ebuild b/dev-libs/nspr/nspr-4.6.7.ebuild index ed98dc8d18c3..92a30fea2892 100644 --- a/dev-libs/nspr/nspr-4.6.7.ebuild +++ b/dev-libs/nspr/nspr-4.6.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.8 2007/08/25 22:39:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.7.ebuild,v 1.9 2007/12/17 23:34:06 redhatter Exp $ inherit eutils multilib @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar LICENSE="MPL-1.1 GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="ipv6 debug" DEPEND="" @@ -49,45 +49,45 @@ src_compile() { src_install () { # Their build system is royally fucked, as usual MINOR_VERSION=6 - cd ${S}/build + cd "${S}/build" make install insinto /usr doins -r dist/* - rm -rf ${D}/usr/bin/lib*.so + 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 + 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 + 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) + 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 + 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 + 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 + 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 + doins "${S}/build/config/nspr.pc" } diff --git a/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild b/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild index b82362fd8dc7..99c1642489cc 100644 --- a/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild +++ b/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild,v 1.1 2007/12/12 13:57:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild,v 1.2 2007/12/17 23:34:06 redhatter Exp $ inherit eutils multilib @@ -59,7 +59,7 @@ src_install () { done # cope with libraries being in /usr/lib/nspr dodir /etc/env.d - echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr + echo "LDPATH=/usr/$(get_libdir)/nspr" > "${D}/etc/env.d/08nspr" # install nspr-config dobin "${S}"/build/config/nspr-config -- cgit v1.2.3-65-gdbad