dev-util/quilt: adjust patch to -p1
authorMarty E. Plummer <hanetzer@startmail.com>
Fri, 26 Apr 2019 16:34:12 +0000 (11:34 -0500)
committerAndreas Sturmlechner <asturm@gentoo.org>
Wed, 8 May 2019 16:59:32 +0000 (18:59 +0200)
Adjusted the patch to be -p1 applicable.

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11834
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
dev-util/quilt/files/quilt-0.66-no-graphviz.patch
dev-util/quilt/quilt-0.66.ebuild

index 324a38dfef491d012e211c55e5ce8a5c465e153a..f82673aac1850ee494209812767bad6c48c1773a 100644 (file)
@@ -1,5 +1,5 @@
---- Makefile.in.orig   2017-04-12 09:27:40.853018901 -0400
-+++ Makefile.in        2017-04-12 09:36:16.584315529 -0400
+--- a/Makefile.in      2017-04-12 09:27:40.853018901 -0400
++++ b/Makefile.in      2017-04-12 09:36:16.584315529 -0400
 @@ -78,8 +78,7 @@ QUILT :=     $(QUILT_IN)
  SRC +=                $(QUILT_SRC:%=quilt/%)
  DIRT +=               $(QUILT_IN:%=quilt/%)
@@ -10,8 +10,8 @@
 
  SCRIPTS_SRC :=        $(SCRIPTS_IN:%=%.in)
  SCRIPTS :=    $(SCRIPTS_IN)
---- bash_completion.orig       2017-04-12 09:27:57.643126246 -0400
-+++ bash_completion    2017-04-12 09:30:27.673938451 -0400
+--- a/bash_completion  2017-04-12 09:27:57.643126246 -0400
++++ b/bash_completion  2017-04-12 09:30:27.673938451 -0400
 @@ -28,7 +28,7 @@ _quilt_completion()
      prev=${COMP_WORDS[COMP_CWORD-1]}
 
index 0657d72ccb2b818720d7cdddb43c4c07ed4fd971..d58b06a7de3298448dc98e167b46e4ef8c201991 100644 (file)
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_prepare() {
        # Add support for USE=graphviz
-       use graphviz || eapply -p0 "${FILESDIR}/${P}-no-graphviz.patch"
+       use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
        default
 }