Version bump (bug #538426). Removed old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 12 insertions, 257 deletions

diff --git a/sys-devel/patch/ChangeLog b/sys-devel/patch/ChangeLog
index 2651ec97f5cf..29293cca3d8e 100644
--- a/sys-devel/patch/ChangeLog
+++ b/sys-devel/patch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-devel/patch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.73 2015/01/31 10:31:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/ChangeLog,v 1.74 2015/02/01 14:14:49 polynomial-c Exp $
+
+*patch-2.7.4 (01 Feb 2015)
+
+  01 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> -patch-2.7.1-r3.ebuild,
+  -patch-2.7.2.ebuild, +patch-2.7.4.ebuild,
+  -files/patch-2.7.1-Fix-removing-empty-directories.patch,
+  -files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch,
+  -files/patch-2.7.1-initialize_data_structures_early_enough.patch,
+  -files/patch-2.7.1-prevent_depend_on_autotools.patch:
+  Version bump (bug #538426). Removed old.
 
   31 Jan 2015; Agostino Sarubbo <ago@gentoo.org> patch-2.7.3.ebuild:
   Stable for ppc, wrt bug #536614
diff --git a/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch b/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch
deleted file mode 100644
index 00193b7ce531..000000000000
--- a/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2f40ef66bea54be23a24f616cde021d8d7fc25be Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@linbit.com>
-Date: Sun, 10 Mar 2013 18:02:54 +0000
-Subject: Fix removing empty directories
-
-Reported by Thomas Moschny <thomas.moschny@gmx.de>:
-src/patch.c (main): Temporary output files are created in the same directory as
-the output file.  Make sure to remove them before removing empty files and
-their empty ancestor directories; else the directories won't be empty.
-tests/remove-directories: Add directory removal test case.
-tests/Makefile.am (TESTS): Add new test case.
----
-diff --git a/src/patch.c b/src/patch.c
-index 0255fbb..010c14a 100644
---- a/src/patch.c
-+++ b/src/patch.c
-@@ -646,8 +646,8 @@ main (int argc, char **argv)
-     if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0))
-       write_fatal ();
-     output_files (NULL);
--    delete_files ();
-     cleanup ();
-+    delete_files ();
-     if (somefailed)
-       exit (1);
-     return 0;
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 5cea52d..cfc4f37 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -50,6 +50,7 @@ TESTS = \
- 	reject-format \
- 	remember-backup-files \
- 	remember-reject-files \
-+	remove-directories \
- 	symlinks \
- 	unmodified-files
- 
-diff --git a/tests/remove-directories b/tests/remove-directories
-new file mode 100644
-index 0000000..6acdc49
---- a/dev/null
-+++ b/tests/remove-directories
-@@ -0,0 +1,29 @@
-+# Copyright (C) 2013 Free Software Foundation, Inc.
-+#
-+# Copying and distribution of this file, with or without modification,
-+# in any medium, are permitted without royalty provided the copyright
-+# notice and this notice are preserved.
-+
-+. $srcdir/test-lib.sh
-+
-+require_cat
-+use_local_patch
-+use_tmpdir
-+
-+# ==============================================================
-+# Remove empty parent diectories when removing a file
-+
-+mkdir dir
-+echo foobar > dir/file
-+cat > apatch <<EOF
-+--- dir/file
-++++ /dev/null
-+@@ -1 +0,0 @@
-+-foobar
-+EOF
-+
-+check 'patch -p0 -E < apatch' <<EOF
-+patching file dir/file
-+EOF
-+
-+ncheck '! test -e dir'
---
-cgit v0.9.0.2
diff --git a/sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch b/sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch
deleted file mode 100644
index e0ce04bcacee..000000000000
--- a/sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From afdfa9ec8e5f9acea4afaa0db758a4ed752dbe65 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@linbit.com>
-Date: Tue, 30 Jul 2013 10:46:19 +0000
-Subject: In dry-run mode, create temporary files in a temporary directory
-
-* src/util.c (make_tempfile): Do not create temporary files in the final output
-directory when in dry-run mode: the path may be read-only.  In addition, we do
-not want to leave intermediary empty output directories around.
----
-diff --git a/src/util.c b/src/util.c
-index 1cc1a68..0af6013 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -1599,7 +1599,7 @@ make_tempfile (char const **name, char letter, char const *real_name,
-   int try_makedirs_errno = ENOENT;
-   char *template;
- 
--  if (real_name)
-+  if (real_name && ! dry_run)
-     {
-       char *dirname, *basename;
- 
---
-cgit v0.9.0.2
diff --git a/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch b/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch
deleted file mode 100644
index 90da0d1b2c59..000000000000
--- a/sys-devel/patch/files/patch-2.7.1-initialize_data_structures_early_enough.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@linbit.com>
-Date: Thu, 04 Oct 2012 10:33:09 +0000
-Subject: Initialize data structures early enough
-
-* src/patch.c (main): Initialize data structures early enough, before error
-paths can access them.
-* tests/bad-usage: Test bad command line usage.
-* tests/Makefile.am (TESTS): Add bad-usage here.
----
-diff --git a/src/patch.c b/src/patch.c
-index 828943b..0255fbb 100644
---- a/src/patch.c
-+++ b/src/patch.c
-@@ -150,6 +150,10 @@ main (int argc, char **argv)
-     else if ((version_control = getenv ("VERSION_CONTROL")))
-       version_control_context = "$VERSION_CONTROL";
- 
-+    init_backup_hash_table ();
-+    init_files_to_delete ();
-+    init_files_to_output ();
-+
-     /* parse switches */
-     Argc = argc;
-     Argv = argv;
-@@ -162,10 +166,6 @@ main (int argc, char **argv)
-     if (make_backups | backup_if_mismatch)
-       backup_type = get_version (version_control_context, version_control);
- 
--    init_backup_hash_table ();
--    init_files_to_delete ();
--    init_files_to_output ();
--
-     init_output (&outstate);
-     if (outfile)
-       outstate.ofp = open_outfile (outfile);
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 02fc6de..5cea52d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -20,6 +20,7 @@ TESTS = \
- 	asymmetric-hunks \
- 	backup-prefix-suffix \
- 	bad-filenames \
-+	bad-usage \
- 	concat-git-diff \
- 	copy-rename \
- 	corrupt-reject-files \
-diff --git a/tests/bad-usage b/tests/bad-usage
-new file mode 100644
-index 0000000..022eeda
---- a/dev/null
-+++ b/tests/bad-usage
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc.
-+#
-+# Copying and distribution of this file, with or without modification,
-+# in any medium, are permitted without royalty provided the copyright
-+# notice and this notice are preserved.
-+
-+. $srcdir/test-lib.sh
-+
-+require_cat
-+use_local_patch
-+use_tmpdir
-+
-+# ==============================================================
-+
-+check 'patch -px || echo "status: $?"' <<EOF
-+$PATCH: **** strip count x is not a number
-+status: 2
-+EOF
---
-cgit v0.9.0.2
diff --git a/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch b/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch
deleted file mode 100644
index 72cf62d768f0..000000000000
--- a/sys-devel/patch/files/patch-2.7.1-prevent_depend_on_autotools.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Simple patch to prevent sys-devel/patch needing to depend on autotools to
-be built, which would likely make stage1 people unhappy.
-
-By: Doug Goldstein <cardoe@gentoo.org>
-Ref: bug #478548
-
-By: Lars Wendler <polynomial-c@gentoo.org>
-Ref: bug #485182
----
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -1075,6 +1075,7 @@
- 	asymmetric-hunks \
- 	backup-prefix-suffix \
- 	bad-filenames \
-+	bad-usage \
- 	concat-git-diff \
- 	copy-rename \
- 	corrupt-reject-files \
-@@ -1104,6 +1105,7 @@
- 	reject-format \
- 	remember-backup-files \
- 	remember-reject-files \
-+	remove-directories \
- 	symlinks \
- 	unmodified-files
- 
-@@ -1294,6 +1296,8 @@
- 	@p='backup-prefix-suffix'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- bad-filenames.log: bad-filenames
- 	@p='bad-filenames'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-+bad-usage.log: bad-usage
-+	@p='bad-usage'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- concat-git-diff.log: concat-git-diff
- 	@p='concat-git-diff'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- copy-rename.log: copy-rename
-@@ -1352,6 +1356,8 @@
- 	@p='remember-backup-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- remember-reject-files.log: remember-reject-files
- 	@p='remember-reject-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-+remove-directories.log: remove-directories
-+	@p='remove-directories'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- symlinks.log: symlinks
- 	@p='symlinks'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
- unmodified-files.log: unmodified-files
diff --git a/sys-devel/patch/patch-2.7.1-r3.ebuild b/sys-devel/patch/patch-2.7.1-r3.ebuild
deleted file mode 100644
index f116dcb205ad..000000000000
--- a/sys-devel/patch/patch-2.7.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.1-r3.ebuild,v 1.2 2014/01/18 03:17:14 vapier Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Fix-removing-empty-directories.patch" \
-		"${FILESDIR}/${P}-dry-run-mode-create-temp-files-in-temp-dir.patch" \
-		"${FILESDIR}/${P}-initialize_data_structures_early_enough.patch" \
-		"${FILESDIR}/${P}-prevent_depend_on_autotools.patch"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-	econf \
-		$(use_enable xattr) \
-		--program-prefix="$(use userland_BSD && echo g)"
-}
diff --git a/sys-devel/patch/patch-2.7.2.ebuild b/sys-devel/patch/patch-2.7.4.ebuild
index b4b474d404b7..8a696dab7418 100644
--- a/sys-devel/patch/patch-2.7.2.ebuild
+++ b/sys-devel/patch/patch-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.2.ebuild,v 1.1 2015/01/21 07:32:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.7.4.ebuild,v 1.1 2015/02/01 14:14:49 polynomial-c Exp $
 
 EAPI=4