* [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/
@ 2016-05-22 18:18 Jonathan Callen
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Callen @ 2016-05-22 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 8f03ce74bb3b186b57b9caacc0be5d58fb71086e
Author: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 18:15:08 2016 +0000
Commit: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
CommitDate: Sun May 22 18:17:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f03ce74
dev-util/schroot: Remove old
Package-Manager: portage-2.3.0_rc1
dev-util/schroot/Manifest | 3 -
dev-util/schroot/files/schroot-1.4.7-tests.patch | 81 -------------
dev-util/schroot/files/schroot-1.6.3-tests.patch | 86 --------------
dev-util/schroot/schroot-1.6.3.ebuild | 131 ---------------------
dev-util/schroot/schroot-1.6.5-r1.ebuild | 139 -----------------------
dev-util/schroot/schroot-1.6.5.ebuild | 139 -----------------------
6 files changed, 579 deletions(-)
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index c139523..d843782 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,6 +1,3 @@
DIST schroot_1.6.10-1.debian.tar.xz 27108 SHA256 d93a7acc4b6c06a024b6bb0bfc1867a144193aadbb09cab454373c2983120cd9 SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6 WHIRLPOOL 7f9a1b782093321b0dc236098688dacd93f608725bd551ef848262049da3f08b12b2ec34188413ec5b16070753acdc0a07af8d723599581340ecd9cfc6493b67
DIST schroot_1.6.10-2.debian.tar.xz 34296 SHA256 71ed5b264029bd62226337a29f7ec926c29724c9540b24f7ccccfbef81c2391a SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c WHIRLPOOL b6de6552c78418cde8ffc201017d3665a85a161d2417648b8213a37979889ae54380da051c59f1643d28989ae3f905976493b860002e1a4ded3aaea1434d3673
DIST schroot_1.6.10.orig.tar.xz 797328 SHA256 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe WHIRLPOOL 91c4682101c6eeb1f56d3e5c583a55af1164abd6853a822ac5c5f1c6820140fb1049765877e97985a90264f4e9d898886487fac794a794904f98210494974090
-DIST schroot_1.6.3.orig.tar.xz 730756 SHA256 0b914a0ae1eef0288e5bf016c14031d3433d1b3f18820bebc5480647594ebc82 SHA512 e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be WHIRLPOOL 065142aa34a225d0cda44ca3d3703131fe2a0ab46ad914bf386a58dd0480650ca03a5b6d00216eca41edff5a534083874d121623002aec57e933a95a4d2cc60f
-DIST schroot_1.6.5-1.debian.tar.gz 30518 SHA256 acf7cdbbb486a5724e61d10ba682df24dc66ec9274c6897f64b7dbd5f9632aed SHA512 3f5753a877cf8226f9eb085620c91f3e6179855adb7faf1f60e78d12b30ac545f6f6d124a239bd6a8d6b3ac28b417ee1d3ccc7ea4978cad77f3bba1d6e2c043d WHIRLPOOL 13b8afc0575fc1d4e27e35ba0cf277ffb04353b2dc0ebcfb8596d6ada064402f2004bd0b9fd658daad8cef69c1a3c5d615be0569335f6b243ed2f09134d63543
-DIST schroot_1.6.5.orig.tar.xz 737656 SHA256 290d1af4eb06db7678277a5aa8104a69bc33b4e0f9b502aed166061d2717343e SHA512 2f7285f9e76fff8db2a9a7cd66f4d06c2c19662f812c3b3108be45bbc6a67bee63b39b56235e257ab226c35efdba6b50a2e2511a618c32d76da10a0d7843fe90 WHIRLPOOL bf9dcdd61862719492bde8e67ca5cd3b42e368cb69e57382b88a85aa1b34825ab40bd2e9f82f4296a0d9721a38fe03e8161f49931a95721be835d52a3a9108fa
diff --git a/dev-util/schroot/files/schroot-1.4.7-tests.patch b/dev-util/schroot/files/schroot-1.4.7-tests.patch
deleted file mode 100644
index 4a492e7..0000000
--- a/dev-util/schroot/files/schroot-1.4.7-tests.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- schroot-1.4.7.orig/configure.ac
-+++ schroot-1.4.7/configure.ac
-@@ -265,6 +265,19 @@ AC_ARG_WITH([bash-completion-dir], [AS_H
- AC_MSG_RESULT([$bashcompletiondir])
- AC_SUBST([bashcompletiondir])
-
-+AC_MSG_CHECKING([whether to enable root-only unit tests])
-+AC_ARG_ENABLE([root-tests], [AS_HELP_STRING([--with-root-tests], [Enable root-only tests])],
-+ [ case "${enableval}" in
-+ yes) enable_root_tests="yes" ;;
-+ no) enable_root_tests="no" ;;
-+ *) AC_MSG_RESULT([unknown])
-+ AC_MSG_ERROR([bad value ${enableval} for --enable-root-tests]) ;;
-+ esac],
-+ [ enable_root_tests="yes" ])
-+AC_MSG_RESULT([$enable_root_tests])
-+AM_CONDITIONAL([USE_ROOT_TESTS], [test "$enable_root_tests" = "yes"])
-+AC_SUBST([enable_root_tests])
-+
- # Checks for programs.
- AC_PROG_CXX
- AC_LANG([C++])
---- schroot-1.4.7.orig/test/Makefile.am
-+++ schroot-1.4.7/test/Makefile.am
-@@ -24,10 +24,12 @@ include $(top_srcdir)/scripts/global.mk
- LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) $(CPPUNIT_CFLAGS) -DTESTDATADIR='"./testdata"' -I$(top_srcdir)/bin
-
- if USE_UNIT_TESTS
--noinst_LTLIBRARIES = libtest.la
-+check_LTLIBRARIES = libtest.la
-
--noinst_PROGRAMS = \
-- sbuild-chroot \
-+ROOT_TESTS =
-+
-+if USE_ROOT_TESTS
-+ROOT_TESTS += \
- sbuild-chroot-plain \
- sbuild-chroot-file \
- sbuild-chroot-directory \
-@@ -35,7 +37,12 @@ noinst_PROGRAMS = \
- sbuild-chroot-loopback \
- sbuild-chroot-lvm-snapshot \
- sbuild-chroot-btrfs-snapshot \
-- sbuild-chroot-config \
-+ sbuild-chroot-config
-+endif
-+
-+check_PROGRAMS = \
-+ sbuild-chroot \
-+ $(ROOT_TESTS) \
- sbuild-environment \
- sbuild-keyfile \
- sbuild-lock \
-@@ -52,14 +59,7 @@ noinst_PROGRAMS = \
- # randomly on slow or heavily-loaded systems.
- TESTS = setup-test-data \
- sbuild-chroot \
-- sbuild-chroot-plain \
-- sbuild-chroot-file \
-- sbuild-chroot-directory \
-- sbuild-chroot-block-device \
-- sbuild-chroot-loopback \
-- sbuild-chroot-lvm-snapshot \
-- sbuild-chroot-btrfs-snapshot \
-- sbuild-chroot-config \
-+ $(ROOT_TESTS) \
- sbuild-environment \
- sbuild-keyfile \
- sbuild-log \
---- schroot-1.4.7.orig/test/setup-test-data
-+++ schroot-1.4.7/test/setup-test-data
-@@ -4,4 +4,8 @@
- rm -rf testdata
- mkdir testdata
- cp -r ${srcdir}/*.ex* testdata
-+if test `id -u` -ne 0; then
-+echo "You are not root, only doing partial setup"
-+else
- chown -R root:root testdata
-+fi
diff --git a/dev-util/schroot/files/schroot-1.6.3-tests.patch b/dev-util/schroot/files/schroot-1.6.3-tests.patch
deleted file mode 100644
index e58b6ba..0000000
--- a/dev-util/schroot/files/schroot-1.6.3-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -purN schroot-1.6.3.orig/configure.ac schroot-1.6.3/configure.ac
---- schroot-1.6.3.orig/configure.ac 2012-07-23 17:54:07.000000000 -0400
-+++ schroot-1.6.3/configure.ac 2012-09-20 03:43:20.451738906 -0400
-@@ -264,6 +264,19 @@ AC_ARG_WITH([bash-completion-dir], [AS_H
- AC_MSG_RESULT([$bashcompletiondir])
- AC_SUBST([bashcompletiondir])
-
-+AC_MSG_CHECKING([whether to enable root-only unit tests])
-+AC_ARG_ENABLE([root-tests], [AS_HELP_STRING([--with-root-tests], [Enable root-only tests])],
-+ [ case "${enableval}" in
-+ yes) enable_root_tests="yes" ;;
-+ no) enable_root_tests="no" ;;
-+ *) AC_MSG_RESULT([unknown])
-+ AC_MSG_ERROR([bad value ${enableval} for --enable-root-tests]) ;;
-+ esac],
-+ [ enable_root_tests="yes" ])
-+AC_MSG_RESULT([$enable_root_tests])
-+AM_CONDITIONAL([USE_ROOT_TESTS], [test "$enable_root_tests" = "yes"])
-+AC_SUBST([enable_root_tests])
-+
- # Checks for programs.
- AC_PROG_CXX
- AC_LANG([C++])
-diff -purN schroot-1.6.3.orig/test/Makefile.am schroot-1.6.3/test/Makefile.am
---- schroot-1.6.3.orig/test/Makefile.am 2012-07-23 17:54:07.000000000 -0400
-+++ schroot-1.6.3/test/Makefile.am 2012-09-20 03:45:31.400235841 -0400
-@@ -24,10 +24,12 @@ include $(top_srcdir)/scripts/global.mk
- LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) $(CPPUNIT_CFLAGS) -DTESTDATADIR='"./testdata"' -I$(top_srcdir)/bin
-
- if USE_UNIT_TESTS
--noinst_LTLIBRARIES = libtest.la
-+check_LTLIBRARIES = libtest.la
-
--noinst_PROGRAMS = \
-- sbuild-chroot \
-+ROOT_TESTS =
-+
-+if USE_ROOT_TESTS
-+ROOT_TESTS += \
- sbuild-chroot-plain \
- sbuild-chroot-custom \
- sbuild-chroot-file \
-@@ -37,7 +39,12 @@ noinst_PROGRAMS = \
- sbuild-chroot-lvm-snapshot \
- sbuild-chroot-btrfs-snapshot \
- sbuild-chroot-config \
-- sbuild-chroot-facet-userdata \
-+ sbuild-chroot-facet-userdata
-+endif
-+
-+check_PROGRAMS = \
-+ sbuild-chroot \
-+ $(ROOT_TESTS) \
- sbuild-environment \
- sbuild-keyfile \
- sbuild-lock \
-@@ -54,16 +61,7 @@ noinst_PROGRAMS = \
- # randomly on slow or heavily-loaded systems.
- TESTS = setup-test-data \
- sbuild-chroot \
-- sbuild-chroot-plain \
-- sbuild-chroot-custom \
-- sbuild-chroot-file \
-- sbuild-chroot-directory \
-- sbuild-chroot-block-device \
-- sbuild-chroot-loopback \
-- sbuild-chroot-lvm-snapshot \
-- sbuild-chroot-btrfs-snapshot \
-- sbuild-chroot-config \
-- sbuild-chroot-facet-userdata \
-+ $(ROOT_TESTS) \
- sbuild-environment \
- sbuild-keyfile \
- sbuild-log \
-diff -purN schroot-1.6.3.orig/test/setup-test-data schroot-1.6.3/test/setup-test-data
---- schroot-1.6.3.orig/test/setup-test-data 2012-07-23 17:54:07.000000000 -0400
-+++ schroot-1.6.3/test/setup-test-data 2012-09-20 03:43:20.451738906 -0400
-@@ -4,4 +4,8 @@
- rm -rf testdata
- mkdir testdata
- cp -r ${srcdir}/*.ex* testdata
-+if test `id -u` -ne 0; then
-+echo "You are not root, only doing partial setup"
-+else
- chown -R root:root testdata
-+fi
diff --git a/dev-util/schroot/schroot-1.6.3.ebuild b/dev-util/schroot/schroot-1.6.3.ebuild
deleted file mode 100644
index 4aa93f1..0000000
--- a/dev-util/schroot/schroot-1.6.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools base pam versionator
-
-MY_P=${PN}_${PV}
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
- >=dev-libs/boost-1.42.0
- dev-libs/lockdev
- >=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.3-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
-
- eautoreconf
-}
-
-src_configure() {
- root_tests=no
- use test && (( EUID == 0 )) && root_tests=yes
- use nls || export ac_cv_path_PO4A=
- econf \
- $(use_enable btrfs btrfs-snapshot) \
- $(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="${EPREFIX}"/var \
- --with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
- emake all $(usev doc)
-}
-
-src_test() {
- if [[ $root_tests == yes && $EUID -ne 0 ]]; then
- ewarn "Disabling tests because you are no longer root"
- return 0
- fi
-
- # Fix a bug in the tarball -- an empty directory was omitted
- mkdir test/run-parts.ex2
- default
-}
-
-src_install() {
- default
-
- 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
-
- # Remove *.la files
- find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-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.5-r1.ebuild b/dev-util/schroot/schroot-1.6.5-r1.ebuild
deleted file mode 100644
index 77b8ea7..0000000
--- a/dev-util/schroot/schroot-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools base 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.gz"
-
-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
- dev-libs/lockdev
- >=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.3-tests.patch"
-)
-
-src_unpack() {
- unpack ${MY_P}.orig.tar.xz
- cd "${S}"
- unpack ${MY_P}-${DEB_REL}.debian.tar.gz
-}
-
-src_prepare() {
- base_src_prepare
-
- # Don't depend on cppunit unless we are testing
- use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- root_tests=no
- use test && (( EUID == 0 )) && root_tests=yes
- use nls || export ac_cv_path_PO4A=
- econf \
- $(use_enable btrfs btrfs-snapshot) \
- $(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="${EPREFIX}"/var \
- --with-bash-completion-dir="$(get_bashcompdir)"
-}
-
-src_compile() {
- emake all $(usev doc)
-}
-
-src_test() {
- if [[ $root_tests == yes && $EUID -ne 0 ]]; then
- ewarn "Disabling tests because you are no longer root"
- return 0
- fi
-
- # Fix a bug in the tarball -- an empty directory was omitted
- mkdir test/run-parts.ex2
- default
-}
-
-src_install() {
- default
-
- 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
-
- # Remove *.la files
- find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-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.5.ebuild b/dev-util/schroot/schroot-1.6.5.ebuild
deleted file mode 100644
index ef9f45f..0000000
--- a/dev-util/schroot/schroot-1.6.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools base eutils pam versionator
-
-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.gz"
-
-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
- dev-libs/lockdev
- >=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.3-tests.patch"
-)
-
-src_unpack() {
- unpack ${MY_P}.orig.tar.xz
- cd "${S}"
- unpack ${MY_P}-${DEB_REL}.debian.tar.gz
-}
-
-src_prepare() {
- base_src_prepare
-
- # Don't depend on cppunit unless we are testing
- use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- root_tests=no
- use test && (( EUID == 0 )) && root_tests=yes
- use nls || export ac_cv_path_PO4A=
- econf \
- $(use_enable btrfs btrfs-snapshot) \
- $(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="${EPREFIX}"/var \
- --with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_compile() {
- emake all $(usev doc)
-}
-
-src_test() {
- if [[ $root_tests == yes && $EUID -ne 0 ]]; then
- ewarn "Disabling tests because you are no longer root"
- return 0
- fi
-
- # Fix a bug in the tarball -- an empty directory was omitted
- mkdir test/run-parts.ex2
- default
-}
-
-src_install() {
- default
-
- 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
-
- # Remove *.la files
- find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
- elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
- elog "upgrade information."
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/
@ 2020-01-02 5:28 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2020-01-02 5:28 UTC (permalink / raw
To: gentoo-commits
commit: 666ab8900a8fc1adc34f0e27c387fbc1bad9ef46
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 05:24:29 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 05:27:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666ab890
dev-util/schroot: revbump
use debian patchset 6
keyword on ~ppc64
add bootst slotdep
migrate to EAPI=7 and cmake.eclass
remove postinst hacks and messages
use tmpfiles to create symlinks and runtime dirs
Bug: https://bugs.gentoo.org/589466
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-util/schroot/Manifest | 1 +
dev-util/schroot/files/schroot.tmpfilesd | 2 +
dev-util/schroot/schroot-1.6.10-r5.ebuild | 126 ++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index a41729c723e..e0894c0588e 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,2 +1,3 @@
DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
+DIST schroot_1.6.10-6.debian.tar.xz 76576 BLAKE2B 719c994703df8fb391b3a8c8f83a5afea4247b4f817e16317b6ed0ba7ec0f962d669c4d50a120eabdd9054b1a31bb58cc426324108cf77fe5b1aec0024bc03c2 SHA512 44177da262c0a8a511534aba964196cdb5a8a7ec094727122954638c29cdc9b80ef0a1ffb709c4841918effb44fe2c0f8912ae87cfa9e4696dbbe9f55adb1211
DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
diff --git a/dev-util/schroot/files/schroot.tmpfilesd b/dev-util/schroot/files/schroot.tmpfilesd
new file mode 100644
index 00000000000..0c91363a9da
--- /dev/null
+++ b/dev-util/schroot/files/schroot.tmpfilesd
@@ -0,0 +1,2 @@
+d /run/schroot/mount 0755 root root -
+L /var/lib/schroot/mount - - - - /run/schroot/mount
diff --git a/dev-util/schroot/schroot-1.6.10-r5.ebuild b/dev-util/schroot/schroot-1.6.10-r5.ebuild
new file mode 100644
index 00000000000..9752f106449
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10-r5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake pam tmpfiles
+
+MY_P=${PN}_${PV}
+DEB_REL=6
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://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 ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+RESTRICT="!test? ( 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
+ eapply "${S}"/debian/patches/*.patch
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dbtrfs-snapshot=$(usex btrfs)
+ -Ddchroot=$(usex dchroot)
+ -Ddchroot-dsa=$(usex dchroot)
+ -Ddebug=$(usex debug)
+ -Ddoxygen=$(usex doc)
+ -Dlvm-snapshot=$(usex lvm)
+ -Dnls=$(usex nls)
+ -Dpam=$(usex pam)
+ -Dtest=$(usex test)
+ -Dbash_completion_dir="$(get_bashcompdir)"
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+ -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+ -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+ )
+ if ! use nls; then
+ mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+ if [[ $EUID -ne 0 ]]; then
+ ewarn "Disabling tests because you are not root"
+ return 0
+ fi
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
+
+ docinto /usr/share/doc/${PF}/contrib/setup.d
+ dodoc 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
+ newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
+
+ if use doc; then
+ docinto html/sbuild
+ dodoc "${BUILD_DIR}"/doc/sbuild/html/*
+ docinto html/schroot
+ dodoc "${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() {
+ tmpfiles_process ${PN}.conf
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/
@ 2021-06-04 23:15 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2021-06-04 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 7a76ae8fe8dde45d8bfdf9b76453bb1b66acbcb7
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 22:54:10 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 23:15:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a76ae8f
dev-util/schroot: add portage and zfs clone setup.d scripts
used by some releng machines
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-util/schroot/files/06zfscloneopts | 44 ++++++++++++++++
dev-util/schroot/files/11gentoo | 61 ++++++++++++++++++++++
dev-util/schroot/files/schroot_prompt.sh | 1 +
....10_p12.ebuild => schroot-1.6.10_p12-r1.ebuild} | 18 +++++++
4 files changed, 124 insertions(+)
diff --git a/dev-util/schroot/files/06zfscloneopts b/dev-util/schroot/files/06zfscloneopts
new file mode 100644
index 00000000000..e66f0885e78
--- /dev/null
+++ b/dev-util/schroot/files/06zfscloneopts
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright © 2020 Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$CHROOT_TYPE" = "zfs-snapshot" ] && [ -n "$CHROOT_ZFS_CLONE_NAME" ]; then
+
+ if [ $STAGE = "setup-start" ]; then
+
+ if ! zfs list "$CHROOT_ZFS_CLONE_NAME" >/dev/null 2>&1; then
+ fatal "Dataset '$CHROOT_ZFS_CLONE_NAME' does not exist"
+ fi
+
+ if [ "${ZFS_CLONE_OPTIONS+set}" = "set" ]; then
+ if [ "$VERBOSE" = "verbose" ]; then
+ zfs set $ZFS_CLONE_OPTIONS \
+ "$CHROOT_ZFS_CLONE_NAME"
+ else
+ zfs set $ZFS_CLONE_OPTIONS \
+ "$CHROOT_ZFS_CLONE_NAME" > /dev/null
+ fi
+ fi
+ fi
+fi
diff --git a/dev-util/schroot/files/11gentoo b/dev-util/schroot/files/11gentoo
new file mode 100644
index 00000000000..ddf2df305c6
--- /dev/null
+++ b/dev-util/schroot/files/11gentoo
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright © 2020 Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$VERBOSE" = "verbose" ]; then
+ VERBOSE_OPT="true"
+fi
+
+if [ "${PORTAGE_BASE_TMPDIR+set}" = "set" ] ; then
+ if [ "$STAGE" = "setup-start" ]; then
+ if [ ! -d "$PORTAGE_BASE_TMPDIR" ]; then
+ fatal "$PORTAGE_BASE_TMPDIR does not exist or not a directory"
+ fi
+ if [ "x$SESSION_ID" = x ]; then
+ fatal "SESSION_ID is not set"
+ fi
+ if [ ! -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+ mkdir ${VERBOSE_OPT+-v} \
+ "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+ fi
+ mkdir -p ${VERBOSE_OPT+-v} "$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+ mount --make-private -o bind ${VERBOSE_OPT+-v}\
+ "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" \
+ "$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+
+ elif [ "$STAGE" = "setup-stop" ]; then
+ if [ "$CHROOT_SESSION_PURGE" = true ] || \
+ [ "${CHROOT_NAME/#*_master/m}" = "m" ]; then
+ umount ${VERBOSE_OPT+-v} \
+ "$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+ if [ -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+ if [ "x$SESSION_ID" != x ]; then
+ rm -fr ${VERBOSE_OPT+-v} \
+ "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+ fi
+ fi
+ fi
+
+ fi
+fi
diff --git a/dev-util/schroot/files/schroot_prompt.sh b/dev-util/schroot/files/schroot_prompt.sh
new file mode 100644
index 00000000000..bd72f2ce5b8
--- /dev/null
+++ b/dev-util/schroot/files/schroot_prompt.sh
@@ -0,0 +1 @@
+[[ -f /etc/debian_chroot ]] && PS1="chr: $(< /etc/debian_chroot) ${PS1}"
diff --git a/dev-util/schroot/schroot-1.6.10_p12.ebuild b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
similarity index 84%
rename from dev-util/schroot/schroot-1.6.10_p12.ebuild
rename to dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
index d1292d3caaa..0a4a39d4ed2 100644
--- a/dev-util/schroot/schroot-1.6.10_p12.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
@@ -101,6 +101,24 @@ src_test() {
src_install() {
cmake_src_install
+ # debian-stype PS1 for chroot
+ # checks for /etc/debian_chroot file, which is created by schroot
+ insinto /etc/bash/bashrc.d
+ doins "${FILESDIR}/schroot_prompt.sh"
+
+ # gentoo /var/tmp/portage handler
+ # e.g. portage.base.tmpdir=/var/tmp/portage in config file
+ # will use a subdirectory of hosts $PORTAGE_TMPDIR
+ exeinto /etc/schroot/setup.d
+ doexe "${FILESDIR}/11gentoo"
+
+ # support for zfs clone options.
+ # zfs.clone.options=com.sun:auto-snapshot=false
+ if use zfs; then
+ exeinto /etc/schroot/setup.d
+ doexe "${FILESDIR}/06zfscloneopts"
+ fi
+
keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
docinto /usr/share/doc/${PF}/contrib/setup.d
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/
@ 2022-09-26 20:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-09-26 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 754401ca87d224ab1861e6065f081825cddd15da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 20:01:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 20:01:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754401ca
dev-util/schroot: fix build w/ musl, libcxx
Closes: https://bugs.gentoo.org/739034
Closes: https://bugs.gentoo.org/715514
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/schroot-1.6.13_p2-build-fixes.patch | 103 +++++++++++++++++++++
dev-util/schroot/schroot-1.6.13_p2.ebuild | 4 +
2 files changed, 107 insertions(+)
diff --git a/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch b/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
new file mode 100644
index 000000000000..b10b8b191f96
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
@@ -0,0 +1,103 @@
+https://codeberg.org/shelter/reschroot/pulls/5
+https://bugs.gentoo.org/739034
+https://bugs.gentoo.org/715514
+
+From 56b0c8ac846c18002e32e93629ae04a0a6281706 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:52:54 +0100
+Subject: [PATCH 1/3] Fix libcxx build without <tr1/*> (use <memory> if
+ available)
+
+With Clang & libcxx 15, tr1/* doesn't seem to be available,
+which is fine, as we can use the proper <memory> header
+instead.
+
+We already do this in several other locations. Fall back
+to tr1 and Boost as before.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/schroot-base/schroot-base-options.h
++++ b/bin/schroot-base/schroot-base-options.h
+@@ -27,7 +27,9 @@
+ #include <string>
+ #include <stdexcept>
+
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include <memory>
++#elif HAVE_TR1_MEMORY
+ #include <tr1/memory>
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include <boost/shared_ptr.hpp>
+--- a/bin/schroot/schroot-options-base.h
++++ b/bin/schroot/schroot-options-base.h
+@@ -27,7 +27,9 @@
+ #include <string>
+ #include <vector>
+
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include <memory>
++#elif HAVE_TR1_MEMORY
+ #include <tr1/memory>
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include <boost/shared_ptr.hpp>
+From 04a35b2c57b84e098c9cad75d36675a958e9075e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:54:16 +0100
+Subject: [PATCH 2/3] Fix localename type
+
+Needs to be a string.
+
+Fixes error:
+```
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-basic-keyfile.tcc:217:18: error: no viable overloaded '='
+ localename = std::locale::classic();
+ ~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~
+/usr/lib/gcc/x86_64-pc-linux-gnu/10.2.0/include/g++-v10/bits/basic_string.h:665:7: note: candidate function not viable: no known conversion from 'const std::locale' to 'const std::__cxx11::basic_string<char>' for 1st argument
+ operator=(const basic_string& __str)
+ ^
+[...]
+```
+
+Bug: https://bugs.gentoo.org/739034
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sbuild/sbuild-basic-keyfile.tcc
++++ b/sbuild/sbuild-basic-keyfile.tcc
+@@ -214,7 +214,7 @@ sbuild::basic_keyfile<K, P>::get_locale_string (group_name_type const& group,
+ }
+ catch (std::runtime_error const& e) // Invalid locale
+ {
+- localename = std::locale::classic();
++ localename = std::locale::classic().name();
+ }
+ std::string::size_type pos;
+ bool status = false;
+From 5b00d06a567fe71328124ea53b92ddbd1bd8c6fd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:54:45 +0100
+Subject: [PATCH 3/3] Add <libintl.h> include for musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes error:
+```
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc: In static member function ‘static std::ostream& sbuild::feature::print_features(std::ostream&)’:
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc:48:40: error: ‘gettext’ was not declared in this scope
+ 48 | stream << feature % pos->first % gettext(pos->second.c_str());
+ | ^~~~~~~
+```
+
+Bug: https://bugs.gentoo.org/715514
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sbuild/sbuild-feature.cc
++++ b/sbuild/sbuild-feature.cc
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #include <iostream>
++#include <libintl.h>
+
+ #include "sbuild-feature.h"
+
diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index c1283549302e..33e88c52a9d1 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -48,6 +48,10 @@ RDEPEND="${COMMON_DEPEND}
S="${WORKDIR}/re${PN}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch
+)
+
src_unpack() {
unpack "${P/%_p*}".tar.gz
cd "${S}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-26 20:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-02 5:28 [gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2022-09-26 20:01 Sam James
2021-06-04 23:15 Georgy Yakovlev
2016-05-22 18:18 Jonathan Callen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox