From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4E69139694 for ; Wed, 7 Jun 2017 17:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3893E0CA7; Wed, 7 Jun 2017 17:26:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD403E0CA7 for ; Wed, 7 Jun 2017 17:26:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05F2A341A94 for ; Wed, 7 Jun 2017 17:26:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 657D17452 for ; Wed, 7 Jun 2017 17:26:09 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1496856338.cfd68b0c8637eaefcf704e686e77536eff3e2403.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nspr/Manifest dev-libs/nspr/files/nspr-4.15-configure_in.patch dev-libs/nspr/nspr-4.14.ebuild dev-libs/nspr/nspr-4.15.ebuild X-VCS-Directories: dev-libs/nspr/files/ dev-libs/nspr/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: cfd68b0c8637eaefcf704e686e77536eff3e2403 X-VCS-Branch: master Date: Wed, 7 Jun 2017 17:26:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e79e09b9-878c-445a-8a68-1b709b41c423 X-Archives-Hash: 1e750767dd6bfd415555a06f6d684ea9 commit: cfd68b0c8637eaefcf704e686e77536eff3e2403 Author: Jory A. Pratt gentoo org> AuthorDate: Wed Jun 7 17:25:38 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Jun 7 17:25:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=cfd68b0c dev-libs/nspr: nspr-4.15 version bump, fix broken configure regeneration dev-libs/nspr/Manifest | 2 +- dev-libs/nspr/files/nspr-4.15-configure_in.patch | 26 ++++++++++++++++++++++ .../nspr/{nspr-4.14.ebuild => nspr-4.15.ebuild} | 3 +++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index bf5aca1..8049e31 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1 +1 @@ -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 diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch b/dev-libs/nspr/files/nspr-4.15-configure_in.patch new file mode 100644 index 0000000..a33717f --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.15-configure_in.patch @@ -0,0 +1,26 @@ +From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Wed, 7 Jun 2017 12:14:46 -0500 +Subject: [PATCH] Close out darwin if statement, will breakage configure.in + rename to configure.ac + +Signed-off-by: Jory A. Pratt +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.in b/configure.in +index 4b2e46d..dc14ee5 100644 +--- a/configure.in ++++ b/configure.in +@@ -1389,6 +1389,7 @@ case "$target" in + changequote([,]) + if test "$HOST_DARWIN_MAJOR" -ge 15 ; then + AC_DEFINE(HAS_CONNECTX) ++ fi + AS='$(CC) -x assembler-with-cpp' + CFLAGS="$CFLAGS -Wall -fno-common" + case "${target_cpu}" in +-- +2.13.1 + diff --git a/dev-libs/nspr/nspr-4.14.ebuild b/dev-libs/nspr/nspr-4.15.ebuild similarity index 97% rename from dev-libs/nspr/nspr-4.14.ebuild rename to dev-libs/nspr/nspr-4.15.ebuild index 7b372af..87057ab 100644 --- a/dev-libs/nspr/nspr-4.14.ebuild +++ b/dev-libs/nspr/nspr-4.15.ebuild @@ -35,6 +35,8 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.9-link-flags.patch # We do not need to pass -L$libdir via nspr-config --libs "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch + # Fix configure.in to we can generate a working configure.ac + "${FILESDIR}"/${PN}-4.15-configure_in.patch ) src_prepare() { @@ -47,6 +49,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