diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2010-02-27 02:06:47 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2010-02-27 02:06:47 +0000 |
commit | 4feeeedf2f3fa249cd026c6b774c7d208a41b0e2 (patch) | |
tree | a23f617f6426bf10a6f031f352e18c6e13840647 | |
parent | add temporary mask for schroot (diff) | |
download | historical-4feeeedf2f3fa249cd026c6b774c7d208a41b0e2.tar.gz historical-4feeeedf2f3fa249cd026c6b774c7d208a41b0e2.tar.bz2 historical-4feeeedf2f3fa249cd026c6b774c7d208a41b0e2.zip |
New upstream version; automatically move local scripts to new locations, and add (temporary) symlinks from the old
Package-Manager: portage--svn/cvs/Linux i686
-rw-r--r-- | dev-util/schroot/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/schroot/Manifest | 10 | ||||
-rw-r--r-- | dev-util/schroot/schroot-1.4.1.ebuild | 166 |
3 files changed, 179 insertions, 5 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index ed3f63559c1c..af8996bdc9cc 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.14 2010/02/13 22:29:07 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.15 2010/02/27 02:06:47 abcd Exp $ + +*schroot-1.4.1 (27 Feb 2010) + + 27 Feb 2010; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.1.ebuild: + New upstream version; automatically move local scripts to new locations, + and add (temporary) symlinks from the old 13 Feb 2010; Jonathan Callen <abcd@gentoo.org> schroot-1.4.0.ebuild: Remove RESTRICT=mirror, was only meant for local testing diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest index a0ac54c94667..a57796c00501 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -8,14 +8,16 @@ AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf6 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5 DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec DIST schroot_1.4.0.orig.tar.gz 1065731 RMD160 402eda02eddb343f19c714aecc9ab20f2383ebe1 SHA1 f5a66e027c834e5e563b4a48a914e04b7ed5f553 SHA256 7f0d5a44b784c9b048aa02a3e5c3cfd393c7d92aa5b3a190007ed5fb2d30ac74 +DIST schroot_1.4.1.orig.tar.gz 1032672 RMD160 433cefe0a06174265dc1a30e967aa505fff8ef21 SHA1 796b8d6972bac9ac196696d45edfc89b9e7ecc4b SHA256 98680ec3bd579029f0f6264bc52bc47a30349f2a5b62efbd574a0d755167aed0 EBUILD schroot-1.2.3-r4.ebuild 2151 RMD160 01379f16274370ede81a36db68a295564ddfeb3d SHA1 c3c6e1679ae91f6cdac3a76407db8eda36e16a87 SHA256 74426b94619c43dd935d39b284b123527ba2037b6f676276e14c54534800ba00 EBUILD schroot-1.4.0.ebuild 2626 RMD160 28e747f35b77e837b3a8e2768fa0e6a6732b9a90 SHA1 9a3a194e71b409724fc05e5245e33100609025d7 SHA256 d9647f11d4214ff0c10d8c9faf8399518b2c05b5d27110cd9617bc709d4cbbfa -MISC ChangeLog 2556 RMD160 0a2b60a7966b3a7d15235a78f51fb36c576f8d0d SHA1 0d5988aeb4e04661fd6d991466731b64dd8af5ac SHA256 c391a081eeab939532444d736087ac69356a15bc3cb63242669cd02cd681083a +EBUILD schroot-1.4.1.ebuild 4591 RMD160 1f8bc33600c96513c79e251f7d6d99b117289996 SHA1 21cd7b7a6e547809206e12a39fb8557471721ef6 SHA256 ea92bb37c76e62a562306aad3ac190bfaa51b17a0d38760e9770eb348e24f1b9 +MISC ChangeLog 2778 RMD160 3ea597692867904c68da709893c00750101875d7 SHA1 17148661c591093cf9b8e5a69f4e66e5f2f48c7e SHA256 e5ba8ecf93aba766eea79d23a5776e739d5998a2ee9bf5f90283d7ba8d28aeab MISC metadata.xml 445 RMD160 33e3b17a7e5250ab10a3c7e25cbd644ac0c5dee3 SHA1 5fb67d7fbb8912b306d68551fbfc2138d17ebacd SHA256 222724ef581a733b8157a144259d0762858459ac33b0f1b28139716543693234 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkt3J78ACgkQOypDUo0oQOqPsgCeN9gF7wJ+WIvVbbd0/TO2cmg0 -hQMAoN/LAjhglirLe54R7tjnPKYD5iGQ -=aup2 +iEYEARECAAYFAkuIfkAACgkQOypDUo0oQOqAVACfVPRz1lWS+EbGJsy0D5inPseS +jogAn0+NTMFsQTA6NsqPFKaqRQwmvDx+ +=12IP -----END PGP SIGNATURE----- diff --git a/dev-util/schroot/schroot-1.4.1.ebuild b/dev-util/schroot/schroot-1.4.1.ebuild new file mode 100644 index 000000000000..97567e380e31 --- /dev/null +++ b/dev-util/schroot/schroot-1.4.1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.1.ebuild,v 1.1 2010/02/27 02:06:47 abcd Exp $ + +EAPI="2" +WANT_AUTOMAKE="1.11" + +inherit autotools base pam + +DESCRIPTION="Utility to execute commands in a chroot environment" +HOMEPAGE="http://packages.debian.org/source/sid/schroot" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+dchroot debug doc lvm nls pam test" + +COMMON_DEPEND=" + >=dev-libs/boost-1.39.0 + dev-libs/lockdev + >=sys-apps/util-linux-2.16 + lvm? ( sys-fs/lvm2 ) + pam? ( sys-libs/pam ) +" + +DEPEND="${COMMON_DEPEND} + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( sys-devel/gettext ) + test? ( >=dev-util/cppunit-1.10.0 ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/debianutils + dchroot? ( !sys-apps/dchroot ) + nls? ( virtual/libintl ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.0-tests.patch" +) + +src_prepare() { + base_src_prepare + + # Don't depend on cppunit unless we are testing + use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac + + echo -e "Package: ${PN}\nVersion: ${PV}" > VERSION + + eautoreconf +} + +src_configure() { + root_tests=no + use test && (( EUID == 0 )) && root_tests=yes + econf \ + $(use_enable doc doxygen) \ + $(use_enable dchroot) \ + $(use_enable dchroot dchroot-dsa) \ + $(use_enable debug) \ + $(use_enable lvm lvm-snapshot) \ + $(use_enable nls) \ + $(use_enable pam) \ + --enable-block-device \ + --enable-loopback \ + --enable-uuid \ + --enable-root-tests=$root_tests \ + --enable-shared \ + --disable-static \ + --localstatedir=/var \ + --with-bash-completion-dir=/usr/share/bash-completion +} + +src_test() { + if [[ $root_tests == yes && $EUID -ne 0 ]]; then + ewarn "Disabling tests because you are no longer root" + return 0 + fi + default +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed" + newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed" + + dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" + if use doc; then + docinto html/sbuild + dohtml doc/sbuild/html/* || die "installation of html docs failed" + docinto html/schroot + dohtml doc/schroot/html/* || die "installation of html docs failed" + fi + + if use pam; then + rm -f "${D}"/etc/pam.d/schroot + pamd_mimic_system schroot auth account session + fi + + # Remove *.la files + find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed" +} + +pkg_preinst() { + export had_older_1_4_1=false + has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true + if ${had_older_1_4_1}; then + einfo "Moving config files to new location..." + mkdir "${ROOT}etc/schroot/default" + mv_conffile etc/schroot/script-defaults etc/schroot/default/config + mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab + mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles + mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases + fi +} + +mv_conffile() { + local OLDFILE=${ROOT}$1 + local NEWFILE=${ROOT}$2 + + # if the old file doesn't exist, or is a symlink, stop + [[ -f ${OLDFILE} ]] || return 0 + [[ -L ${OLDFILE} ]] && return 0 + + # if the new file already exists, then we have a problem... + if [[ -e ${NEWFILE} ]]; then + # but if they are the same, then don't worry about it + if cmp -s "${OLDFILE}" "${NEWFILE}"; then + rm -f "${OLDFILE}" + else + ewarn "${NEWFILE} already exists, not moving ${OLDFILE}" + fi + else + mv "${OLDFILE}" "${NEWFILE}" + fi + + local x y + # now move all the unmerged config files as well + for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do + [[ -f ${x} ]] || continue + # /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config + y=${x##*/} + y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/} + mv "${x}" "${y}" + done +} + +pkg_postinst() { + local x + if ${had_older_1_4_1}; then + for x in script:config mount:fstab copyfiles nssdatabases; do + if [[ ! -e ${ROOT}etc/schroot/${x%:*}-defaults && -f ${ROOT}etc/schroot/default/${x#*:} ]]; then + einfo "Creating compatibility symlink for ${x%:*}-defaults" + ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults" + fi + done + + ewarn "Your config files have been moved to the new location in" + ewarn "/etc/schroot/default. Compatibility symlinks have been installed in" + ewarn "/etc/schroot, and may be removed if no running chroot refers to them." + fi +} |