[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/, dev-util/schroot/

2024-04-23 Thread Sam James 
commit: 3adaac9a6baaea72b2d82afec290967f0f422a94
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 11:16:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 12:41:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adaac9a

dev-util/schroot: fix build w/ boost-1.85.0

I haven't sent a PR upstream as our last few are rotting.

Closes: https://bugs.gentoo.org/930499
Signed-off-by: Sam James  gentoo.org>

 .../files/schroot-1.16.13_p2-boost-1.85.0.patch| 32 ++
 dev-util/schroot/schroot-1.6.13_p2-r1.ebuild   |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch 
b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch
new file mode 100644
index ..ba3c10edc104
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/930499
+--- a/sbuild/sbuild-chroot-config.cc
 b/sbuild/sbuild-chroot-config.cc
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ 
++#include 
+ #include 
+ 
+ #include 
+--- a/sbuild/sbuild-run-parts.cc
 b/sbuild/sbuild-run-parts.cc
+@@ -29,6 +29,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ 
+ using boost::format;
+--- a/sbuild/sbuild-util.cc
 b/sbuild/sbuild-util.cc
+@@ -35,8 +35,6 @@
+ #include 
+ #endif
+ 
+-#include 
+-
+ using namespace sbuild;
+ 
+ namespace

diff --git a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
index c287d0c0414d..d4c606a396ec 100644
--- a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
@@ -53,6 +53,8 @@ PATCHES=(
 
# https://codeberg.org/shelter/reschroot/pulls/6
"${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
+
+   "${FILESDIR}"/${PN}-1.16.13_p2-boost-1.85.0.patch
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/

2023-01-15 Thread Sam James 
commit: 7e4f7e6cd7caa15755bcd2ffc15b7f169d3275ba
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 15 13:00:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 15 13:00:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4f7e6c

dev-util/schroot: add link to upstream PR for resize patch

Signed-off-by: Sam James  gentoo.org>

 dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch 
b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
index da798f3b4761..066894a16ecc 100644
--- a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
+++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
@@ -1,3 +1,5 @@
+https://codeberg.org/shelter/reschroot/pulls/6
+
 From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= 
 Date: Sat, 14 Jan 2023 22:53:20 +0100
@@ -6,12 +8,6 @@ Subject: [PATCH] sbuild-util: use resize instead of reserve
 Using reserved but uninitialized space is invalid, and, additionally,
 reserve is not required to allocate memory or change the buffer size at
 all.

- sbuild/sbuild-util.cc | 24 
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc
-index b89068a7..b6af7e89 100644
 --- a/sbuild/sbuild-util.cc
 +++ b/sbuild/sbuild-util.cc
 @@ -624,17 +624,17 @@ void

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/, dev-util/schroot/

2023-01-14 Thread Georgy Yakovlev 
commit: d69385cd24a131899918f7d51f8350a30564e983
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jan 15 03:56:10 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jan 15 03:59:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69385cd

dev-util/schroot: add resize -> reserve patch

otherwise it fails at runtime on hardened systems.

Thanks-to: Arsen Arsenović  aarsen.me>
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../files/schroot-1.6.13-resize-reserve.patch  | 103 +
 6.13_p2.ebuild => schroot-1.6.13_p2-r1.ebuild} |   5 +-
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch 
b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
new file mode 100644
index ..da798f3b4761
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
@@ -0,0 +1,103 @@
+From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= 
+Date: Sat, 14 Jan 2023 22:53:20 +0100
+Subject: [PATCH] sbuild-util: use resize instead of reserve
+
+Using reserved but uninitialized space is invalid, and, additionally,
+reserve is not required to allocate memory or change the buffer size at
+all.
+---
+ sbuild/sbuild-util.cc | 24 
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc
+index b89068a7..b6af7e89 100644
+--- a/sbuild/sbuild-util.cc
 b/sbuild/sbuild-util.cc
+@@ -624,17 +624,17 @@ void
+ sbuild::passwd::query_uid (uid_t uid)
+ {
+   buffer_type::size_type size = 1 << 7;
+-  buffer.reserve(size);
++  buffer.resize(size);
+   int error;
+ 
+   ::passwd *pwd_result;
+ 
+   while ((error = getpwuid_r(uid, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+  _result)) == ERANGE)
+ {
+   size <<= 1;
+-  buffer.reserve(size);
++  buffer.resize(size);
+ }
+ 
+   if (pwd_result)
+@@ -647,17 +647,17 @@ void
+ sbuild::passwd::query_name (const char *name)
+ {
+   buffer_type::size_type size = 1 << 8;
+-  buffer.reserve(size);
++  buffer.resize(size);
+   int error;
+ 
+   ::passwd *pwd_result;
+ 
+   while ((error = getpwnam_r(name, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+  _result)) == ERANGE)
+ {
+   size <<= 1;
+-  buffer.reserve(size);
++  buffer.resize(size);
+ }
+ 
+   if (pwd_result)
+@@ -733,17 +733,17 @@ void
+ sbuild::group::query_gid (gid_t gid)
+ {
+   buffer_type::size_type size = 1 << 7;
+-  buffer.reserve(size);
++  buffer.resize(size);
+   int error;
+ 
+   ::group *grp_result;
+ 
+   while ((error = getgrgid_r(gid, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+  _result)) == ERANGE)
+ {
+   size <<= 1;
+-  buffer.reserve(size);
++  buffer.resize(size);
+ }
+ 
+   if (grp_result)
+@@ -756,17 +756,17 @@ void
+ sbuild::group::query_name (const char *name)
+ {
+   buffer_type::size_type size = 1 << 8;
+-  buffer.reserve(size);
++  buffer.resize(size);
+   int error;
+ 
+   ::group *grp_result;
+ 
+   while ((error = getgrnam_r(name, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+  _result)) == ERANGE)
+ {
+   size <<= 1;
+-  buffer.reserve(size);
++  buffer.resize(size);
+ }
+ 
+   if (grp_result)
+-- 
+2.30.2
+

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
similarity index 96%
rename from dev-util/schroot/schroot-1.6.13_p2.ebuild
rename to dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
index dedc047eec42..839f9adc48f4 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,9 @@ S="${WORKDIR}/re${PN}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch
+
+   # https://codeberg.org/shelter/reschroot/pulls/6
+   "${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-10-09 Thread Georgy Yakovlev 
commit: b1e3b136015aeecc30a269e9e907cc055252e547
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Oct 10 04:51:14 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Oct 10 04:51:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e3b136

dev-util/schroot: drop 1.6.10_p12-r2

Bug: https://bugs.gentoo.org/867016
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest |   2 -
 dev-util/schroot/schroot-1.6.10_p12-r2.ebuild | 148 --
 2 files changed, 150 deletions(-)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 5cb5b20935f0..581a1f01e52a 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,4 +1,2 @@
 DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 
5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4
 SHA512 
a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d
-DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 
0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3
 SHA512 
77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
-DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 
77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0
 SHA512 
8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3

diff --git a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
deleted file mode 100644
index 7a42ee74d2ae..
--- a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 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/_p/-}
-
-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}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   dev-libs/boost:=
-   >=sys-apps/util-linux-2.16
-   btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-   lvm? ( sys-fs/lvm2 )
-   pam? ( sys-libs/pam )
-   zfs? ( sys-fs/zfs )
-"
-
-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 )
-"
-
-S="${WORKDIR}/${PN}-${PV/%_p*/}"
-
-src_unpack() {
-   unpack ${MY_P/%-*/}.orig.tar.xz
-   cd "${S}"
-   unpack ${MY_P}.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)
-   -Dzfs-snapshot=$(usex zfs)
-   -Dbash_completion_dir="$(get_bashcompdir)"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-   -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
-   -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and 
https://bugs.gentoo.org/752120
-   )
-   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-10-03 Thread Sam James 
commit: 75ba0de0c111d7a9fbae90d18c23afbd93721073
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  4 05:19:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 05:19:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ba0de0

dev-util/schroot: Stabilize 1.6.13_p2 x86, #874768

Signed-off-by: Sam James  gentoo.org>

 dev-util/schroot/schroot-1.6.13_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index 33e88c52a9d1..bc3783fdbc86 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-10-03 Thread Sam James 
commit: 3c9f6bd04cb73737d34dbe3a367498bc32ce127c
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  4 05:19:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 05:19:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9f6bd0

dev-util/schroot: Stabilize 1.6.13_p2 amd64, #874768

Signed-off-by: Sam James  gentoo.org>

 dev-util/schroot/schroot-1.6.13_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index bc3783fdbc86..dedc047eec42 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/

2022-09-26 Thread Sam James 
commit: 754401ca87d224ab1861e6065f081825cddd15da
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 26 20:01:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 26 20:01:12 2022 +
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  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 ..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 
+Date: Mon, 26 Sep 2022 20:52:54 +0100
+Subject: [PATCH 1/3] Fix libcxx build without  (use  if
+ available)
+
+With Clang & libcxx 15, tr1/* doesn't seem to be available,
+which is fine, as we can use the proper  header
+instead.
+
+We already do this in several other locations. Fall back
+to tr1 and Boost as before.
+
+Signed-off-by: Sam James 
+--- a/bin/schroot-base/schroot-base-options.h
 b/bin/schroot-base/schroot-base-options.h
+@@ -27,7 +27,9 @@
+ #include 
+ #include 
+ 
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include 
++#elif HAVE_TR1_MEMORY
+ #include 
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include 
+--- a/bin/schroot/schroot-options-base.h
 b/bin/schroot/schroot-options-base.h
+@@ -27,7 +27,9 @@
+ #include 
+ #include 
+ 
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include 
++#elif HAVE_TR1_MEMORY
+ #include 
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include 
+From 04a35b2c57b84e098c9cad75d36675a958e9075e Mon Sep 17 00:00:00 2001
+From: Sam James 
+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' for 1st argument
+  operator=(const basic_string& __str)
+  ^
+[...]
+```
+
+Bug: https://bugs.gentoo.org/739034
+Signed-off-by: Sam James 
+--- a/sbuild/sbuild-basic-keyfile.tcc
 b/sbuild/sbuild-basic-keyfile.tcc
+@@ -214,7 +214,7 @@ sbuild::basic_keyfile::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 
+Date: Mon, 26 Sep 2022 20:54:45 +0100
+Subject: [PATCH 3/3] Add  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 
+--- a/sbuild/sbuild-feature.cc
 b/sbuild/sbuild-feature.cc
+@@ -19,6 +19,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ #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}"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-09-17 Thread Georgy Yakovlev 
commit: cd22d84be14db0695aaf0d99ceeb152bbe435470
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 07:54:54 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 07:54:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd22d84b

dev-util/schroot: destabilize 1.6.13_p2 for ~x86

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/schroot-1.6.13_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index 0b57a4b32761..c1283549302e 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-09-17 Thread Georgy Yakovlev 
commit: 0205bc0824b73f7e2c85c4f13f8cb4458b86a075
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 07:00:45 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 07:00:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0205bc08

dev-util/schroot: destabilize 1.6.13_p2 for ~amd64

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/schroot-1.6.13_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index 1633e2829da1..0b57a4b32761 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-09-17 Thread Georgy Yakovlev 
commit: e3f794ddeea898242061b21c8f81f9e5edb96de4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 06:50:54 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 06:59:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f794dd

dev-util/schroot: add 1.6.13_p2, switch to reschroot

debian kept the name, so do we

Closes: https://bugs.gentoo.org/869977
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest |   2 +
 dev-util/schroot/schroot-1.6.13_p2.ebuild | 148 ++
 2 files changed, 150 insertions(+)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 85b6be19abae..39950ce75357 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,3 +1,5 @@
+DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 
5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4
 SHA512 
a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d
 DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 
0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3
 SHA512 
77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 
664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5
 SHA512 
ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
+DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 
77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0
 SHA512 
8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3

diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild 
b/dev-util/schroot/schroot-1.6.13_p2.ebuild
new file mode 100644
index ..1633e2829da1
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 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/_p/-}
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://codeberg.org/shelter/reschroot;
+SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz
 -> ${P/%_p*}.tar.gz
+   mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+   dev-libs/boost:=
+   >=sys-apps/util-linux-2.16
+   btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+   lvm? ( sys-fs/lvm2 )
+   pam? ( sys-libs/pam )
+   zfs? ( sys-fs/zfs )
+"
+
+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 )
+"
+
+S="${WORKDIR}/re${PN}"
+
+src_unpack() {
+   unpack "${P/%_p*}".tar.gz
+   cd "${S}"
+   unpack ${MY_P}.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)
+   -Dzfs-snapshot=$(usex zfs)
+   -Dbash_completion_dir="$(get_bashcompdir)"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+   -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+   -DBoost_NO_BOOST_CMAKE=ON #

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-09-17 Thread Georgy Yakovlev 
commit: 917e46e78e6fc06885edfa3f32821ca8c9c486b2
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Sep 17 07:00:00 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Sep 17 07:00:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917e46e7

dev-util/schroot: drop 1.6.10_p7-r1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest|   1 -
 dev-util/schroot/schroot-1.6.10_p7-r1.ebuild | 130 ---
 2 files changed, 131 deletions(-)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 39950ce75357..5cb5b20935f0 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,5 +1,4 @@
 DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 
5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4
 SHA512 
a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d
 DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 
0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3
 SHA512 
77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
-DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 
664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5
 SHA512 
ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 
77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0
 SHA512 
8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3

diff --git a/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
deleted file mode 100644
index d5d3ed39319a..
--- a/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 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/_p/-}
-
-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}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   dev-libs/boost:=
-   >=sys-apps/util-linux-2.16
-   btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-   lvm? ( sys-fs/lvm2 )
-   pam? ( sys-libs/pam )
-   zfs? ( sys-fs/zfs )
-"
-
-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 )
-"
-
-S="${WORKDIR}/${PN}-${PV/%_p*/}"
-
-src_unpack() {
-   unpack ${MY_P/%-*/}.orig.tar.xz
-   cd "${S}"
-   unpack ${MY_P}.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)
-   -Dzfs-snapshot=$(usex zfs)
-   -Dbash_completion_dir="$(get_bashcompdir)"
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-   -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-   -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
-   -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and 
https://bugs.gentoo.org/752120
-   )
-   if !

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2022-03-08 Thread Jakov Smolić 
commit: 754905d56a4c10ca8331645c0cedb65285800d34
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar  8 13:05:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar  8 13:05:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754905d5

