1 |
abcd 11/01/06 23:41:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: schroot-1.4.17.ebuild |
5 |
Log: |
6 |
Bump to latest upstream version |
7 |
|
8 |
(Portage version: 2.2.0_alpha11_p14/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.22 dev-util/schroot/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.22&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.22&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?r1=1.21&r2=1.22 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v |
20 |
retrieving revision 1.21 |
21 |
retrieving revision 1.22 |
22 |
diff -u -r1.21 -r1.22 |
23 |
--- ChangeLog 19 Oct 2010 02:32:52 -0000 1.21 |
24 |
+++ ChangeLog 6 Jan 2011 23:41:17 -0000 1.22 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for dev-util/schroot |
27 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.21 2010/10/19 02:32:52 abcd Exp $ |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.22 2011/01/06 23:41:17 abcd Exp $ |
31 |
+ |
32 |
+*schroot-1.4.17 (06 Jan 2011) |
33 |
+ |
34 |
+ 06 Jan 2011; Jonathan Callen <abcd@g.o> +schroot-1.4.17.ebuild: |
35 |
+ Bump to latest upstream version |
36 |
|
37 |
19 Oct 2010; Jonathan Callen <abcd@g.o> schroot-1.4.14.ebuild: |
38 |
Fix build with USE=doc (bug 340078) |
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-util/schroot/schroot-1.4.17.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.4.17.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.4.17.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: schroot-1.4.17.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.17.ebuild,v 1.1 2011/01/06 23:41:17 abcd Exp $ |
52 |
|
53 |
EAPI="3" |
54 |
WANT_AUTOMAKE="1.11" |
55 |
|
56 |
inherit autotools base pam |
57 |
|
58 |
MY_P=${PN}_${PV} |
59 |
|
60 |
DESCRIPTION="Utility to execute commands in a chroot environment" |
61 |
HOMEPAGE="http://packages.debian.org/source/sid/schroot" |
62 |
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2" |
63 |
|
64 |
LICENSE="GPL-3" |
65 |
SLOT="0" |
66 |
KEYWORDS="~amd64 ~x86" |
67 |
IUSE="btrfs +dchroot debug doc lvm nls pam test" |
68 |
|
69 |
COMMON_DEPEND=" |
70 |
>=dev-libs/boost-1.42.0 |
71 |
dev-libs/lockdev |
72 |
>=sys-apps/util-linux-2.16 |
73 |
btrfs? ( sys-fs/btrfs-progs ) |
74 |
lvm? ( sys-fs/lvm2 ) |
75 |
pam? ( sys-libs/pam ) |
76 |
" |
77 |
|
78 |
DEPEND="${COMMON_DEPEND} |
79 |
doc? ( |
80 |
app-doc/doxygen |
81 |
media-gfx/graphviz |
82 |
) |
83 |
nls? ( sys-devel/gettext ) |
84 |
test? ( >=dev-util/cppunit-1.10.0 ) |
85 |
" |
86 |
RDEPEND="${COMMON_DEPEND} |
87 |
sys-apps/debianutils |
88 |
dchroot? ( !sys-apps/dchroot ) |
89 |
nls? ( virtual/libintl ) |
90 |
" |
91 |
|
92 |
PATCHES=( |
93 |
"${FILESDIR}/${PN}-1.4.7-tests.patch" |
94 |
) |
95 |
|
96 |
src_prepare() { |
97 |
base_src_prepare |
98 |
|
99 |
# Don't depend on cppunit unless we are testing |
100 |
use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac |
101 |
|
102 |
eautoreconf |
103 |
} |
104 |
|
105 |
src_configure() { |
106 |
root_tests=no |
107 |
use test && (( EUID == 0 )) && root_tests=yes |
108 |
econf \ |
109 |
$(use_enable btrfs btrfs-snapshot) \ |
110 |
$(use_enable doc doxygen) \ |
111 |
$(use_enable dchroot) \ |
112 |
$(use_enable dchroot dchroot-dsa) \ |
113 |
$(use_enable debug) \ |
114 |
$(use_enable lvm lvm-snapshot) \ |
115 |
$(use_enable nls) \ |
116 |
$(use_enable pam) \ |
117 |
--enable-block-device \ |
118 |
--enable-loopback \ |
119 |
--enable-uuid \ |
120 |
--enable-root-tests=$root_tests \ |
121 |
--enable-shared \ |
122 |
--disable-static \ |
123 |
--localstatedir="${EPREFIX}"/var \ |
124 |
--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion |
125 |
} |
126 |
|
127 |
src_compile() { |
128 |
emake all $(usev doc) || die "emake failed" |
129 |
} |
130 |
|
131 |
src_test() { |
132 |
if [[ $root_tests == yes && $EUID -ne 0 ]]; then |
133 |
ewarn "Disabling tests because you are no longer root" |
134 |
return 0 |
135 |
fi |
136 |
default |
137 |
} |
138 |
|
139 |
src_install() { |
140 |
emake DESTDIR="${D}" install || die "emake install failed" |
141 |
|
142 |
insinto /usr/share/doc/${PF}/contrib/setup.d |
143 |
doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed" |
144 |
|
145 |
newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed" |
146 |
newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed" |
147 |
|
148 |
dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" |
149 |
|
150 |
if use doc; then |
151 |
docinto html/sbuild |
152 |
dohtml doc/sbuild/html/* || die "installation of html docs failed" |
153 |
docinto html/schroot |
154 |
dohtml doc/schroot/html/* || die "installation of html docs failed" |
155 |
fi |
156 |
|
157 |
if use pam; then |
158 |
rm -f "${ED}"etc/pam.d/schroot |
159 |
pamd_mimic_system schroot auth account session |
160 |
fi |
161 |
|
162 |
# Remove *.la files |
163 |
find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed" |
164 |
} |
165 |
|
166 |
pkg_preinst() { |
167 |
export had_older_1_4_1=false |
168 |
has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true |
169 |
if ${had_older_1_4_1}; then |
170 |
einfo "Moving config files to new location..." |
171 |
mkdir "${EROOT}etc/schroot/default" |
172 |
mv_conffile etc/schroot/script-defaults etc/schroot/default/config |
173 |
mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab |
174 |
mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles |
175 |
mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases |
176 |
fi |
177 |
} |
178 |
|
179 |
mv_conffile() { |
180 |
local OLDFILE=${EROOT}$1 |
181 |
local NEWFILE=${EROOT}$2 |
182 |
|
183 |
# if the old file doesn't exist, or is a symlink, stop |
184 |
[[ -f ${OLDFILE} ]] || return 0 |
185 |
[[ -L ${OLDFILE} ]] && return 0 |
186 |
|
187 |
# if the new file already exists, then we have a problem... |
188 |
if [[ -e ${NEWFILE} ]]; then |
189 |
# but if they are the same, then don't worry about it |
190 |
if cmp -s "${OLDFILE}" "${NEWFILE}"; then |
191 |
rm -f "${OLDFILE}" |
192 |
else |
193 |
ewarn "${NEWFILE} already exists, not moving ${OLDFILE}" |
194 |
fi |
195 |
else |
196 |
mv "${OLDFILE}" "${NEWFILE}" |
197 |
fi |
198 |
|
199 |
local x y |
200 |
# now move all the unmerged config files as well |
201 |
for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do |
202 |
[[ -f ${x} ]] || continue |
203 |
# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config |
204 |
y=${x##*/} |
205 |
y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/} |
206 |
mv "${x}" "${y}" |
207 |
done |
208 |
} |
209 |
|
210 |
pkg_postinst() { |
211 |
local x |
212 |
if ${had_older_1_4_1}; then |
213 |
for x in script:config mount:fstab copyfiles nssdatabases; do |
214 |
if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then |
215 |
einfo "Creating compatibility symlink for ${x%:*}-defaults" |
216 |
ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults" |
217 |
fi |
218 |
done |
219 |
|
220 |
ewarn "Your config files have been moved to the new location in" |
221 |
ewarn "/etc/schroot/default. Compatibility symlinks have been installed in" |
222 |
ewarn "/etc/schroot, and may be removed if no running chroot refers to them." |
223 |
fi |
224 |
} |