| 1 |
commit: 56312573763e794982d7a7284e7e7d1a8a9f8eaa |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 20 14:41:46 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 20 14:41:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56312573 |
| 7 |
|
| 8 |
dev-vcs/git: Build/install some more man-pages without USE="doc" |
| 9 |
|
| 10 |
Thanks-to: Cornelius Weig <bitte.keine.werbung.einwerfen <AT> googlemail.com> |
| 11 |
Bug: https://bugs.gentoo.org/517794 |
| 12 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-vcs/git/git-9999-r1.ebuild | 19 +++++++++---------- |
| 16 |
dev-vcs/git/git-9999-r2.ebuild | 19 +++++++++---------- |
| 17 |
dev-vcs/git/git-9999-r3.ebuild | 19 +++++++++---------- |
| 18 |
dev-vcs/git/git-9999.ebuild | 19 +++++++++---------- |
| 19 |
4 files changed, 36 insertions(+), 40 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 22 |
index 5b1ca9489df..f9275181c5c 100644 |
| 23 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 24 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 25 |
@@ -363,9 +363,10 @@ src_compile() { |
| 26 |
use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 27 |
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 28 |
|| die "emake svn-fe failed" |
| 29 |
+ git_emake svn-fe.1 || die "emake svn-fe.1 failed" |
| 30 |
if use doc ; then |
| 31 |
- git_emake svn-fe.{1,html} \ |
| 32 |
- || die "emake svn-fe.1 svn-fe.html failed" |
| 33 |
+ git_emake svn-fe.html \ |
| 34 |
+ || die "svn-fe.html failed" |
| 35 |
fi |
| 36 |
popd &>/dev/null || die |
| 37 |
fi |
| 38 |
@@ -377,8 +378,8 @@ src_compile() { |
| 39 |
fi |
| 40 |
|
| 41 |
pushd contrib/subtree &>/dev/null || die |
| 42 |
- git_emake |
| 43 |
- use doc && git_emake doc |
| 44 |
+ git_emake git-subtree{,.1} |
| 45 |
+ use doc && git_emake git-subtree.html |
| 46 |
popd &>/dev/null || die |
| 47 |
|
| 48 |
pushd contrib/diff-highlight &>/dev/null || die |
| 49 |
@@ -394,9 +395,7 @@ src_compile() { |
| 50 |
} |
| 51 |
|
| 52 |
src_install() { |
| 53 |
- git_emake \ |
| 54 |
- install || \ |
| 55 |
- die "make install failed" |
| 56 |
+ git_emake install || die "make install failed" |
| 57 |
|
| 58 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 59 |
dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 60 |
@@ -446,9 +445,9 @@ src_install() { |
| 61 |
|
| 62 |
# git-subtree |
| 63 |
pushd contrib/subtree &>/dev/null || die |
| 64 |
- git_emake install || die "Failed to emake install git-subtree" |
| 65 |
+ git_emake install install-man || die "Failed to emake install install-man git-subtree" |
| 66 |
if use doc ; then |
| 67 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 68 |
+ git_emake install-html || die "Failed to emake install-html git-subtree" |
| 69 |
fi |
| 70 |
newdoc README README.git-subtree |
| 71 |
dodoc git-subtree.txt |
| 72 |
@@ -483,9 +482,9 @@ src_install() { |
| 73 |
if use subversion ; then |
| 74 |
pushd contrib/svn-fe &>/dev/null || die |
| 75 |
dobin svn-fe |
| 76 |
+ doman svn-fe.1 |
| 77 |
dodoc svn-fe.txt |
| 78 |
if use doc ; then |
| 79 |
- doman svn-fe.1 |
| 80 |
docinto html |
| 81 |
dodoc svn-fe.html |
| 82 |
fi |
| 83 |
|
| 84 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 85 |
index 5b1ca9489df..f9275181c5c 100644 |
| 86 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 87 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 88 |
@@ -363,9 +363,10 @@ src_compile() { |
| 89 |
use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 90 |
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 91 |
|| die "emake svn-fe failed" |
| 92 |
+ git_emake svn-fe.1 || die "emake svn-fe.1 failed" |
| 93 |
if use doc ; then |
| 94 |
- git_emake svn-fe.{1,html} \ |
| 95 |
- || die "emake svn-fe.1 svn-fe.html failed" |
| 96 |
+ git_emake svn-fe.html \ |
| 97 |
+ || die "svn-fe.html failed" |
| 98 |
fi |
| 99 |
popd &>/dev/null || die |
| 100 |
fi |
| 101 |
@@ -377,8 +378,8 @@ src_compile() { |
| 102 |
fi |
| 103 |
|
| 104 |
pushd contrib/subtree &>/dev/null || die |
| 105 |
- git_emake |
| 106 |
- use doc && git_emake doc |
| 107 |
+ git_emake git-subtree{,.1} |
| 108 |
+ use doc && git_emake git-subtree.html |
| 109 |
popd &>/dev/null || die |
| 110 |
|
| 111 |
pushd contrib/diff-highlight &>/dev/null || die |
| 112 |
@@ -394,9 +395,7 @@ src_compile() { |
| 113 |
} |
| 114 |
|
| 115 |
src_install() { |
| 116 |
- git_emake \ |
| 117 |
- install || \ |
| 118 |
- die "make install failed" |
| 119 |
+ git_emake install || die "make install failed" |
| 120 |
|
| 121 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 122 |
dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 123 |
@@ -446,9 +445,9 @@ src_install() { |
| 124 |
|
| 125 |
# git-subtree |
| 126 |
pushd contrib/subtree &>/dev/null || die |
| 127 |
- git_emake install || die "Failed to emake install git-subtree" |
| 128 |
+ git_emake install install-man || die "Failed to emake install install-man git-subtree" |
| 129 |
if use doc ; then |
| 130 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 131 |
+ git_emake install-html || die "Failed to emake install-html git-subtree" |
| 132 |
fi |
| 133 |
newdoc README README.git-subtree |
| 134 |
dodoc git-subtree.txt |
| 135 |
@@ -483,9 +482,9 @@ src_install() { |
| 136 |
if use subversion ; then |
| 137 |
pushd contrib/svn-fe &>/dev/null || die |
| 138 |
dobin svn-fe |
| 139 |
+ doman svn-fe.1 |
| 140 |
dodoc svn-fe.txt |
| 141 |
if use doc ; then |
| 142 |
- doman svn-fe.1 |
| 143 |
docinto html |
| 144 |
dodoc svn-fe.html |
| 145 |
fi |
| 146 |
|
| 147 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 148 |
index 5b1ca9489df..f9275181c5c 100644 |
| 149 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 150 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 151 |
@@ -363,9 +363,10 @@ src_compile() { |
| 152 |
use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 153 |
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 154 |
|| die "emake svn-fe failed" |
| 155 |
+ git_emake svn-fe.1 || die "emake svn-fe.1 failed" |
| 156 |
if use doc ; then |
| 157 |
- git_emake svn-fe.{1,html} \ |
| 158 |
- || die "emake svn-fe.1 svn-fe.html failed" |
| 159 |
+ git_emake svn-fe.html \ |
| 160 |
+ || die "svn-fe.html failed" |
| 161 |
fi |
| 162 |
popd &>/dev/null || die |
| 163 |
fi |
| 164 |
@@ -377,8 +378,8 @@ src_compile() { |
| 165 |
fi |
| 166 |
|
| 167 |
pushd contrib/subtree &>/dev/null || die |
| 168 |
- git_emake |
| 169 |
- use doc && git_emake doc |
| 170 |
+ git_emake git-subtree{,.1} |
| 171 |
+ use doc && git_emake git-subtree.html |
| 172 |
popd &>/dev/null || die |
| 173 |
|
| 174 |
pushd contrib/diff-highlight &>/dev/null || die |
| 175 |
@@ -394,9 +395,7 @@ src_compile() { |
| 176 |
} |
| 177 |
|
| 178 |
src_install() { |
| 179 |
- git_emake \ |
| 180 |
- install || \ |
| 181 |
- die "make install failed" |
| 182 |
+ git_emake install || die "make install failed" |
| 183 |
|
| 184 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 185 |
dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 186 |
@@ -446,9 +445,9 @@ src_install() { |
| 187 |
|
| 188 |
# git-subtree |
| 189 |
pushd contrib/subtree &>/dev/null || die |
| 190 |
- git_emake install || die "Failed to emake install git-subtree" |
| 191 |
+ git_emake install install-man || die "Failed to emake install install-man git-subtree" |
| 192 |
if use doc ; then |
| 193 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 194 |
+ git_emake install-html || die "Failed to emake install-html git-subtree" |
| 195 |
fi |
| 196 |
newdoc README README.git-subtree |
| 197 |
dodoc git-subtree.txt |
| 198 |
@@ -483,9 +482,9 @@ src_install() { |
| 199 |
if use subversion ; then |
| 200 |
pushd contrib/svn-fe &>/dev/null || die |
| 201 |
dobin svn-fe |
| 202 |
+ doman svn-fe.1 |
| 203 |
dodoc svn-fe.txt |
| 204 |
if use doc ; then |
| 205 |
- doman svn-fe.1 |
| 206 |
docinto html |
| 207 |
dodoc svn-fe.html |
| 208 |
fi |
| 209 |
|
| 210 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 211 |
index 5b1ca9489df..f9275181c5c 100644 |
| 212 |
--- a/dev-vcs/git/git-9999.ebuild |
| 213 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 214 |
@@ -363,9 +363,10 @@ src_compile() { |
| 215 |
use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 216 |
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 217 |
|| die "emake svn-fe failed" |
| 218 |
+ git_emake svn-fe.1 || die "emake svn-fe.1 failed" |
| 219 |
if use doc ; then |
| 220 |
- git_emake svn-fe.{1,html} \ |
| 221 |
- || die "emake svn-fe.1 svn-fe.html failed" |
| 222 |
+ git_emake svn-fe.html \ |
| 223 |
+ || die "svn-fe.html failed" |
| 224 |
fi |
| 225 |
popd &>/dev/null || die |
| 226 |
fi |
| 227 |
@@ -377,8 +378,8 @@ src_compile() { |
| 228 |
fi |
| 229 |
|
| 230 |
pushd contrib/subtree &>/dev/null || die |
| 231 |
- git_emake |
| 232 |
- use doc && git_emake doc |
| 233 |
+ git_emake git-subtree{,.1} |
| 234 |
+ use doc && git_emake git-subtree.html |
| 235 |
popd &>/dev/null || die |
| 236 |
|
| 237 |
pushd contrib/diff-highlight &>/dev/null || die |
| 238 |
@@ -394,9 +395,7 @@ src_compile() { |
| 239 |
} |
| 240 |
|
| 241 |
src_install() { |
| 242 |
- git_emake \ |
| 243 |
- install || \ |
| 244 |
- die "make install failed" |
| 245 |
+ git_emake install || die "make install failed" |
| 246 |
|
| 247 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 248 |
dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 249 |
@@ -446,9 +445,9 @@ src_install() { |
| 250 |
|
| 251 |
# git-subtree |
| 252 |
pushd contrib/subtree &>/dev/null || die |
| 253 |
- git_emake install || die "Failed to emake install git-subtree" |
| 254 |
+ git_emake install install-man || die "Failed to emake install install-man git-subtree" |
| 255 |
if use doc ; then |
| 256 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 257 |
+ git_emake install-html || die "Failed to emake install-html git-subtree" |
| 258 |
fi |
| 259 |
newdoc README README.git-subtree |
| 260 |
dodoc git-subtree.txt |
| 261 |
@@ -483,9 +482,9 @@ src_install() { |
| 262 |
if use subversion ; then |
| 263 |
pushd contrib/svn-fe &>/dev/null || die |
| 264 |
dobin svn-fe |
| 265 |
+ doman svn-fe.1 |
| 266 |
dodoc svn-fe.txt |
| 267 |
if use doc ; then |
| 268 |
- doman svn-fe.1 |
| 269 |
docinto html |
| 270 |
dodoc svn-fe.html |
| 271 |
fi |
Archives