dev-util/schroot: Keyword 1.6.10_p12-r2 riscv, #834778

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p12-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
index 3e3f4195bc7c..428aeda6200b 100644
--- a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-10-27 Thread Agostino Sarubbo 
commit: 29bccdd2b7f78709d52ee4dce19af9fd444172a9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 27 06:36:36 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 27 06:36:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29bccdd2

dev-util/schroot: x86 stable wrt bug #807421

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p12-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
index be35ccbf2ec..3e3f4195bc7 100644
--- a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-10-27 Thread Agostino Sarubbo 
commit: 91ceb8e4be0e828f318f6661a92cca5658a2308d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 27 06:34:59 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 27 06:34:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ceb8e4

dev-util/schroot: amd64 stable wrt bug #807421

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p12-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
index 719cc0ff29d..be35ccbf2ec 100644
--- a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-07-28 Thread Sam James 
commit: ad5d573b786cf599adf267ac2fdb9979c43c448b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 29 02:02:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 29 02:05:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5d573b

dev-util/schroot: fix docinto argument (avoid double 'prefix')

Signed-off-by: Sam James  gentoo.org>

 .../{schroot-1.6.10_p12-r1.ebuild => schroot-1.6.10_p12-r2.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
similarity index 97%
rename from dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
rename to dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
index 0a4a39d4ed2..719cc0ff29d 100644
--- a/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
@@ -90,7 +90,7 @@ src_compile() {
 }
 
 src_test() {
-   if [[ $EUID -ne 0 ]]; then
+   if [[ ${EUID} -ne 0 ]]; then
ewarn "Disabling tests because you are not root"
return 0
fi
@@ -121,7 +121,7 @@ src_install() {
 
keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
 
-   docinto /usr/share/doc/${PF}/contrib/setup.d
+   docinto contrib/setup.d
dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck 
contrib/setup.d/10mount-ssh
 
newdoc debian/schroot.NEWS NEWS.debian

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/

2021-06-04 Thread Georgy Yakovlev 
commit: 7a76ae8fe8dde45d8bfdf9b76453bb1b66acbcb7
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Jun  4 22:54:10 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Jun  4 23:15:00 2021 +
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  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 000..e66f0885e78
--- /dev/null
+++ b/dev-util/schroot/files/06zfscloneopts
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright © 2020   Georgy Yakovlev 
+#
+# 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
+# .
+#
+#
+
+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 000..ddf2df305c6
--- /dev/null
+++ b/dev-util/schroot/files/11gentoo
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright © 2020 Georgy Yakovlev 
+#
+# 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
+# .
+#
+#
+
+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
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-05-28 Thread David Seifert 
commit: a599a3a728ced35217c0cbbc507781c1effecaed
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 15:56:57 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 28 15:56:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a599a3a7

dev-util/schroot: fix docinto argument (avoid double 'prefix')

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 .../schroot/{schroot-1.6.10_p7.ebuild => schroot-1.6.10_p7-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
similarity index 97%
rename from dev-util/schroot/schroot-1.6.10_p7.ebuild
rename to dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
index d5d6798ee2b..c4d0bb6cfa2 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
@@ -90,7 +90,7 @@ src_compile() {
 }
 
 src_test() {
-   if [[ $EUID -ne 0 ]]; then
+   if [[ ${EUID} -ne 0 ]]; then
ewarn "Disabling tests because you are not root"
return 0
fi
@@ -103,7 +103,7 @@ src_install() {
 
keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
 
-   docinto /usr/share/doc/${PF}/contrib/setup.d
+   docinto contrib/setup.d
dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck 
contrib/setup.d/10mount-ssh
 
newdoc debian/schroot.NEWS NEWS.debian

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-05-26 Thread Georgy Yakovlev 
commit: 903486585acab02cf77b2347584ae3dc5f0dde16
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed May 26 22:05:49 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed May 26 22:08:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90348658

dev-util/schroot: add 1.6.10_p12

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest  |   1 +
 dev-util/schroot/schroot-1.6.10_p12.ebuild | 130 +
 2 files changed, 131 insertions(+)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 3f59ccd6e4e..85b6be19aba 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,2 +1,3 @@
+DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 
0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3
 SHA512 
77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 
664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5
 SHA512 
ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe

diff --git a/dev-util/schroot/schroot-1.6.10_p12.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12.ebuild
new file mode 100644
index 000..f994341d52a
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p12.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 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/_p/-}
+
+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}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+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 )
+   zfs? ( sys-fs/zfs )
+"
+
+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 )
+"
+
+S="${WORKDIR}/${PN}-${PV/%_p*/}"
+
+src_unpack() {
+   unpack ${MY_P/%-*/}.orig.tar.xz
+   cd "${S}"
+   unpack ${MY_P}.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)
+   -Dzfs-snapshot=$(usex zfs)
+   -Dbash_completion_dir="$(get_bashcompdir)"
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+   -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+   -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+   -DBoost_NO_BOOST_CMAKE=ON
+   )
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2021-05-26 Thread Georgy Yakovlev 
commit: a328594c9f92c46af48cc064943f086bc2a07ce8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed May 26 22:07:17 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed May 26 22:08:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a328594c

dev-util/schroot: pass -DBoost_NO_BOOST_CMAKE=ON

Bug: https://bugs.gentoo.org/752120
Closes: https://bugs.gentoo.org/791712
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p12.ebuild | 2 +-
 dev-util/schroot/schroot-1.6.10_p7.ebuild  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p12.ebuild 
b/dev-util/schroot/schroot-1.6.10_p12.ebuild
index f994341d52a..d1292d3caaa 100644
--- a/dev-util/schroot/schroot-1.6.10_p12.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12.ebuild
@@ -76,7 +76,7 @@ src_configure() {
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
-   -DBoost_NO_BOOST_CMAKE=ON
+   -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and 
https://bugs.gentoo.org/752120
)
if ! use nls; then
mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index d2a08069874..d5d6798ee2b 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -76,6 +76,7 @@ src_configure() {
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+   -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and 
https://bugs.gentoo.org/752120
)
if ! use nls; then
mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2020-08-20 Thread Georgy Yakovlev 
commit: b3225fcca71f1457793f39dbaf7ffa21128353f4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Aug 20 23:57:51 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Aug 20 23:57:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3225fcc

dev-util/schroot: add ~arm64 keyword

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index 549e21110c2..d2a08069874 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2020-02-26 Thread Georgy Yakovlev 
commit: f473586634d11e523565e13a7e0759a2b24fb736
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Feb 27 02:57:39 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Feb 27 02:57:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4735866

dev-util/schroot: drop old

Closes: https://bugs.gentoo.org/589466
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest |   2 -
 dev-util/schroot/schroot-1.6.10-r4.ebuild | 147 --
 dev-util/schroot/schroot-1.6.10-r5.ebuild | 126 -
 3 files changed, 275 deletions(-)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 721e99dc717..3f59ccd6e4e 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,4 +1,2 @@
-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-7.debian.tar.xz 82524 BLAKE2B 
664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5
 SHA512 
ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe

diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild 
b/dev-util/schroot/schroot-1.6.10-r4.ebuild
deleted file mode 100644
index 3f08febeed9..000
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=2
-
-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 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 )
-"
-
-PATCHES=(
-   "${S}/debian/patches/Add-support-for-more-compression-formats.patch"
-   "${S}/debian/patches/Add-SESSION_SOURCE-and-CHROOT_SESSION_SOURCE.patch"
-   "${S}/debian/patches/10mount-Move-mount-directory-to-var-run.patch"
-   
"${S}/debian/patches/Support-union-mounts-with-overlay-as-in-Linux-4.0.patch"
-   "${S}/debian/patches/GCC5-fixes-on-regexes.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=(
-   -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"
-   )
-   if ! use

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2020-02-24 Thread Agostino Sarubbo 
commit: 8f455295bf52394848627228a3933fc19b58c3ba
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 24 13:11:41 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 24 13:11:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f455295

