1 |
grobian 15/02/28 14:07:30 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: baselayout-prefix-2.2-r4.ebuild |
5 |
Log: |
6 |
Move away from einfo (bug #504284) to solve bugs #538374 and #513070 |
7 |
|
8 |
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
9 |
|
10 |
Revision Changes Path |
11 |
1.38 sys-apps/baselayout-prefix/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?rev=1.38&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?rev=1.38&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog?r1=1.37&r2=1.38 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v |
20 |
retrieving revision 1.37 |
21 |
retrieving revision 1.38 |
22 |
diff -u -r1.37 -r1.38 |
23 |
--- ChangeLog 12 Feb 2014 19:57:23 -0000 1.37 |
24 |
+++ ChangeLog 28 Feb 2015 14:07:30 -0000 1.38 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-apps/baselayout-prefix |
27 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.37 2014/02/12 19:57:23 redlizard Exp $ |
29 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.38 2015/02/28 14:07:30 grobian Exp $ |
31 |
+ |
32 |
+*baselayout-prefix-2.2-r4 (28 Feb 2015) |
33 |
+ |
34 |
+ 28 Feb 2015; Fabian Groffen <grobian@g.o> |
35 |
+ +baselayout-prefix-2.2-r4.ebuild: |
36 |
+ Move away from einfo (bug #504284) to solve bugs #538374 and #513070 |
37 |
|
38 |
12 Feb 2014; redlizard <redlizard@g.o> baselayout-prefix-2.2-r3.ebuild: |
39 |
Bump einfo version for fixes for platforms without visibility(hidden) support. |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: baselayout-prefix-2.2-r4.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2015 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild,v 1.1 2015/02/28 14:07:30 grobian Exp $ |
53 |
|
54 |
EAPI=3 |
55 |
|
56 |
inherit eutils multilib libtool |
57 |
|
58 |
MY_P=${P/-prefix/} # just use "upstream" sources |
59 |
DESCRIPTION="Minimal baselayout for Gentoo Prefix installs" |
60 |
HOMEPAGE="http://www.gentoo.org/" |
61 |
SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 |
62 |
http://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2" |
63 |
|
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
KEYWORDS="~arm ~arm-linux ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
67 |
|
68 |
RDEPEND="sys-apps/gentoo-functions" |
69 |
DEPEND="${RDEPEND}" |
70 |
|
71 |
pkg_preinst() { |
72 |
# This is written in src_install (so it's in CONTENTS), but punt all |
73 |
# pending updates to avoid user having to do etc-update (and make the |
74 |
# pkg_postinst logic simpler). |
75 |
rm -f "${EROOT}"/etc/._cfg????_gentoo-release |
76 |
} |
77 |
|
78 |
src_install() { |
79 |
# make functions.sh available in /etc/init.d (from gentoo-functions) |
80 |
# Note: we cannot replace the symlink with a file here, or Portage will |
81 |
# config-protect it, and etc-update can't handle symlink to file updates |
82 |
dodir etc/init.d |
83 |
dosym ../../lib/gentoo/functions.sh /etc/init.d/functions.sh |
84 |
|
85 |
pushd "${WORKDIR}"/${MY_P} > /dev/null || die |
86 |
dodir etc |
87 |
sed \ |
88 |
-e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \ |
89 |
-e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \ |
90 |
-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \ |
91 |
-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \ |
92 |
etc/profile > "${ED}"/etc/profile || die |
93 |
dodir etc/env.d |
94 |
sed \ |
95 |
-e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \ |
96 |
-e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \ |
97 |
etc/env.d/00basic > "${ED}"/etc/env.d/00basic || die |
98 |
dodoc ChangeLog.svn |
99 |
popd > /dev/null |
100 |
|
101 |
# add the host OS MANPATH |
102 |
if [[ -d "${ROOT}"/usr/share/man ]] ; then |
103 |
echo 'MANPATH="/usr/share/man"' > "${ED}"/etc/env.d/99basic || die |
104 |
fi |
105 |
|
106 |
# rc-scripts version for testing of features that *should* be present |
107 |
echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release |
108 |
|
109 |
# FHS compatibility symlinks stuff |
110 |
dosym /var/tmp /usr/tmp |
111 |
|
112 |
# add a dummy to avoid Portage shebang errors |
113 |
dodir sbin |
114 |
cat > "${ED}"/sbin/runscript <<- EOF |
115 |
#!/usr/bin/env sh |
116 |
source "${EPREFIX}/lib/gentoo/functions.sh" |
117 |
|
118 |
eerror "runscript not supported by Gentoo Prefix Base System release ${PV}" 1>&2 |
119 |
exit 1 |
120 |
EOF |
121 |
chmod 755 "${ED}"/sbin/runscript || die |
122 |
} |
123 |
|
124 |
pkg_postinst() { |
125 |
# Take care of the etc-update for the user |
126 |
if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then |
127 |
mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release |
128 |
fi |
129 |
|
130 |
# baselayout leaves behind a lot of .keep files, so let's clean them up |
131 |
find "${EROOT}"/lib/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null |
132 |
find "${EROOT}"/lib/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null |
133 |
} |