jcallen 15/08/06 00:00:43 Modified: ChangeLog Added: schroot-1.6.10-r3.ebuild Removed: schroot-1.6.10-r2.ebuild Log: Add LOCALSTATEDIR to cmake args to ensure that /var is used instead of /usr/var. Thanks to Alex Turbov, bug #556660. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 229E5838)
Revision Changes Path 1.45 dev-util/schroot/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.45&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.45&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?r1=1.44&r2=1.45 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 31 Jul 2015 22:46:23 -0000 1.44 +++ ChangeLog 6 Aug 2015 00:00:43 -0000 1.45 @@ -1,6 +1,13 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.44 2015/07/31 22:46:23 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.45 2015/08/06 00:00:43 jcallen Exp $ + +*schroot-1.6.10-r3 (06 Aug 2015) + + 06 Aug 2015; Jonathan Callen <jcal...@gentoo.org> +schroot-1.6.10-r3.ebuild, + -schroot-1.6.10-r2.ebuild: + Add LOCALSTATEDIR to cmake args to ensure that /var is used instead of + /usr/var. Thanks to Alex Turbov, bug #556660. *schroot-1.6.10-r2 (31 Jul 2015) 1.1 dev-util/schroot/schroot-1.6.10-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.6.10-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.6.10-r3.ebuild?rev=1.1&content-type=text/plain Index: schroot-1.6.10-r3.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r3.ebuild,v 1.1 2015/08/06 00:00:43 jcallen Exp $ EAPI="5" inherit cmake-utils eutils pam versionator bash-completion-r1 MY_P=${PN}_${PV} DEB_REL=1 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}/${MY_P}.orig.tar.xz mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="btrfs +dchroot debug doc lvm nls pam test" COMMON_DEPEND=" >=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) " DEPEND="${COMMON_DEPEND} app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 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.6.10-cmake-add-additional-regex-tests.patch" ) src_unpack() { unpack ${MY_P}.orig.tar.xz cd "${S}" unpack ${MY_P}-${DEB_REL}.debian.tar.xz } src_prepare() { sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die cmake-utils_src_prepare } src_configure() { local mycmakeargs=( $(cmake-utils_use btrfs btrfs-snapshot) $(cmake-utils_use dchroot dchroot) $(cmake-utils_use dchroot dchroot-dsa) $(cmake-utils_use debug debug) $(cmake-utils_use doc doxygen) $(cmake-utils_use lvm lvm-snapshot) $(cmake-utils_use nls nls) $(cmake-utils_use pam pam) $(cmake-utils_use test test) -Dbash_completion_dir="$(get_bashcompdir)" -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" ) if ! use nls; then mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) fi cmake-utils_src_configure } src_compile() { cmake-utils_src_compile all $(usev doc) } src_test() { if [[ $EUID -ne 0 ]]; then ewarn "Disabling tests because you are not root" return 0 fi cmake-utils_src_test } src_install() { cmake-utils_src_install insinto /usr/share/doc/${PF}/contrib/setup.d doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh newdoc debian/schroot.NEWS NEWS.debian newinitd "${FILESDIR}"/schroot.initd schroot newconfd "${FILESDIR}"/schroot.confd schroot if use doc; then docinto html/sbuild dohtml "${BUILD_DIR}"/doc/sbuild/html/* docinto html/schroot dohtml "${BUILD_DIR}"/doc/schroot/html/* fi if use pam; then rm -f "${ED}"etc/pam.d/schroot pamd_mimic_system schroot auth account session fi } pkg_postinst() { if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important" elog "upgrade information." fi }