dev-util/schroot: x86 stable wrt bug #710012

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index 78a80a02ba4..549e21110c2 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2020-02-18 Thread Agostino Sarubbo 
commit: f5f35206254dbff3d3bbd6e6dcfd5f8699246a87
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 18 16:24:51 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 18 16:24:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f35206

dev-util/schroot: amd64 stable wrt bug #710012

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/schroot/schroot-1.6.10_p7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index 37c1dd419a1..78a80a02ba4 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2020-01-04 Thread Georgy Yakovlev 
commit: 83f8cc0edff0c74dcee86924f323d8520639e553
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jan  5 07:50:25 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jan  5 07:51:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f8cc0e

dev-util/schroot: bump to 1.6.20_p7, with zfs support

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/Manifest |   1 +
 dev-util/schroot/metadata.xml |   1 +
 dev-util/schroot/schroot-1.6.10_p7.ebuild | 129 ++
 3 files changed, 131 insertions(+)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index e0894c0588e..721e99dc717 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,3 +1,4 @@
 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-7.debian.tar.xz 82524 BLAKE2B 
664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5
 SHA512 
ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe

diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index 2cca4eb6a23..ff1941a852c 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -9,5 +9,6 @@
Enable support for chroots using btrfs 
snapshots
Enables the building of a wrapper named 
"dchroot", replacing sys-apps/dchroot
Enable support for chroots using LVM 
snapshots
+   Enable support for chroots using ZFS 
shapshots/clones

 

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild 
b/dev-util/schroot/schroot-1.6.10_p7.ebuild
new file mode 100644
index 000..37c1dd419a1
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -0,0 +1,129 @@
+# 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/_p/-}
+
+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}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+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 )
+   zfs? ( sys-fs/zfs )
+"
+
+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 )
+"
+
+S="${WORKDIR}/${PN}-${PV/%_p*/}"
+
+src_unpack() {
+   unpack ${MY_P/%-*/}.orig.tar.xz
+   cd "${S}"
+   unpack ${MY_P}.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)
+   -Dzfs-snapshot=$(usex zfs)
+   -Dbash_completion_dir="$(get_bashcompdir)"
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/

