From 149ccad1832c79d3e0c6ccd92ee3ce273ce4ccbe Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 23 Jan 2015 21:06:02 +0000 Subject: [PATCH] Version bump. Removed old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- dev-libs/nspr/ChangeLog | 10 +- dev-libs/nspr/Manifest | 32 +++---- dev-libs/nspr/nspr-4.10.6.ebuild | 95 ------------------- ...{nspr-4.10.7.ebuild => nspr-4.10.8.ebuild} | 11 ++- 4 files changed, 32 insertions(+), 116 deletions(-) delete mode 100644 dev-libs/nspr/nspr-4.10.6.ebuild rename dev-libs/nspr/{nspr-4.10.7.ebuild => nspr-4.10.8.ebuild} (89%) diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 5dfc95f9e7fd..5b8c750b1dfc 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/nspr -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.288 2014/12/10 19:34:49 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.289 2015/01/23 21:06:01 polynomial-c Exp $ + +*nspr-4.10.8 (23 Jan 2015) + + 23 Jan 2015; Lars Wendler -nspr-4.10.6.ebuild, + -nspr-4.10.7.ebuild, +nspr-4.10.8.ebuild: + Version bump. Removed old. 10 Dec 2014; Agostino Sarubbo nspr-4.10.7-r1.ebuild: Stable for x86, wrt bug #531408 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index f8e787137926..039b5ce32d22 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -12,27 +12,27 @@ AUX nspr-4.9.5_nspr_config.patch 445 SHA256 7414eaac7630ba3aa9f3c44b439471abb195 DIST nspr-4.10.2.tar.gz 1103130 SHA256 4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400 SHA512 bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 WHIRLPOOL 0cf2916c4cb595ee3ccd88da636a6599e2c3b5c51193608bbd2acfa9b3bcad89a7135af1f4cf42644495e17fc03c67a8b22719c0efb4faf8aacf1dcd0d0d9511 DIST nspr-4.10.6.tar.gz 1131328 SHA256 df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a SHA512 a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d WHIRLPOOL 6f7f422f50343f177896d9243a9ae89878823e92ffd3511131546a32b3cf481c9af34f5fef43c8a7c1d5974fc0959e1fa06ddd67133034563e06128e50a6f1f2 DIST nspr-4.10.7.tar.gz 1131171 SHA256 389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938 SHA512 bc845b3983ed280dc691e81e08b94b34b8c175e18d455f9e1558a862045df29a3e5c7df291dff7caa0f9d4a9c7e5dd7eb316018f09b9ed444e91502d5a46013e WHIRLPOOL 7bdb1b0d52d2f14403cf93251ad7f6437d59532f50f5b41da9b3ec66f00f1875d624175301920b2f1a251fa27dd4953e15d4da20c131cd5b7b2d049606850869 +DIST nspr-4.10.8.tar.gz 1131130 SHA256 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9 WHIRLPOOL 67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c EBUILD nspr-4.10.2.ebuild 3157 SHA256 0422f1898967d2953e644c05ea60ba9e34cff049acc40d2114112699ca4c887b SHA512 8a584eba2b1ba41808ceb083166fe621ac2eef262ba81608ce1fd004e779b3de03b9d0c8949ac65d55b4e7e4203550094f792af96842cb5abd29c197458a91e7 WHIRLPOOL e17e2c58675f276f5a64e0cc926e24db5cb758ab86b84ec8d1636766fa83ad1eee5c4a42324d727cdb087a75e471b8d196355f280782a9cc45904885f8685761 EBUILD nspr-4.10.6-r1.ebuild 3754 SHA256 f63901e361aaaec1f4aaeec1fcb788b826a56a08b8629e4e4e49d5ae27db092f SHA512 6b8d5553b9cb858b5a1da2577dea28f68837ba1339ed3591ce5ce1819fd994a9263f0d603ba5cb24dc0216c26c9ba2f846405b9b7f89a47bd68e04ee05bd87f0 WHIRLPOOL 6c17bf849f205d9e83e110b34cddbabcdc7d81b3930eba678e27d401041dfa3bb694db23889520e2bf5a5d650395af73d273e732470d2146f9074c7290c03fb7 -EBUILD nspr-4.10.6.ebuild 3060 SHA256 f85c35674b68fb515a42c04ef750a03fa02daf05f1547c2d28d612d2d79b6a53 SHA512 cefadf5b44dbb6a1777d9ca90cd563fb21f0013202341598a31d751c1111c3735b3c5a8b05aa7573e1ebe7e9a2484dc0b39903163ac8e83c4cbdd2e0dbd9e9e3 WHIRLPOOL d102274922bcddd6a20d5e7daeb5ab3f9348445f470f4a31aea675228428e026bf250658fb452544592745c6bf43a3133d6ad2805e1f82c87beb0fc3abcea51b EBUILD nspr-4.10.7-r1.ebuild 3947 SHA256 eb88a1f46ae925cdab2d16501e9d381779ed3947bc2e12fce6efce027aa3bc4d SHA512 9455c614f55cdf881c6d20512293d9477345f1b6b365bd9f39de4bbf7021e09ecddc18f495fae4b52d6d77b439aec039559f7e7d16a1c2e9633905ea315ac074 WHIRLPOOL 2a042c601a8909911a6f7b814a2826883e79855c515817c6c95c88127e60436c7f88e6a85e9e2d312ee0388537ab81f27d4f6bbbd983fa524883bf5895df94e9 -EBUILD nspr-4.10.7.ebuild 3765 SHA256 8f3f5b6813fd582ec1ae36610895ebc7d103730ca82d1224c60c30bed0247394 SHA512 8878c0c5341458f05d0e444c4782d37a5e02096b4236523a22b2298058d3c1bb828742e82117323af259396fecdb923b0f3a09b89e70690edd33525759d13e87 WHIRLPOOL 53366ae81dd522681f7e1ff7eb8848a34278c155514c3e1e161a2c10553f583555a6e54841547489bf068f35f5381f8e6dc841354a06ec4b6763a2b2ebb4570b -MISC ChangeLog 36453 SHA256 4d52d973face9a041ecf2917f85363df8cbb8aaf15799e289b35e959ef86d20c SHA512 059903ea69f1fdb4c38b7c9d70d68c5aa3126643ddf36a6b6e3c80a0c1c1ee620f470f22dfc416b1e081a06cba3803308bfc44f9502f8aece35d9f0d22695256 WHIRLPOOL 5af4e7cb033e534d63e967f917333815e94dd6075d00081607fbb471dfa737ccdd0762d3a6255c8a5ef23fe2a62a5e1c58fa3dfca3a810a2b6b59cddf5ca8605 +EBUILD nspr-4.10.8.ebuild 3955 SHA256 2f4df85fc8cb2ed379f52a5f2037779d2f4dde80ea80807fa7d202a8b5679dec SHA512 3591c70582a76e27c9f160828825120195c50968287e2f0850e4af0343fe1fd3d37c95998a283e7ef36a40e4a60c872ef9463c8045a26bea8de58d001f26502d WHIRLPOOL 6753d86657c92a5738bc12483aec3ff8e478087cb5786da58cf8624b38a8da6152559eefe613ca1e6ace7988894ed624fc217df6672b9c1530838784ca8de384 +MISC ChangeLog 36639 SHA256 8e8f30ebcdcb036845b8be2d3024ac7894ace02d2205df7bd101d31fffc08948 SHA512 3284b906cda173211cf5819a1144497e7695fb994b62be893b11a676adca88176c0d83ea4c7be155625f575f4801a6ff6a01bc4f0907699b76bee9944c2c0a94 WHIRLPOOL b308e6a6676b9f3ad81f5c35eabf91af3694450b1425882b68dd990c12cac9dd2ca177f7364343f403e82839e8fd6962c40e9a99bf6bf9d55d1963d3310b012b MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUiKBaAAoJELp701BxlEWfK3QP/Ampl19MeCg9hApt4fIB//Bl -2hs5Ll+H0cLEDSNCyWIAfCYmWwr7OWKlHYOA/wuEPyFqip1KL/grbOSXKzvPJyV2 -wYorIl7c7qShKJ51lwMlPIlJr52RS7HGU2wC3PZCdBPJ7IwNP4lNM7dhMNcbRpoD -SHaikRgwahyvbJsq9FZ4xAzw+cWGfyhQCAo8A8zFWXVi7kzqmebVi0jhF/yQyOvm -J23ALO0zL9upbDX1cwOMz1pvUybwcr+u4Wi9DABKhO32ewrAxx1cpQOTK4pUaAk1 -tWG6daqXjlQqei5SU/NI0t5d2z8zL1r5WgFudZHF73hU0zK9XBB+no18MzXGefyS -GccPjBASq2R3yHIQi21HwIHCnx+wQIoGlIgUobydAHKLJRi75TL/dMnmD6QIIjiC -jTq1iLhjmUISsLFfFmkI06GlVCuw5JhtK4D6TGAN9T6n6dupocgCoOdX9EcdcZuB -vTJEMF0wKn73YuM/8lxWsjntwUDWotcMeRcDzNoDSSsqi8o5iheKY6vK3egJHUxk -oSa+RYGJkA5aJSJNwAAlcscL5toNoHpxJ4fdF0XdzjkfunBi9qdVIWYz9rGbW+g+ -jJWNul8Z3ALs9Jc315Ts8JiEe275ET5LdG7y+1nfs7JXxzNhuFwfeDfabLjQueEb -s2s7rBjH05DqLuPpqLO/ -=0CpL +iQIcBAEBCAAGBQJUwre6AAoJEPiazRVxLXTF4CYQAILkA/8aZ/tUedsdmXk2Miwo +h+/jMKT0PFwIfBZXo/TM1/CzCCh1dDMfSdFNccvBFGybzfx5Ebefei/5aaDI1NIf +EgFnzZBsBzbvyAhcNC46nzY79AKfCNzzlIzA5LmvC0DY/868r1eVXuV7ihulGkDn +I4mtk3pLpPB2LmpMd++9yXCKCU2DAMzudPoZrPHaS9y5nGjhBLbNtNhg9FXOrsQt +kvrSTt7m5DZTOTH7LTp0ujgrxsA6bkMpa7RxpgSRAosjpvtdrKZrmCDS80+NJVc4 +Wj8faQIRhVX8CfpBVzyS4R4G8e8iIPVLBNOSWOaoa806qI1fbaGHt2FolvGhwfi8 +qj6cj5cgU2UBxo3SbRWXkRGUKCA3+O7SLVkKUy574hTjRACRXgoW1VLF9VUJAhss +gic3RI9naym41IUyruhR3bth4AuZ93qB2lARKoN3qcjS11Ov1mhkqUJdI2RmE3uQ +SlLF8JPhlNSAYFibwBX0KVmcbzq7DYqBJRtl2ciywr8lV/8r5tWXbNSW2k9O94lj +YQpPq43/cH8Mv/zLqb65HTG50Yu9yDg+0+pLxWdggR0w3XDRAyNs3lNpQ7rdbkmb +gmR04YUkw0rxVKzDbTuzJjhJX0TlP3ZpBrghC/M1KMg64+cf371xo1cK+gZqMCES +QiOWmhkBgdPm7pIqSjDk +=VRq9 -----END PGP SIGNATURE----- diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild deleted file mode 100644 index a4aa277129ca..000000000000 --- a/dev-libs/nspr/nspr-4.10.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.10 2014/07/05 12:57:47 ago Exp $ - -EAPI=5 -WANT_AUTOCONF="2.5" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -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-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - - cd "${S}"/nspr - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch - # epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - # We do not need to pass -L$libdir via nspr-config --libs - epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch - - # We must run eautoconf to regenerate configure - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/nspr/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/nspr/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf - einfo "Running a short build test to determine 64bit'ness" - echo > "${T}"/test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ - ac_cv_path_AR="${AR}" \ - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} -} - -src_compile() { - cd "${S}"/build || die - emake -} - -src_install() { - cd "${S}"/build - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - emake DESTDIR="${D}" install - - einfo "removing static libraries as upstream has requested!" - rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." - - # install nspr-config - dobin config/nspr-config - - # Remove stupid files in /usr/bin - rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.10.7.ebuild b/dev-libs/nspr/nspr-4.10.8.ebuild similarity index 89% rename from dev-libs/nspr/nspr-4.10.7.ebuild rename to dev-libs/nspr/nspr-4.10.8.ebuild index 649f6c3f145a..a6f5c67b8693 100644 --- a/dev-libs/nspr/nspr-4.10.7.ebuild +++ b/dev-libs/nspr/nspr-4.10.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.7.ebuild,v 1.1 2014/09/03 16:10:05 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.8.ebuild,v 1.1 2015/01/23 21:06:01 polynomial-c Exp $ EAPI=5 WANT_AUTOCONF="2.5" @@ -106,5 +106,10 @@ multilib_src_install() { dobin config/nspr-config # Remove stupid files in /usr/bin - rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" + rm "${ED}"/usr/bin/prerr.properties || die + + # This is used only to generate prerr.c and prerr.h at build time. + # No other projects use it, and we don't want to depend on perl. + # Talked to upstream and they agreed w/punting. + rm "${ED}"/usr/bin/compile-et.pl || die } -- 2.26.2