From add161b65765756f04617c43ba01c14ff12db666 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 25 Mar 2014 20:50:36 +0000
Subject: Fix inverted logic in popen binary patch #504504 by Jeroen Roovers.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key D2E96200)
---
 app-arch/sharutils/ChangeLog                       |  8 +++++-
 .../sharutils/files/sharutils-4.14-popen-rb.patch  |  2 +-
 app-arch/sharutils/sharutils-4.14-r1.ebuild        | 32 ++++++++++++++++++++++
 app-arch/sharutils/sharutils-4.14.ebuild           | 32 ----------------------
 4 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 app-arch/sharutils/sharutils-4.14-r1.ebuild
 delete mode 100644 app-arch/sharutils/sharutils-4.14.ebuild

(limited to 'app-arch')

diff --git a/app-arch/sharutils/ChangeLog b/app-arch/sharutils/ChangeLog
index baab556727a6..5d0504604f72 100644
--- a/app-arch/sharutils/ChangeLog
+++ b/app-arch/sharutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/sharutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.119 2014/03/16 17:14:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.120 2014/03/25 20:50:36 vapier Exp $
+
+*sharutils-4.14-r1 (25 Mar 2014)
+
+  25 Mar 2014; Mike Frysinger <vapier@gentoo.org> +sharutils-4.14-r1.ebuild,
+  -sharutils-4.14.ebuild, files/sharutils-4.14-popen-rb.patch:
+  Fix inverted logic in popen binary patch #504504 by Jeroen Roovers.
 
   16 Mar 2014; Markus Meier <maekke@gentoo.org> sharutils-4.14.ebuild:
   arm stable, bug #502608
diff --git a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
index 7c3c909c7a2a..c502a623c1f6 100644
--- a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
+++ b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
@@ -26,7 +26,7 @@ we know the answer already, so hardcode it to true.
 -}
 -_ACEOF
 -if ac_fn_c_try_run "$LINENO"; then :
-+if true; then
++if false; then
 +if true; then
  
  $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
diff --git a/app-arch/sharutils/sharutils-4.14-r1.ebuild b/app-arch/sharutils/sharutils-4.14-r1.ebuild
new file mode 100644
index 000000000000..cf7edb37d654
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.14-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.14-r1.ebuild,v 1.1 2014/03/25 20:50:36 vapier Exp $
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="http://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}
diff --git a/app-arch/sharutils/sharutils-4.14.ebuild b/app-arch/sharutils/sharutils-4.14.ebuild
deleted file mode 100644
index cbad78ee8b3b..000000000000
--- a/app-arch/sharutils/sharutils-4.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.14.ebuild,v 1.4 2014/03/16 17:14:55 maekke Exp $
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Tools to deal with shar archives"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/texinfo
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
-}
-
-src_configure() {
-	strip-linguas -u po
-	econf $(use_enable nls)
-}
-- 
cgit v1.2.3-65-gdbad