2020-01-01 Thread Georgy Yakovlev 
commit: 666ab8900a8fc1adc34f0e27c387fbc1bad9ef46
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Jan  2 05:24:29 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Jan  2 05:27:42 2020 +
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  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 000..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 000..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 ]];

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2019-08-18 Thread Georgy Yakovlev 
commit: ef720cdcaafdd49874695d05be97cff353bf93ac
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Aug 19 00:43:32 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Aug 19 00:43:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef720cdc

dev-util/schroot: take over, update metadata.xml

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/schroot/metadata.xml | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index cc3f6c238b4..2cca4eb6a23 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -1,10 +1,13 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-
-  Enable support for chroots using btrfs snapshots.
-  Enables the building of a wrapper named "dchroot", 
replacing sys-apps/dchroot.
-  Enable support for chroots using LVM snapshots.
-
+   
+   gyakov...@gentoo.org
+   Georgy Yakovlev
+   
+   
+   Enable support for chroots using btrfs 
snapshots
+   Enables the building of a wrapper named 
"dchroot", replacing sys-apps/dchroot
+   Enable support for chroots using LVM 
snapshots
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/

2018-06-13 Thread Michał Górny 
commit: 3fdb652c5862978d3c8b2e49b04692fb4c8fc7f1
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 13 18:11:49 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 13 18:51:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdb652c

