From c00f9eebfb692c1849cfc6d8bc04220712cdb397 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 3 Aug 2017 11:42:41 -0700 Subject: [PATCH] bump(dev-libs/nspr): sync with upstream --- .../portage-stable/dev-libs/nspr/Manifest | 14 +-- .../dev-libs/nspr/nspr-4.12.ebuild | 119 ------------------ .../{nspr-4.13.ebuild => nspr-4.16.ebuild} | 3 +- .../metadata/md5-cache/dev-libs/nspr-4.12 | 13 -- .../dev-libs/{nspr-4.13 => nspr-4.16} | 4 +- 5 files changed, 5 insertions(+), 148 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.12.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/nspr/{nspr-4.13.ebuild => nspr-4.16.ebuild} (98%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.12 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{nspr-4.13 => nspr-4.16} (91%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest index f29c86228d..c3c51a2514 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest @@ -1,16 +1,4 @@ -AUX nspr-4.10.6-solaris.patch 973 SHA256 996942383de76958405f4817033eb1c848306c0724db33a8281cf95f5ef6bc84 SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1 WHIRLPOOL 339bfe192069f740ab20b6ad4792db9c8f1e353db7afc8f68c5f8accfca8112d5a4c96ab522331bbe14afddc850b593a8eaab8a109b4f09a0436463a30444419 -AUX nspr-4.15-configure_in.patch 737 SHA256 7cd7b85897e0d88a0f7b0e9591219d49099b192d7e46657929c0e81a20ec5376 SHA512 a17c50642aceb7a50ef1be378e1cee09f4932d1cb66398eb2f740dd608cd2da492e8dad406474208cd1b7b8144bbef13ef7553f14dc731131c0e60f005dcedf6 WHIRLPOOL 69bde4f337e2d025a524db0ee2eafabb9d2be069fe4895c80bdac4549559b434cd39f8f6ff853763c4bc1ae5a405f9803ca0903d63ec2fac138490d6a01e4eaf -AUX nspr-4.7.0-prtime.patch 859 SHA256 b34d6232a463e2a3075eeb475cbcc0448c43ccaa33fce0771df0fcc28216e517 SHA512 d8421bc11de5ec5e116c7eba3f31fcdde27796a64948d16aa1fb1822a29a92d8810056719ca60bcb96b1734b0e84c95250075c18acbcb631786249af7d679492 WHIRLPOOL 6eb9d51dcbae16c629504a3b7224c693d6f375bc1c4035503614ae49ea329449c647a0a462e91bd94c94272bd93993fafb8e64af8f2400dff271aeb6be0afab5 -AUX nspr-4.7.1-solaris.patch 411 SHA256 c989f0a6521f604e808dac2aeaa36ebaed9174280a1a40de18c5442531782fe7 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79 WHIRLPOOL 71f43a347208412291c47f8eacc195c301e271f14f237bd7e5645dfd59574051417e0a419d50eb6d1319687e6990a6c96c9f236277a3e455c9c3d98d2aaf93a3 -AUX nspr-4.8.4-darwin-install_name.patch 1046 SHA256 45466a4746bad849f794429a2f0d727a795362b9e45a5ec0b40e207b7973bb81 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2 WHIRLPOOL c196bffad698c9c1bcb307af7dd6fcc94c6e2ffd58cdc10f98558a680f9f06497e079e3dd8b329b1a4e224b45986a1886ec1d6b519cf1ced174e9489a7463258 -AUX nspr-4.8.9-link-flags.patch 931 SHA256 ae67a99de11c953cbf56a80215b7b2744cd5e23f37524fee0dc2b3367b7fb775 SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975 WHIRLPOOL 6665d90dcce285dd9427fffb21e8c97aad8593a44f12c2205657e6315b66cfceec9d5b6d9beca90593fd54d2320ffbd15893dabeae150204a15d1d89e3d6e54a -AUX nspr-4.9.5_nspr_config.patch 251 SHA256 0bfdcaf810b01bc602ea5a9b913988dabd3d857ad63fa22aa342aacbe20d3d1e SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310 WHIRLPOOL af62f74393978c7f99ea9219b2bd1f4f5682de4b1ce194a3eec35420e5d2b3245086de02b299273ccc0fa33ca0d7e0fd05c3689539fa4fee36fc677a90ef615d DIST nspr-4.13.1.tar.gz 1136646 SHA256 5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694 WHIRLPOOL aa0b9731eb11b8418fced5a1ce52c801657dc738cba0f198fa4b685296e321dd168de8d4ba04335695ac1c6c345563b60e2a49af9a30069d301712c0c1c51f83 DIST nspr-4.14.tar.gz 1136626 SHA256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 WHIRLPOOL e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce DIST nspr-4.15.tar.gz 1140182 SHA256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 SHA512 1d6e9ba3ef71376ddb4f5ef2a6796bf3f95cf37abfac89d1745f02cc01003877d088a87946208d3827a3b3e28420215e543a647aadceff2ae6f9c1c70d4ac563 WHIRLPOOL c69216c577a466317c760e2745f2d1ea71915160990ee6ed2c649b45b314bbcef470e950cf001f43898213c09b39cb016df2a49dbe3f91448d0cc345d38017b1 -EBUILD nspr-4.13.1.ebuild 4017 SHA256 c9724de9196fa039e13c51e812c8a6b8cb64b90826e312951313307534740878 SHA512 28de383935ca9910cd6c5562f02bfd6166964a55b96fe674f17f9247979bcec6103ff13731ba87d740358587916f60195dfb195a730e7e68516f8e7b2606396f WHIRLPOOL 4cedd9456f005b3a8d075a81c4e046644ee9345f2871cc9fdbe5883bde18a2da8890783afb09bc4929a08be2325b56183e1dfee8c2570681b40e7c9fccb8ee86 -EBUILD nspr-4.14.ebuild 4027 SHA256 8ccc1130059ac7a826c9287833fbd5c1cae9193219e97faf89296ec58a3aacbd SHA512 863d661770449df6436403eabaf0fec6d6a36ea249c73baad17c27e749230ec13da8d08d4fd71cc0ed6193ff4a3e501257a767b9c40b4314f5ac4439dd1905f5 WHIRLPOOL 6eac4aafbc32c098c823593bc8c2caeaeaff75218ac109f56bf57c87264d29e0876907bb5b8fdea0b253c9c9a1d839ba49affefac6ddceb7a0363924c54572f3 -EBUILD nspr-4.15.ebuild 4135 SHA256 4b616906c92c42a3d133fa4cd39c9c831f269d3918bb5164c7803b40468b78ce SHA512 1812ad18c1ab9d5796565a84ef3cde0a34d8018505790fc916b73eef158183978eb0b8f010156f7f9fe83124a6e283f74457f223e83c1537eec570fe43357793 WHIRLPOOL 0ae98e28435a5f2a7c44c8f96e5bf4baa919f8d648170eb08e9371ecb4cc2d50d53558a31cd09854381728638333fae3d53858346dd70525681ed7210f834d91 -MISC ChangeLog 9885 SHA256 1f9dbd96de1800645e771182f632ebc784bb85fc554ae4f934d53e2cb036ae4a SHA512 0737f99a0c286bf1aa15257001a389b5c8cfd7f85cfb96903c9f63aa18ea7ef1dbca06f3f1a705fa82e02ae756279977d2d3f724e1497b99fcab8a5385744f68 WHIRLPOOL d5fe2717af87feaf17ad081fbdd1a24c9e11966a338f7ed34feab4c089086b9ea0213073e19e2b72eb2ffa697e11fe81d659a4cb5547eb178bbd793c4a0baeac -MISC ChangeLog-2015 37574 SHA256 9aa5e372370aebb7663d3378348d8d6af2744c1dad1a69f5f8930c4b6e48481b SHA512 0b72ea173a15aafc646dddddc3b485aab165623c4065f773fa3e84839e6f05dc8df55ec3e7d62d1c5a4239e394658ba5ccad0841cad8f700a82a14765eb0f1b2 WHIRLPOOL f76c6f1248d1560495e96b6e356e65639f88dab6eede0b2077859d54025c5f5da8d7752376b347ab3de6408facbd3e0d2443d4ac000b8074e44b06916a09d5b7 -MISC metadata.xml 250 SHA256 6482f1f0210d1b5be8fa75dfbe107df6da702461e36abe6ee77808b4118d5bab SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b WHIRLPOOL bbdc6963f21df602d4bbaec882e9ac860417eccf7528546f4ec24f13368b9b86a1b6830c51feb0bb46bb384fc1aa0e8751c4be88103f9b4895ff9ed4e1d52bbc +DIST nspr-4.16.tar.gz 1140681 SHA256 9b3102d97665504aeee73363c11a21c062ad67a2522242368b7f019f96a53cd1 SHA512 38cb8b26c2ee44063357a9484f1f6b24bab00a0d28a8f1644f64356205e7a407a1858d7a4d5cd2d6b62a39d3c0aea0cf2bddaa95fe61df272a633fe5fdee41b6 WHIRLPOOL a1c0ffb03df9cc79252cff6d39548e828617690b2ded0b6151f809ad2e78b394a001d15ceb8d6ca207b71c79d888bdd53fc4b10402bb0114ecc81291965e4d3b diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.12.ebuild deleted file mode 100644 index 0fac2dc638..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.12.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WANT_AUTOCONF="2.5" - -inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="https://archive.mozilla.org/pub/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" - -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nspr-config -) - -src_prepare() { - cd "${S}"/nspr || die - 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.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 - - # rename configure.in to configure.ac for new autotools compatibility - if [[ -e "${S}"/nspr/configure.in ]] ; then - einfo "Renaming configure.in to configure.ac" - mv "${S}"/nspr/configure.{in,ac} || die - fi - # 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 -} - -multilib_src_configure() { - # 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=() - - # The configure has some fancy --enable-{{n,x}32,64bit} switches - # that trigger some code conditional to platform & arch. This really - # matters for the few common arches (x86, ppc) but we pass a little - # more of them to be future-proof. - - # use ABI first, this will work for most cases - case "${ABI}" in - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; - n32) myconf+=( --enable-n32 );; - x32) myconf+=( --enable-x32 );; - s390x|*64) myconf+=( --enable-64bit );; - default) # no abi actually set, fall back to old check - einfo "Running a short build test to determine 64bit'ness" - echo > "${T}"/test.c || die - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) myconf+=( --enable-x32 );; - *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 ;; - *) ;; - 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[@]}" -} - -multilib_src_install() { - # 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 - - # 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 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.16.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.13.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.16.ebuild index bad26dde89..56daac76f5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,6 +47,7 @@ src_prepare() { einfo "Renaming configure.in to configure.ac" mv "${S}"/nspr/configure.{in,ac} || die fi + # We must run eautoconf to regenerate configure eautoconf diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.12 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.12 deleted file mode 100644 index cdd218da03..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.12 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Netscape Portable Runtime -EAPI=5 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -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 -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) -SLOT=0 -SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.12/src/nspr-4.12.tar.gz -_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=6fd5b7fa53ae3e0902376b57d6dcac6c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.13 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.16 similarity index 91% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.13 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.16 index 025a094f55..2c7a60f256 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.13 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.16 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) SLOT=0 -SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.13/src/nspr-4.13.tar.gz +SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.16/src/nspr-4.16.tar.gz _eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=a261d30cd909b99564dd9b26ba0648ef +_md5_=c8465589b4e5542e7fb7dc43144ae14d