From 67157cf90ec9b83f9832b15e0a78757cddfafe39 Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Mon, 11 Feb 2008 12:16:28 +0000 Subject: Version bump Package-Manager: portage-2.1.3.19 --- dev-libs/nspr/ChangeLog | 9 ++- dev-libs/nspr/nspr-4.6.8.ebuild | 93 +++++++++++++++++++++++++++++ dev-libs/nspr/nspr-4.7.0_pre20080129.ebuild | 73 ---------------------- dev-libs/nspr/nspr-4.7.ebuild | 73 ++++++++++++++++++++++ 4 files changed, 174 insertions(+), 74 deletions(-) create mode 100644 dev-libs/nspr/nspr-4.6.8.ebuild delete mode 100644 dev-libs/nspr/nspr-4.7.0_pre20080129.ebuild create mode 100644 dev-libs/nspr/nspr-4.7.ebuild (limited to 'dev-libs/nspr') diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 95ef6724ff23..37df9566993c 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.93 2008/01/31 11:33:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.94 2008/02/11 12:13:56 armin76 Exp $ + +*nspr-4.7 (11 Feb 2008) +*nspr-4.6.8 (11 Feb 2008) + + 11 Feb 2008; Raúl Porcel +nspr-4.6.8.ebuild, + +nspr-4.7.ebuild, -nspr-4.7.0_pre20080129.ebuild: + Version bump *nspr-4.7.0_pre20080129 (31 Jan 2008) diff --git a/dev-libs/nspr/nspr-4.6.8.ebuild b/dev-libs/nspr/nspr-4.6.8.ebuild new file mode 100644 index 000000000000..702886a2199c --- /dev/null +++ b/dev-libs/nspr/nspr-4.6.8.ebuild @@ -0,0 +1,93 @@ +# 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.8.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $ + +inherit eutils multilib + +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 + + if use amd64 || use ppc64 || use ia64 || use s390; then + myconf="${myconf} --enable-64bit" + else + myconf="" + fi + + 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/nspr/nspr-4.7.0_pre20080129.ebuild b/dev-libs/nspr/nspr-4.7.0_pre20080129.ebuild deleted file mode 100644 index 598bdff9dec3..000000000000 --- a/dev-libs/nspr/nspr-4.7.0_pre20080129.ebuild +++ /dev/null @@ -1,73 +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.7.0_pre20080129.ebuild,v 1.1 2008/01/31 11:33:09 armin76 Exp $ - -inherit eutils multilib - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~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.7.0-prtime.patch -} - -src_compile() { - cd "${S}"/build - - if use amd64 || use ppc64 || use ia64 || use s390; then - myconf="${myconf} --enable-64bit" - else - myconf="" - fi - - 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=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} -} diff --git a/dev-libs/nspr/nspr-4.7.ebuild b/dev-libs/nspr/nspr-4.7.ebuild new file mode 100644 index 000000000000..d358412231b6 --- /dev/null +++ b/dev-libs/nspr/nspr-4.7.ebuild @@ -0,0 +1,73 @@ +# 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.7.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $ + +inherit eutils multilib + +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.7.0-prtime.patch +} + +src_compile() { + cd "${S}"/build + + if use amd64 || use ppc64 || use ia64 || use s390; then + myconf="${myconf} --enable-64bit" + else + myconf="" + fi + + 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=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} +} -- cgit v1.2.3-65-gdbad