[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date:	Mon, 25 Feb 2019 00:38:56
Message-Id:	`1551054782.cda2297a6fe94c1b8f0d770787d6ab78185024e5.polynomial-c@gentoo`

1

commit:     cda2297a6fe94c1b8f0d770787d6ab78185024e5

2

Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

3

AuthorDate: Mon Feb 25 00:29:22 2019 +0000

4

Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

5

CommitDate: Mon Feb 25 00:33:02 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda2297a

7

8

dev-vcs/git: Bump to version 2.21.0. Removed old.

9

10

Package-Manager: Portage-2.3.62, Repoman-2.3.12

11

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

12

13

 dev-vcs/git/Manifest                               |  6 ++---

14

 .../{git-2.21.0_rc2.ebuild => git-2.21.0.ebuild}   | 30 ++++++++++++----------

15

 2 files changed, 20 insertions(+), 16 deletions(-)

16

17

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest

18

index 8563ba3264c..d07847a65ba 100644

19

--- a/dev-vcs/git/Manifest

20

+++ b/dev-vcs/git/Manifest

21

@@ -1,9 +1,9 @@

22

 DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96

23

 DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c

24

-DIST git-2.21.0.rc2.tar.xz 5399292 BLAKE2B 81cb6ecf7d5e4c9e0943632fa94295d1ac5a80dea8233d5f7329ef41c14fee475e1fcd26caeb08b132d6b4a81ca10f1499718bdb725322bf2ff58e7826eae172 SHA512 9d97af084d1159893fc9da3c6c62ac6c30a06a910e9d76ef303449f808cf95e54b1c7d08f7250455e9b9bcfe5cdf9b66dc425e2f5d653908587c07db9b29f747

25

+DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973

26

 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634

27

 DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63

28

-DIST git-htmldocs-2.21.0.rc2.tar.xz 1235132 BLAKE2B 9bc6b53c8c1c0ac073a00ec7ef8c0df17af22a16ad5e11eea0ebbc23bd8ae69f6d8111e8d64f9555184782fbb8a200fdfec9f87f6da2001ab70838ccf2db479b SHA512 de24493b56da942d1c889e4ca1318cb445fa082c77e6b1d212ef7c880064d054d21afdd61c555df2576b457c2b01c9933a511403aaf6a716843de1f1cc8462ce

29

+DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4

30

 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1

31

 DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7

32

-DIST git-manpages-2.21.0.rc2.tar.xz 440180 BLAKE2B 9f4e45a27e20a96a53a829e6800d2cd66f9bbc6da601ec50ea19bfb434d52ad44e1ff611253f97e23b0999fd46ffa63d87760530ed2d45671b2298c7c027d432 SHA512 36185d079d865846112836def1b352757f7a6bcf49a8b241181a179cc599c535e913d31b4580241b58a07d2d1d694e766eaaa4dba5ffdbe716142050c9f66d29

33

+DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30

34

35

diff --git a/dev-vcs/git/git-2.21.0_rc2.ebuild b/dev-vcs/git/git-2.21.0.ebuild

36

similarity index 96%

37

rename from dev-vcs/git/git-2.21.0_rc2.ebuild

38

rename to dev-vcs/git/git-2.21.0.ebuild

39

index c26c4f8ee32..ad2cb1dae85 100644

40

--- a/dev-vcs/git/git-2.21.0_rc2.ebuild

41

+++ b/dev-vcs/git/git-2.21.0.ebuild

42

@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then

43

 	esac

44

fi

45

46

-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

47

+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

48

49

 MY_PV="${PV/_rc/.rc}"

50

 MY_P="${PN}-${MY_PV}"

51

@@ -194,7 +194,7 @@ exportmakeopts() {

52

)

53

54

 	# For svn-fe

55

-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"

56

+	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )

57

58

 	# can't define this to null, since the entire makefile depends on it

59

 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die

60

