1 |
commit: 4cb505e26e6f2823c5f707770b851714df939b07 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 12 14:25:46 2017 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 12 14:25:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb505e2 |
7 |
|
8 |
dev-util/quilt: Version bump. Tests now working closing bug #316893. Thanks to mjo for discovering and reporting. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-util/quilt/Manifest | 1 + |
13 |
dev-util/quilt/files/quilt-0.65-no-graphviz.patch | 43 ++++++++++++++++ |
14 |
dev-util/quilt/quilt-0.65.ebuild | 61 +++++++++++++++++++++++ |
15 |
3 files changed, 105 insertions(+) |
16 |
|
17 |
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest |
18 |
index abda92426a2..6735e6ec42b 100644 |
19 |
--- a/dev-util/quilt/Manifest |
20 |
+++ b/dev-util/quilt/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST quilt-0.50.tar.gz 452769 SHA256 fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3 SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365 WHIRLPOOL d4823f9c1507fc3b29f605df855c53343bc0e0b300617b8203d9422d3fede2e1930ba9390329b3ee484fbeb7dde5535f9938c84ceee63477eb8fc0c705556822 |
23 |
DIST quilt-0.63.tar.gz 389593 SHA256 2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45 WHIRLPOOL 89b72f38d75e479fc8f030398757ab325ab46ff79baa7227fe122c4902d582374971c8c5f562611f0c024e8b56db01858669cd0427338f2368492ff118f31280 |
24 |
+DIST quilt-0.65.tar.gz 410780 SHA256 f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819 SHA512 37dffe34fe209371f2fbc0af2dbb4dcfa6edd2221aed15f31a0651a0bd457f2af03a98450a3e63406f70e040e944246e5b23733b820665eeb3fd4ff2bdde3a08 WHIRLPOOL 533a355a690ff598caea35ac94d00822baf225b5bb59705ed2cf3d484a1db55068dd7d0ab1ccaedef403b1d0c2c3369037bbd04839899eba46b3ea516fbae4ae |
25 |
|
26 |
diff --git a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch b/dev-util/quilt/files/quilt-0.65-no-graphviz.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..ea06a9eebef |
29 |
--- /dev/null |
30 |
+++ b/dev-util/quilt/files/quilt-0.65-no-graphviz.patch |
31 |
@@ -0,0 +1,43 @@ |
32 |
+--- Makefile.in.orig 2017-04-12 09:27:40.853018901 -0400 |
33 |
++++ Makefile.in 2017-04-12 09:36:16.584315529 -0400 |
34 |
+@@ -78,8 +78,7 @@ QUILT := $(QUILT_IN) |
35 |
+ SRC += $(QUILT_SRC:%=quilt/%) |
36 |
+ DIRT += $(QUILT_IN:%=quilt/%) |
37 |
+ |
38 |
+-SCRIPTS_IN := patchfns inspect-wrapper dependency-graph edmail \ |
39 |
+- remove-trailing-ws backup-files |
40 |
++SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files |
41 |
+ |
42 |
+ SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) |
43 |
+ SCRIPTS := $(SCRIPTS_IN) |
44 |
+--- bash_completion.orig 2017-04-12 09:27:57.643126246 -0400 |
45 |
++++ bash_completion 2017-04-12 09:30:27.673938451 -0400 |
46 |
+@@ -28,7 +28,7 @@ _quilt_completion() |
47 |
+ prev=${COMP_WORDS[COMP_CWORD-1]} |
48 |
+ |
49 |
+ # quilt sub commands |
50 |
+- cmds='add annotate applied delete diff edit files fold fork graph \ |
51 |
++ cmds='add annotate applied delete diff edit files fold fork \ |
52 |
+ grep header import mail new next patches pop previous push refresh \ |
53 |
+ remove rename revert series setup snapshot top unapplied upgrade' |
54 |
+ |
55 |
+@@ -122,19 +122,6 @@ _quilt_completion() |
56 |
+ ;; |
57 |
+ esac |
58 |
+ ;; |
59 |
+- graph) |
60 |
+- case $prev in |
61 |
+- -T) |
62 |
+- COMPREPLY=( $( compgen -W "ps" -- $cur ) ) |
63 |
+- ;; |
64 |
+- --edge-labels) |
65 |
+- COMPREPLY=( $( compgen -W "files" -- $cur ) ) |
66 |
+- ;; |
67 |
+- *) |
68 |
+- COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) |
69 |
+- ;; |
70 |
+- esac |
71 |
+- ;; |
72 |
+ grep) |
73 |
+ type _longopt &> /dev/null && _longopt grep |
74 |
+ COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) ) |
75 |
|
76 |
diff --git a/dev-util/quilt/quilt-0.65.ebuild b/dev-util/quilt/quilt-0.65.ebuild |
77 |
new file mode 100644 |
78 |
index 00000000000..40ccf8926d5 |
79 |
--- /dev/null |
80 |
+++ b/dev-util/quilt/quilt-0.65.ebuild |
81 |
@@ -0,0 +1,61 @@ |
82 |
+# Copyright 1999-2017 Gentoo Foundation |
83 |
+# Distributed under the terms of the GNU General Public License v2 |
84 |
+ |
85 |
+EAPI="5" |
86 |
+ |
87 |
+inherit bash-completion-r1 eutils |
88 |
+ |
89 |
+DESCRIPTION="quilt patch manager" |
90 |
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt" |
91 |
+SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz" |
92 |
+ |
93 |
+LICENSE="GPL-2" |
94 |
+SLOT="0" |
95 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" |
96 |
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS" |
97 |
+ |
98 |
+RDEPEND="sys-apps/ed |
99 |
+ dev-util/diffstat |
100 |
+ graphviz? ( media-gfx/graphviz ) |
101 |
+ elibc_Darwin? ( app-misc/getopt ) |
102 |
+ elibc_SunOS? ( app-misc/getopt ) |
103 |
+ >=sys-apps/coreutils-8.5" |
104 |
+ |
105 |
+PDEPEND="emacs? ( app-emacs/quilt-el )" |
106 |
+ |
107 |
+pkg_setup() { |
108 |
+ use graphviz && return 0 |
109 |
+ echo |
110 |
+ elog "If you intend to use the folding functionality (graphical illustration of the" |
111 |
+ elog "patch stack) then you'll need to remerge this package with USE=graphviz." |
112 |
+ echo |
113 |
+} |
114 |
+ |
115 |
+src_prepare() { |
116 |
+ |
117 |
+ # Add support for USE=graphviz |
118 |
+ use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" |
119 |
+} |
120 |
+ |
121 |
+src_configure() { |
122 |
+ local myconf="" |
123 |
+ [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \ |
124 |
+ myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long" |
125 |
+ econf ${myconf} |
126 |
+} |
127 |
+ |
128 |
+src_install() { |
129 |
+ emake BUILD_ROOT="${D}" install || die "make install failed" |
130 |
+ |
131 |
+ rm -rf "${ED}"/usr/share/doc/${P} |
132 |
+ dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf |
133 |
+ |
134 |
+ rm -rf "${ED}"/etc/bash_completion.d |
135 |
+ newbashcomp bash_completion ${PN} |
136 |
+ |
137 |
+ # Remove the compat symlinks |
138 |
+ rm -rf "${ED}"/usr/share/quilt/compat |
139 |
+ |
140 |
+ # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500 |
141 |
+ rm -rf "${ED}"/usr/share/emacs |
142 |
+} |