From 9fc3bebe374c0a3546cc14d27fbed807d034d455 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Sun, 14 Jun 2015 02:41:01 +0000 Subject: Fix build with USE=doc; revbump to fix bash-completion file (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 229E5838) --- dev-util/schroot/ChangeLog | 8 +- dev-util/schroot/schroot-1.6.10-r1.ebuild | 125 ++++++++++++++++++++++++++++++ dev-util/schroot/schroot-1.6.10.ebuild | 120 ---------------------------- 3 files changed, 132 insertions(+), 121 deletions(-) create mode 100644 dev-util/schroot/schroot-1.6.10-r1.ebuild delete mode 100644 dev-util/schroot/schroot-1.6.10.ebuild (limited to 'dev-util/schroot') diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index 0ef3b0a1f54a..f7f3a5fa25eb 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,12 @@ # 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.42 2015/06/12 02:50:26 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.43 2015/06/14 02:41:01 jcallen Exp $ + +*schroot-1.6.10-r1 (14 Jun 2015) + + 14 Jun 2015; Jonathan Callen +schroot-1.6.10-r1.ebuild, + -schroot-1.6.10.ebuild: + Fix build with USE=doc; revbump to fix bash-completion file *schroot-1.6.10 (12 Jun 2015) diff --git a/dev-util/schroot/schroot-1.6.10-r1.ebuild b/dev-util/schroot/schroot-1.6.10-r1.ebuild new file mode 100644 index 000000000000..575a67d97978 --- /dev/null +++ b/dev-util/schroot/schroot-1.6.10-r1.ebuild @@ -0,0 +1,125 @@ +# 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-r1.ebuild,v 1.1 2015/06/14 02:41:01 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 ) +" + +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" + ) + 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 +} diff --git a/dev-util/schroot/schroot-1.6.10.ebuild b/dev-util/schroot/schroot-1.6.10.ebuild deleted file mode 100644 index d06c7130f568..000000000000 --- a/dev-util/schroot/schroot-1.6.10.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# 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.ebuild,v 1.1 2015/06/12 02:50:26 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 ) -" - -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 - - 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" - ) - if ! use nls; then - mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) - fi - - cmake-utils_src_configure -} - -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 doc/sbuild/html/* - docinto html/schroot - dohtml 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 -} -- cgit v1.2.3-65-gdbad