@@ -202,13 +202,13 @@ exportmakeopts() {

61

 	if use pcre; then

62

 		if use pcre-jit; then

63

 			myopts+=( USE_LIBPCRE2=YesPlease )

64

-			extlibs+=" -lpcre2-8"

65

+			extlibs+=( -lpcre2-8 )

66

 		else

67

 			myopts+=(

68

 				USE_LIBPCRE1=YesPlease

69

 				NO_LIBPCRE1_JIT=YesPlease

70

)

71

-			extlibs+=" -lpcre"

72

+			extlibs+=( -lpcre )

73

fi

74

fi

75

 # Disabled until ~m68k-mint can be keyworded again

76

@@ -233,7 +233,7 @@ exportmakeopts() {

77

 			NEEDS_LIBICONV=YesPlease

78

 			HAVE_CLOCK_MONOTONIC=1

79

)

80

-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \

81

+		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \

82

 			myopts+=( HAVE_GETDELIM=1 )

83

fi

84

85

@@ -246,7 +246,7 @@ exportmakeopts() {

86

 		myopts+=( NO_NSEC=YesPlease )

87

88

 	export MY_MAKEOPTS="${myopts[@]}"

89

-	export EXTLIBS="${extlibs}"

90

+	export EXTLIBS="${extlibs[@]}"

91

}

92

93

 src_unpack() {

94

@@ -359,12 +359,14 @@ src_compile() {

95

 		pushd contrib/svn-fe &>/dev/null || die

96

 		# by defining EXTLIBS we override the detection for libintl and

97

 		# libiconv, bug #516168

98

-		local nlsiconv=

99

-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"

100

-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"

101

-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"

102

+		local nlsiconv=()

103

+		use nls && use !elibc_glibc && nlsiconv+=( -lintl )

104

+		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )

105

+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \

106

+			|| die "emake svn-fe failed"

107

 		if use doc ; then

108

-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"

109

+			git_emake svn-fe.{1,html} \

110

+				|| die "emake svn-fe.1 svn-fe.html failed"

111

fi

112

 		popd &>/dev/null || die

113

fi

114

@@ -407,6 +409,7 @@ src_install() {

115

 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]

116

 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}

117

 	use doc && dodir /usr/share/doc/${PF}/html

118

+	local d

119

 	for d in / /howto/ /technical/ ; do

120

 		docinto ${d}

121

 		dodoc Documentation${d}*.txt

122

@@ -432,7 +435,7 @@ src_install() {

123

 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}

124

 		# don't add automatically to the load-path, so the sitefile

125

 		# can do a conditional loading

126

-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"

127

+		touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch"

128

 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}

129

fi

130

131

@@ -515,6 +518,7 @@ src_install() {

132

 		stats

133

 		workdir

134

)

135

+	local i

136

 	for i in "${contrib_objects[@]}" ; do

137

 		cp -rf \

138

 			"${S}"/contrib/${i} \

139

