1 |
vapier 14/02/28 22:45:31 |
2 |
|
3 |
Modified: bash-4.3.ebuild ChangeLog |
4 |
Removed: bash-4.3_rc2.ebuild |
5 |
Log: |
6 |
Fix up doc install, delete a bit of debug code, keep the old src_unpack to avoid warnings when using patches, and use POSIX shell in pkg_* funcs. |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 app-shells/bash/bash-4.3.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.3.ebuild?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.3.ebuild?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.3.ebuild?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: bash-4.3.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3.ebuild,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- bash-4.3.ebuild 27 Feb 2014 10:28:23 -0000 1.1 |
24 |
+++ bash-4.3.ebuild 28 Feb 2014 22:45:30 -0000 1.2 |
25 |
@@ -1,8 +1,8 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3.ebuild,v 1.1 2014/02/27 10:28:23 polynomial-c Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3.ebuild,v 1.2 2014/02/28 22:45:30 vapier Exp $ |
30 |
|
31 |
-EAPI=4 |
32 |
+EAPI="4" |
33 |
|
34 |
inherit eutils flag-o-matic toolchain-funcs multilib |
35 |
|
36 |
@@ -61,8 +61,11 @@ |
37 |
fi |
38 |
} |
39 |
|
40 |
+src_unpack() { |
41 |
+ unpack ${MY_P}.tar.gz |
42 |
+} |
43 |
+ |
44 |
src_prepare() { |
45 |
- #use mem-scramble |
46 |
# Include official patches |
47 |
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
48 |
|
49 |
@@ -125,7 +128,8 @@ |
50 |
use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
51 |
tc-export AR #444070 |
52 |
econf \ |
53 |
- --docdir=/usr/share/doc/${PF} \ |
54 |
+ --docdir='$(datarootdir)'/doc/${PF} \ |
55 |
+ --htmldir='$(docdir)/html' \ |
56 |
--with-curses \ |
57 |
$(use_with afs) \ |
58 |
$(use_enable net net-redirections) \ |
59 |
@@ -147,7 +151,9 @@ |
60 |
} |
61 |
|
62 |
src_install() { |
63 |
- emake install DESTDIR="${D}" |
64 |
+ local d f |
65 |
+ |
66 |
+ default |
67 |
|
68 |
dodir /bin |
69 |
mv "${D}"/usr/bin/bash "${D}"/bin/ || die |
70 |
@@ -198,17 +204,17 @@ |
71 |
fi |
72 |
|
73 |
doman doc/*.1 |
74 |
- dodoc AUTHORS Y2K |
75 |
+ newdoc CWRU/changelog ChangeLog |
76 |
dosym bash.info /usr/share/info/bashref.info |
77 |
} |
78 |
|
79 |
pkg_preinst() { |
80 |
- if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then |
81 |
- mkdir -p "${ROOT}"/etc/bash || die |
82 |
+ if [ -e "${ROOT}/etc/bashrc" ] && [ ! -d "${ROOT}/etc/bash" ] ; then |
83 |
+ mkdir -p "${ROOT}"/etc/bash |
84 |
mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ |
85 |
fi |
86 |
|
87 |
- if [[ -L ${ROOT}/bin/sh ]] ; then |
88 |
+ if [ -L "${ROOT}/bin/sh" ] ; then |
89 |
# rewrite the symlink to ensure that its mtime changes. having /bin/sh |
90 |
# missing even temporarily causes a fatal error with paludis. |
91 |
local target=$(readlink "${ROOT}"/bin/sh) |
92 |
@@ -220,7 +226,7 @@ |
93 |
|
94 |
pkg_postinst() { |
95 |
# If /bin/sh does not exist, provide it |
96 |
- if [[ ! -e ${ROOT}/bin/sh ]] ; then |
97 |
+ if [ ! -e "${ROOT}/bin/sh" ] ; then |
98 |
ln -sf bash "${ROOT}"/bin/sh |
99 |
fi |
100 |
} |
101 |
|
102 |
|
103 |
|
104 |
1.353 app-shells/bash/ChangeLog |
105 |
|
106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.353&view=markup |
107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.353&content-type=text/plain |
108 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?r1=1.352&r2=1.353 |
109 |
|
110 |
Index: ChangeLog |
111 |
=================================================================== |
112 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v |
113 |
retrieving revision 1.352 |
114 |
retrieving revision 1.353 |
115 |
diff -u -r1.352 -r1.353 |
116 |
--- ChangeLog 27 Feb 2014 10:28:23 -0000 1.352 |
117 |
+++ ChangeLog 28 Feb 2014 22:45:30 -0000 1.353 |
118 |
@@ -1,6 +1,11 @@ |
119 |
# ChangeLog for app-shells/bash |
120 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
121 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.352 2014/02/27 10:28:23 polynomial-c Exp $ |
122 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.353 2014/02/28 22:45:30 vapier Exp $ |
123 |
+ |
124 |
+ 28 Feb 2014; Mike Frysinger <vapier@g.o> -bash-4.3_rc2.ebuild, |
125 |
+ bash-4.3.ebuild: |
126 |
+ Fix up doc install, delete a bit of debug code, keep the old src_unpack to |
127 |
+ avoid warnings when using patches, and use POSIX shell in pkg_* funcs. |
128 |
|
129 |
*bash-4.3 (27 Feb 2014) |