From: Jory Pratt Date: Mon, 22 Feb 2010 00:59:01 +0000 (+0000) Subject: minor fix ups, readd ipv6 useflag X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c498b4c721ef2394ed29f33bda71cc701ac12763;p=gentoo.git minor fix ups, readd ipv6 useflag Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 1f4d0faa143a..1ceb5930266f 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.135 2010/02/11 03:30:01 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.136 2010/02/22 00:59:01 anarchy Exp $ + +*nspr-4.8.3-r3 (22 Feb 2010) + + 22 Feb 2010; -nspr-4.8.3-r2.ebuild, + +nspr-4.8.3-r3.ebuild: + minor fix ups, readd ipv6 useflag *nspr-4.8.3-r2 (11 Feb 2010) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index d382de499975..9046f9914445 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -19,7 +19,7 @@ EBUILD nspr-4.7.3.ebuild 2470 RMD160 3b1b38af3f205dab83d1fdd6112f1f2bb11f7298 SH EBUILD nspr-4.7.4.ebuild 2469 RMD160 0f9cbd74d5aadf99d323011b6bbf3a7f0a3910ca SHA1 3613ececadf279496d3adb07d9376ebd79156c63 SHA256 d7289a6330e65ca4ef77d4e4ca93ba6b277484be483e2cbf3aa6163e1dfa0bcc EBUILD nspr-4.8.2-r1.ebuild 2607 RMD160 ec977cfce2c8bedd528ecdf08ea799773cd5209a SHA1 a1bc50dde433dd7cca362a37e1d94b7124c6ea8d SHA256 a744309fbc7c6467c0c4f1206518d6a1dfe97d8a31ecf1c7edb8cd8ba5a7bd23 EBUILD nspr-4.8.2.ebuild 2602 RMD160 e0ed0f3ed8a1dc9b4842c6d36891ae73aa53110c SHA1 dd7cc63640d5c76bb92fc3657c90ee8882bd0ae9 SHA256 eea6ab1134f6cca3ad9f94b806ee40fef11b370924f2474c68c62c1eb98cb9a3 -EBUILD nspr-4.8.3-r2.ebuild 2469 RMD160 09361143081d04f6a37ad69f97047da9663468e5 SHA1 fd4c3ba2948b3a4ee1b016a505a56a2eff42ec8b SHA256 5269c946cae0bb842c5bc6dad3080551495bf86c757bda27a34f4b47d66378c7 +EBUILD nspr-4.8.3-r3.ebuild 2762 RMD160 b6ac8e029645a4e96a1a0a6cef8c78263252b6ad SHA1 acd82b62bdbf6ce75c540a808f2c8ad65cfbc891 SHA256 db9e6f71beb9a43f1f6516dd2678316ddf77b413f1edd5c8a779fd39f758a14d EBUILD nspr-4.8.ebuild 2547 RMD160 a712f9f925c0bd045904a56d8b3a7ce09c44b9bb SHA1 26005a81d7cfd5ff5d571431da4452cff7cde536 SHA256 c49138f629d41b2958583b212a137908c5508228be87756217057c5c2e036e8d -MISC ChangeLog 17361 RMD160 67d50632aab0b064e4ab64ca26da6d7ed7b0490c SHA1 1d91467d07e3bdfc46d85f72acf97c66d2253f1e SHA256 bf46d3228bb9e132901631ddacfecba15656592d4105c8de9cbbc16b50881551 +MISC ChangeLog 17512 RMD160 5a3018f332ca23e8f0725f3227ac6816116fda66 SHA1 0e33ca807528b9832be844313c9a0d67af1adf55 SHA256 b02c4db6ee4d2815db6d75c2a7f12c36c06e9ed498278842aa9d4b50369ad51b MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/dev-libs/nspr/nspr-4.8.3-r2.ebuild b/dev-libs/nspr/nspr-4.8.3-r3.ebuild similarity index 75% rename from dev-libs/nspr/nspr-4.8.3-r2.ebuild rename to dev-libs/nspr/nspr-4.8.3-r3.ebuild index 54c07a27ff1a..76aba563fd7a 100644 --- a/dev-libs/nspr/nspr-4.8.3-r2.ebuild +++ b/dev-libs/nspr/nspr-4.8.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.3-r2.ebuild,v 1.1 2010/02/11 03:30:01 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.3-r3.ebuild,v 1.1 2010/02/22 00:59:01 anarchy Exp $ inherit eutils multilib toolchain-funcs versionator @@ -13,7 +13,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" -IUSE="debug" +IUSE="debug ipv6" src_unpack() { unpack ${A} @@ -46,8 +46,9 @@ src_compile() { ECONF_SOURCE="../mozilla/nsprpub" econf \ $(use_enable debug) \ $(use_enable !debug optimize) \ + $(use_enable ipv6) \ ${myconf} || die "econf failed" - make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" } src_install () { @@ -59,23 +60,23 @@ src_install () { cd "${D}"/usr/$(get_libdir) for file in *.a; do einfo "removing static libraries as upstream has requested!" - rm ${file} + rm -f ${file} || die "failed to remove staic libraries." done for file in *.so; do - mv ${file} ${file}.${MINOR_VERSION} - ln -s ${file}.${MINOR_VERSION} ${file} + mv ${file} ${file}.${MINOR_VERSION} || die "failed to mv files around" + ln -s ${file}.${MINOR_VERSION} ${file} || die "failed to symlink files." done # install nspr-config - dobin "${S}"/build/config/nspr-config + dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" # create pkg-config file insinto /usr/$(get_libdir)/pkgconfig/ - doins "${S}"/build/config/nspr.pc + doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" # Remove stupid files in /usr/bin - rm "${D}"/usr/bin/prerr.properties + rm -f "${D}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" } pkg_postinst() {