@@ -535,7 +539,7 @@ src_install() {

140

 		newdoc  "${S}"/gitweb/README README.gitweb

141

142

 		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do

143

-			if test -d "$d" ; then find "$d" \

144

+			if test -d "${d}" ; then find "${d}" \

145

 				-name .packlist \

146

 				-delete || die

147

fi

1	commit: cda2297a6fe94c1b8f0d770787d6ab78185024e5
2	Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3	AuthorDate: Mon Feb 25 00:29:22 2019 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Mon Feb 25 00:33:02 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda2297a
7
8	dev-vcs/git: Bump to version 2.21.0. Removed old.
9
10	Package-Manager: Portage-2.3.62, Repoman-2.3.12
11	Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13	dev-vcs/git/Manifest \| 6 ++---
14	.../{git-2.21.0_rc2.ebuild => git-2.21.0.ebuild} \| 30 ++++++++++++----------
15	2 files changed, 20 insertions(+), 16 deletions(-)
16
17	diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
18	index 8563ba3264c..d07847a65ba 100644
19	--- a/dev-vcs/git/Manifest
20	+++ b/dev-vcs/git/Manifest
21	@@ -1,9 +1,9 @@
22	DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96
23	DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c
24	-DIST git-2.21.0.rc2.tar.xz 5399292 BLAKE2B 81cb6ecf7d5e4c9e0943632fa94295d1ac5a80dea8233d5f7329ef41c14fee475e1fcd26caeb08b132d6b4a81ca10f1499718bdb725322bf2ff58e7826eae172 SHA512 9d97af084d1159893fc9da3c6c62ac6c30a06a910e9d76ef303449f808cf95e54b1c7d08f7250455e9b9bcfe5cdf9b66dc425e2f5d653908587c07db9b29f747
25	+DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973
26	DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634
27	DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63
28	-DIST git-htmldocs-2.21.0.rc2.tar.xz 1235132 BLAKE2B 9bc6b53c8c1c0ac073a00ec7ef8c0df17af22a16ad5e11eea0ebbc23bd8ae69f6d8111e8d64f9555184782fbb8a200fdfec9f87f6da2001ab70838ccf2db479b SHA512 de24493b56da942d1c889e4ca1318cb445fa082c77e6b1d212ef7c880064d054d21afdd61c555df2576b457c2b01c9933a511403aaf6a716843de1f1cc8462ce
29	+DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4
30	DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1
31	DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7
32	-DIST git-manpages-2.21.0.rc2.tar.xz 440180 BLAKE2B 9f4e45a27e20a96a53a829e6800d2cd66f9bbc6da601ec50ea19bfb434d52ad44e1ff611253f97e23b0999fd46ffa63d87760530ed2d45671b2298c7c027d432 SHA512 36185d079d865846112836def1b352757f7a6bcf49a8b241181a179cc599c535e913d31b4580241b58a07d2d1d694e766eaaa4dba5ffdbe716142050c9f66d29
33	+DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30
34
35	diff --git a/dev-vcs/git/git-2.21.0_rc2.ebuild b/dev-vcs/git/git-2.21.0.ebuild
36	similarity index 96%
37	rename from dev-vcs/git/git-2.21.0_rc2.ebuild
38	rename to dev-vcs/git/git-2.21.0.ebuild
39	index c26c4f8ee32..ad2cb1dae85 100644
40	--- a/dev-vcs/git/git-2.21.0_rc2.ebuild
41	+++ b/dev-vcs/git/git-2.21.0.ebuild
42	@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then
43	esac
44	fi
45
46	-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
47	+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
48
49	MY_PV="${PV/_rc/.rc}"
50	MY_P="${PN}-${MY_PV}"
51	@@ -194,7 +194,7 @@ exportmakeopts() {
52	)
53
54	# For svn-fe
55	- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
56	+ extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
57
58	# can't define this to null, since the entire makefile depends on it
59	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile \|\| die
60	@@ -202,13 +202,13 @@ exportmakeopts() {
61	if use pcre; then
62	if use pcre-jit; then
63	myopts+=( USE_LIBPCRE2=YesPlease )
64	- extlibs+=" -lpcre2-8"
65	+ extlibs+=( -lpcre2-8 )
66	else
67	myopts+=(
68	USE_LIBPCRE1=YesPlease
69	NO_LIBPCRE1_JIT=YesPlease
70	)
71	- extlibs+=" -lpcre"
72	+ extlibs+=( -lpcre )
73	fi
74	fi
75	# Disabled until ~m68k-mint can be keyworded again
76	@@ -233,7 +233,7 @@ exportmakeopts() {
77	NEEDS_LIBICONV=YesPlease
78	HAVE_CLOCK_MONOTONIC=1
79	)
80	- grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
81	+ grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
82	myopts+=( HAVE_GETDELIM=1 )
83	fi
84
85	@@ -246,7 +246,7 @@ exportmakeopts() {
86	myopts+=( NO_NSEC=YesPlease )
87
88	export MY_MAKEOPTS="${myopts[@]}"
89	- export EXTLIBS="${extlibs}"
90	+ export EXTLIBS="${extlibs[@]}"
91	}
92
93	src_unpack() {
94	@@ -359,12 +359,14 @@ src_compile() {
95	pushd contrib/svn-fe &>/dev/null \|\| die
96	# by defining EXTLIBS we override the detection for libintl and
97	# libiconv, bug #516168
98	- local nlsiconv=
99	- use nls && use !elibc_glibc && nlsiconv+=" -lintl"
100	- use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
101	- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" \|\| die "emake svn-fe failed"
102	+ local nlsiconv=()
103	+ use nls && use !elibc_glibc && nlsiconv+=( -lintl )
104	+ use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
105	+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
106	+ \|\| die "emake svn-fe failed"
107	if use doc ; then
108	- git_emake svn-fe.{1,html} \|\| die "emake svn-fe.1 svn-fe.html failed"
109	+ git_emake svn-fe.{1,html} \
110	+ \|\| die "emake svn-fe.1 svn-fe.html failed"
111	fi
112	popd &>/dev/null \|\| die
113	fi
114	@@ -407,6 +409,7 @@ src_install() {
115	find Documentation/.[157] >/dev/null 2>&1 && doman Documentation/.[157]
116	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
117	use doc && dodir /usr/share/doc/${PF}/html
118	+ local d
119	for d in / /howto/ /technical/ ; do
120	docinto ${d}
121	dodoc Documentation${d}*.txt
122	@@ -432,7 +435,7 @@ src_install() {
123	#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
124	# don't add automatically to the load-path, so the sitefile
125	# can do a conditional loading
126	- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
127	+ touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch"
128	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
129	fi
130
131	@@ -515,6 +518,7 @@ src_install() {
132	stats
133	workdir
134	)
135	+ local i
136	for i in "${contrib_objects[@]}" ; do
137	cp -rf \
138	"${S}"/contrib/${i} \
139	@@ -535,7 +539,7 @@ src_install() {
140	newdoc "${S}"/gitweb/README README.gitweb
141
142	for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
143	- if test -d "$d" ; then find "$d" \
144	+ if test -d "${d}" ; then find "${d}" \
145	-name .packlist \
146	-delete \|\| die
147	fi

Gentoo Archives: gentoo-commits