dev-util/schroot: remove unused patch

 ...t-1.6.10-cmake-add-additional-regex-tests.patch | 70 --
 1 file changed, 70 deletions(-)

diff --git 
a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch 
b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
deleted file mode 100644
index 1660f18ae4b..000
--- 
a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
-From: Roger Leigh 
-Date: Sun, 26 Jul 2015 14:00:13 +0100
-Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
- tests
-

- cmake/regex-checks.cmake | 10 ++
- test/sbuild-regex.cc | 20 
- 2 files changed, 30 insertions(+)
-
-diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
-index d0bb211..60507ec 100644
 a/cmake/regex-checks.cmake
-+++ b/cmake/regex-checks.cmake
-@@ -30,6 +30,16 @@ int main() {
-   if (${namespace}_match(fail, bar)) return 11;
-   if (${namespace}_match(fail, chk)) return 12;
- 
-+  // Checks for broken support in GCC 4.9 and 5.1
-+  ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
-+  ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
-+  if (!${namespace}_match(test, range1)) return 13;
-+  if (!${namespace}_match(test, range2)) return 14;
-+  if (!${namespace}_match(\"a-\", range1)) return 15;
-+  if (!${namespace}_match(\"a-\", range2)) return 16;
-+  if (${namespace}_match(\"-a\", range1)) return 17;
-+  if (${namespace}_match(\"-a\", range2)) return 18;
-+
-   return 0;
- }"
- ${outvar})
-diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
-index 915e915..a8520c5 100644
 a/test/sbuild-regex.cc
-+++ b/test/sbuild-regex.cc
-@@ -33,6 +33,8 @@ class test_regex : public TestCase
-   CPPUNIT_TEST(test_output);
-   CPPUNIT_TEST(test_input);
-   CPPUNIT_TEST(test_match);
-+  CPPUNIT_TEST(test_match_bracket1);
-+  CPPUNIT_TEST(test_match_bracket2);
-   CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
-   CPPUNIT_TEST_SUITE_END();
- 
-@@ -88,6 +90,24 @@ class test_regex : public TestCase
-   }
- 
-   void
-+  test_match_bracket1()
-+  {
-+sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
-+CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-+  test_match_bracket2()
-+  {
-+sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
-+CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-   test_input_fail()
-   {
- sbuild::regex r;

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2018-06-07 Thread Andreas Sturmlechner 
commit: 2ea855116c3111262a494c11202ff414172871e2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  7 10:44:27 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  7 10:48:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea85511

dev-util/schroot: Switch to https

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/schroot/schroot-1.6.10-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild 
b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 29b345f82d0..432388f071b 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils eutils pam versionator bash-completion-r1
 
@@ -9,7 +9,7 @@ MY_P=${PN}_${PV}
 DEB_REL=2
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot;
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2018-06-07 Thread Andreas Sturmlechner 
commit: ae714d515ea00d900a06cae75400fcaeae1b743a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  7 10:43:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  7 10:48:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae714d51

dev-util/schroot: Drop 1.6.10-r3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/schroot/Manifest |   1 -
 dev-util/schroot/schroot-1.6.10-r3.ebuild | 129 --
 2 files changed, 130 deletions(-)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 5175a8adf02..a41729c723e 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,3 +1,2 @@
-DIST schroot_1.6.10-1.debian.tar.xz 27108 BLAKE2B 
ee4f35767975f2713053c6aae9c1ccb472ef541a3a6d9c335a8a8cd923dc90b78eb45bf1fa1ece590cee94e0d629e0365cc592ec8e966bbdd7f0c4414f55b80b
 SHA512 
2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 
5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191
 SHA512 
ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 
1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28
 SHA512 
25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe

diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild 
b/dev-util/schroot/schroot-1.6.10-r3.ebuild
deleted file mode 100644
index 003cb75a064..000
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2018-06-06 Thread Thomas Deutschmann 
commit: 47ab62b1cb089dcc3b7296cc18106cc4c245fb6c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  6 23:03:36 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  6 23:22:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ab62b1

dev-util/schroot: x86 stable (bug #657264)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/schroot/schroot-1.6.10-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild 
b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index d89fcca48e2..29b345f82d0 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2018-06-04 Thread Mikle Kolyada 
commit: 6d79f5addf27ca2c612c4318634000d5476546e4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jun  4 18:44:59 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jun  4 18:44:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d79f5ad

dev-util/schroot: amd64 stable wrt bug #657264

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/schroot/schroot-1.6.10-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild 
b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 280d789e520..d89fcca48e2 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2017-06-21 Thread Jonathan Callen 
commit: c37a95ae1c12117d77b7cb28981c12b9e7732bc4
Author: Jonathan Callen  gentoo  org>
AuthorDate: Thu Jun 22 00:59:12 2017 +
Commit: Jonathan Callen  gentoo  org>
CommitDate: Thu Jun 22 01:01:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37a95ae

dev-util/schroot: mark maintainer-needed

 dev-util/schroot/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index ad3df7dae4d..cc3f6c238b4 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  jcal...@gentoo.org
-  Jonathan Callen
-
+
 
   Enable support for chroots using btrfs snapshots.
   Enables the building of a wrapper named "dchroot", 
replacing sys-apps/dchroot.

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2016-05-22 Thread Jonathan Callen 
commit: 877ea71ec165218ff53e414bb17a5c330c27f0a1
Author: Jonathan Callen  gentoo  org>
AuthorDate: Sun May 22 18:13:17 2016 +
Commit: Jonathan Callen  gentoo  org>
CommitDate: Sun May 22 18:17:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877ea71e

dev-util/schroot: New version

 dev-util/schroot/Manifest |   1 +
 dev-util/schroot/schroot-1.6.10-r4.ebuild | 147 ++
 2 files changed, 148 insertions(+)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 7c7db5f..c139523 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,4 +1,5 @@
 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 
71ed5b264029bd62226337a29f7ec926c29724c9540b24f7fbef81c2391a 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

diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild 
b/dev-util/schroot/schroot-1.6.10-r4.ebuild
new file mode 100644
index 000..66dd847
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit cmake-utils eutils pam versionator bash-completion-r1
+
+MY_P=${PN}_${PV}
+DEB_REL=2
+
+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=(
+   "${S}/debian/patches/Add-support-for-more-compression-formats.patch"
+   "${S}/debian/patches/Add-SESSION_SOURCE-and-CHROOT_SESSION_SOURCE.patch"
+   "${S}/debian/patches/10mount-Move-mount-directory-to-var-run.patch"
+   
"${S}/debian/patches/Support-union-mounts-with-overlay-as-in-Linux-4.0.patch"
+   "${S}/debian/patches/GCC5-fixes-on-regexes.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=(
+   -Dbtrfs-snapshot=$(usex btrfs)
+   -Ddchroot=$(usex dchroot)
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/, dev-util/schroot/files/

2016-05-22 Thread Jonathan Callen 
commit: 8f03ce74bb3b186b57b9caacc0be5d58fb71086e
Author: Jonathan Callen  gentoo  org>
AuthorDate: Sun May 22 18:15:08 2016 +
Commit: Jonathan Callen  gentoo  org>
CommitDate: Sun May 22 18:17:58 2016 +
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 
71ed5b264029bd62226337a29f7ec926c29724c9540b24f7fbef81c2391a 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..000
--- 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 += \
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2015-11-03 Thread Agostino Sarubbo 
commit: 2bf38c039cffe45a1f71515202414bc3777699df
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov  3 16:16:54 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov  3 16:16:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf38c03

dev-util/schroot: x86 stable wrt bug #551770

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 dev-util/schroot/schroot-1.6.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild 
b/dev-util/schroot/schroot-1.6.10-r3.ebuild
index ef3005c..086a437 100644
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

2015-10-30 Thread Agostino Sarubbo 
commit: 73a3888b23fd065660f9b577e5d82332c11aa091
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 30 09:17:49 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 30 09:17:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a3888b

dev-util/schroot: amd64 stable wrt bug #551770

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-util/schroot/schroot-1.6.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild 
b/dev-util/schroot/schroot-1.6.10-r3.ebuild
index c926dbd..ef3005c 100644
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="