diff options
| -rw-r--r-- | dev-util/schroot/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/schroot/Manifest | 41 | ||||
| -rw-r--r-- | dev-util/schroot/files/schroot-1.4.1-boost-validation_error.patch | 142 | ||||
| -rw-r--r-- | dev-util/schroot/files/schroot-1.4.7-tests.patch | 81 | ||||
| -rw-r--r-- | dev-util/schroot/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.4.0.ebuild | 106 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.4.1.ebuild | 166 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.4.7.ebuild (renamed from dev-util/schroot/schroot-1.4.1-r1.ebuild) | 36 |
8 files changed, 131 insertions, 454 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index deebd4809413..d5b41ca42c0d 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.17 2010/06/13 00:29:09 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.18 2010/08/13 09:04:04 abcd Exp $ + +*schroot-1.4.7 (13 Aug 2010) + + 13 Aug 2010; Jonathan Callen <abcd@gentoo.org> -schroot-1.4.0.ebuild, + -schroot-1.4.1.ebuild, -schroot-1.4.1-r1.ebuild, + -files/schroot-1.4.1-boost-validation_error.patch, +schroot-1.4.7.ebuild, + +files/schroot-1.4.7-tests.patch, metadata.xml: + Bump to new upstream version, remove old *schroot-1.4.3 (13 Jun 2010) diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest index e85b96489412..098c798c492a 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -4,34 +4,31 @@ Hash: SHA256 AUX schroot-1.2.3-autotools.patch 4432 RMD160 1ecd6ff54c4a24ff311ed44fbecd231b0aa3c8bf SHA1 931533d5451c974fc961b5d57c06d082bb46e9d2 SHA256 5aa0984dd93441c28ba790d7dcad762f77ebc35ea05238f47ad73adc9de79c19 AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2ddbb SHA1 78d28c87f42f292434c2ec99029c98ec4ad26b26 SHA256 901c9d33b492c7a6d3cd75cebcc898985bf32563a5dde6fdafcd8df7168200e6 AUX schroot-1.4.0-tests.patch 2429 RMD160 521c205666cea13d3f8947a4e7acbbbb3cbb4a8d SHA1 5dda3514d0aca878e54017458ecf90b6a2565df3 SHA256 f33d497b38c6c4a4583bf4bca79cce7045ecce6d8dad5dde98a5b8f01dd8b9b5 -AUX schroot-1.4.1-boost-validation_error.patch 5462 RMD160 655a0b3e0db33226b51e88961389951e77d8bba6 SHA1 21f1486a370988f0a0f5707dfabbf6853a95d2fc SHA256 19d2c89d24c517c345847e0343794b628f2ccef4c0cc286e8518d018f571e5a5 +AUX schroot-1.4.7-tests.patch 2427 RMD160 0e10f31a46d4d828b1a1a52159f88db26afe939b SHA1 084c9a470f816086ace6345bdd13bc4d1e8ea2c5 SHA256 32e6aaea6a3646515040892d6e942ec7509219d5f7a87572f75a76caf89d0146 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5 DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec -DIST schroot_1.4.0.orig.tar.gz 1065731 RMD160 402eda02eddb343f19c714aecc9ab20f2383ebe1 SHA1 f5a66e027c834e5e563b4a48a914e04b7ed5f553 SHA256 7f0d5a44b784c9b048aa02a3e5c3cfd393c7d92aa5b3a190007ed5fb2d30ac74 -DIST schroot_1.4.1.orig.tar.gz 1032672 RMD160 433cefe0a06174265dc1a30e967aa505fff8ef21 SHA1 796b8d6972bac9ac196696d45edfc89b9e7ecc4b SHA256 98680ec3bd579029f0f6264bc52bc47a30349f2a5b62efbd574a0d755167aed0 DIST schroot_1.4.3.orig.tar.gz 1054282 RMD160 3c1f997c3abe67f5339e6afd2dda29975759b9ff SHA1 966b66c83379b38fb589cb6be3ad40bd0a2f0c85 SHA256 890317530a1f8e2de2f1cce335f520dd4e35472ad520fddf809013fb6cc5e9a5 +DIST schroot_1.4.7.orig.tar.gz 1076220 RMD160 74b3a5f495ece0943d1c313c29e8b47d7d715a03 SHA1 86acc99789b4da85762eb478e55e8a5266eedc42 SHA256 d0c7292ef12800cdec39cc0ddf1520c5d115571b95fa193c354018a0da369f67 EBUILD schroot-1.2.3-r4.ebuild 2151 RMD160 01379f16274370ede81a36db68a295564ddfeb3d SHA1 c3c6e1679ae91f6cdac3a76407db8eda36e16a87 SHA256 74426b94619c43dd935d39b284b123527ba2037b6f676276e14c54534800ba00 -EBUILD schroot-1.4.0.ebuild 2626 RMD160 28e747f35b77e837b3a8e2768fa0e6a6732b9a90 SHA1 9a3a194e71b409724fc05e5245e33100609025d7 SHA256 d9647f11d4214ff0c10d8c9faf8399518b2c05b5d27110cd9617bc709d4cbbfa -EBUILD schroot-1.4.1-r1.ebuild 4689 RMD160 fc6ea2d0ba197e14f6810401dd48b8836158b8ba SHA1 f8575342bec2f6dab17e052d6c1734901cb895ff SHA256 04b67ca649f16e54ff34ef44f5b02dfc4f52a34e321d918575dae20d74b779e2 -EBUILD schroot-1.4.1.ebuild 4591 RMD160 1f8bc33600c96513c79e251f7d6d99b117289996 SHA1 21cd7b7a6e547809206e12a39fb8557471721ef6 SHA256 ea92bb37c76e62a562306aad3ac190bfaa51b17a0d38760e9770eb348e24f1b9 EBUILD schroot-1.4.3.ebuild 4607 RMD160 c8c950ee3171e4f88dfa6e5c77c8b547342b5877 SHA1 b01bcb6e8a9d0f94a344dbbb049a0591b93fc570 SHA256 2622bc4b1ad6827226fcc849095bb39a72070b1806c123012a4dea5acbd045e0 -MISC ChangeLog 3137 RMD160 fc89047fcd429ff021b96fe5c9f2ef98b922f1a8 SHA1 979fce16d7685e4d460762de593fe215894a7349 SHA256 7d9a7ee06e9fab7fc5ddb60df1f6e87d502ee4b60a6013c4994787db66c9613e -MISC metadata.xml 445 RMD160 33e3b17a7e5250ab10a3c7e25cbd644ac0c5dee3 SHA1 5fb67d7fbb8912b306d68551fbfc2138d17ebacd SHA256 222724ef581a733b8157a144259d0762858459ac33b0f1b28139716543693234 +EBUILD schroot-1.4.7.ebuild 4804 RMD160 de2f6ff5b6e78bb3e348f381af81762e7a0fdd35 SHA1 bee890eee1b815ad2927ad99f3bdab98a7e259cd SHA256 52008e82b50f732cb5b3270034612abdd1149a03df4ecfeac4008a69547a738a +MISC ChangeLog 3460 RMD160 82521c6fbd6d40ddf7d7ea33ba167a131b8a2856 SHA1 dbc6a9785609aaace0e3d8394f45cb844f98131e SHA256 8681b24b9570e39c1b5e61b130866b5209cd0e619373d171c509c310101d0135 +MISC metadata.xml 536 RMD160 216dabacb867bfb76a5de001768c8fd6dd0e4401 SHA1 7bd2448091a7764c4d3f9958b51535d7208e9d7c SHA256 f849ea1dea313c749313505363350d321435336c5ae2c3952dbcd1d7e0fc29ad -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBCAAGBQJMFCZfAAoJELHSF2kinlg49UQQAInp3T5BqJz6HXUEEGRhzA7b -3WO382kb5Ya2vHa6q3BmPqP2i9sy5D9UOJVo+KJf1r81iez9/Gs0sz6AUxvhL6jK -E2dmoJlvmn0d9D/Ymn8D5JRV5Knt1/JbfaC+CyBHxyFSqEls7P7QuyPw/MJ9ExjC -Ae364E8jzSbR9xZ0FHq2GtNPk4GAsaFsECy/zkde7/Af8ruDVv1qVPRnpLJt//gs -cMKmwgnK3X2bQ8hB6bAcgqjCL52IE5D8PwMFfblpZV0jpfMlQ+gp2Zx74GHHhJBQ -MNMMhbbr6oVFgHw89zQrCJRiML/tj++humj1uPiuFgYsAVYpNSP4NNsoDJedmlZx -RYgwEYQcbeyvl44W715rmAtbC6j+MindwXdrlqthx0oOlgOA5sPtB7qUHlZ+zvk5 -uH95bNozg8XRclCcMz+SMbQjQc+fF5AVK/BygEdH7IB49kjZkd1fAGvzZ96lM/SN -8eI/zKLnTDI5zAQr7SDxzSW88a3+y6pHHyVJ+b14bqqZb+N2d936gy8o839yfG0w -eLaZXuWEFXoPgxJN/HiZMOmIf/qOJCvdlmoEfI9zuT3oWEUjKvTquBYsgVpuMt2T -z00KGdB+QYDapYNhlcDDGfJDvAaFk9OIFG2TF/fZ/d6GJ1o96LRUorKj4xHPxahn -AmOuZFvEfEyZh/axM1qP -=exeg +iQIcBAEBCAAGBQJMZQqPAAoJELHSF2kinlg4nRcP/1ZbPopC4INMiQIjcbjx3p/E +AgiaPrnnUytjNqVJIOb2VCZHywnAYhzSdPQIXPvAkFS0b9TzRU/WWkySIlY7PheA +WframfgdXuKS69gKfXa7gwltK8pTodKwU91RWJJ3Q0HXGVsc29z6zP1v6vl3OwTk +9ULN+8z5jlcmWsr+bZLTLpgiBy0Z8fGQmiXP+8r7zangTJ3TaTt8Zhb8NcL45HPn +4nLW6YwtRv9wwN+3BTxYCPjen4qOCHIkfm5TIZKSFf/aEDVMF2h2vj+tHPqYI93e +ol2FUny8lGNbaSFiZVNfK2S0Qrz+ayBGYLBzqlYksOEtLNqoBU8up5p0QlOz+Fmz +VJB6u7G6nJgk+8HrysjtBuzpnazLX4IU7cH9X8M0WX9MkcMcoNlm/eKa9DoRNQU7 +/qS1rVVDxwbilOTvj99QlmzykTcNijHbSh9V9yRPjDD87LRKSsdhtbdcWWduSwxg +B4iBIUxTELEwhxBCJG6TWSrQVJrdkkWaZdhydc1ZUtOpkazQ+gYQCCIBUHhBmPQX +a6hzlbRxI4Uj/enGuUcrJJmXxKZQOZnAfByxwxsLJ/GvHfUVb4GSFHk98jlMSxoO +HOw88Oqsz9dcYXzyd6IAMjjG5gCXJ3HNeSV5vXiohUl6NEbblaNUK7F83nJPwYa6 +YbrMjSLQhhTqf1oUsOXg +=gqo+ -----END PGP SIGNATURE----- diff --git a/dev-util/schroot/files/schroot-1.4.1-boost-validation_error.patch b/dev-util/schroot/files/schroot-1.4.1-boost-validation_error.patch deleted file mode 100644 index 3dc92af2721a..000000000000 --- a/dev-util/schroot/files/schroot-1.4.1-boost-validation_error.patch +++ /dev/null @@ -1,142 +0,0 @@ -Fix for api change in boost 1.42.0 - validation_error -> error. - -Thanks to Andrew Savchenko <bircoph@gmail.com>. - ---- schroot-1.4.1.orig/bin/csbuild/csbuild-options.cc -+++ schroot-1.4.1/bin/csbuild/csbuild-options.cc -@@ -220,9 +220,9 @@ - if (vm.count("binNMU") && vm.count("make-binNMU")) - this->bin_nmu = true; - else if (vm.count("binNMU")) -- throw opt::validation_error(_("--makebinNMU missing")); -+ throw opt::error(_("--makebinNMU missing")); - else if (vm.count("make-binNMU")) -- throw opt::validation_error(_("--binNMU missing")); -+ throw opt::error(_("--binNMU missing")); - - if (!deb_build_options_string.empty()) - { ---- schroot-1.4.1.orig/bin/dchroot-dsa/dchroot-dsa-options.cc -+++ schroot-1.4.1/bin/dchroot-dsa/dchroot-dsa-options.cc -@@ -90,11 +90,11 @@ - - // dchroot-dsa only allows one command. - if (this->command.size() > 1) -- throw opt::validation_error(_("Only one command may be specified")); -+ throw opt::error(_("Only one command may be specified")); - - if (!this->command.empty() && - !sbuild::is_absname(this->command[0])) -- throw opt::validation_error(_("Command must have an absolute path")); -+ throw opt::error(_("Command must have an absolute path")); - - if (this->chroots.empty() && !all_used() && - (this->action != ACTION_CONFIG && -@@ -103,5 +103,5 @@ - this->action != ACTION_LOCATION && - this->action != ACTION_HELP && - this->action != ACTION_VERSION)) -- throw opt::validation_error(_("No chroot specified")); -+ throw opt::error(_("No chroot specified")); - } ---- schroot-1.4.1.orig/bin/schroot/schroot-options-base.cc -+++ schroot-1.4.1/bin/schroot/schroot-options-base.cc -@@ -200,7 +200,7 @@ - this->load_chroots = true; - this->load_sessions = false; - if (this->chroots.size() != 1 || all_used()) -- throw opt::validation_error -+ throw opt::error - (_("Exactly one chroot must be specified when beginning a session")); - - this->all = this->all_chroots = this->all_sessions = false; -@@ -213,7 +213,7 @@ - this->load_chroots = this->load_sessions = true; - - if (!this->session_name.empty()) -- throw opt::validation_error -+ throw opt::error - (_("--session-name is not permitted for the specified action; did you mean to use --chroot?")); - } - else if (this->action == ACTION_HELP || -@@ -234,7 +234,7 @@ - if (this->all_sessions) - this->load_sessions = true; - if (!this->chroots.empty()) -- throw opt::validation_error(_("--chroot may not be used with --list")); -+ throw opt::error(_("--chroot may not be used with --list")); - } - else if (this->action == ACTION_INFO || - this->action == ACTION_LOCATION || -@@ -259,6 +259,6 @@ - // Something went wrong - this->load_chroots = this->load_sessions = false; - this->all = this->all_chroots = this->all_sessions = false; -- throw opt::validation_error(_("Unknown action specified")); -+ throw opt::error(_("Unknown action specified")); - } - } ---- schroot-1.4.1.orig/bin/schroot-base/schroot-base-option-action.cc -+++ schroot-1.4.1/bin/schroot-base/schroot-base-option-action.cc -@@ -82,7 +82,7 @@ - if (this->current_action == "") - this->current_action = action; - else -- throw opt::validation_error(_("Only one action may be specified")); -+ throw opt::error(_("Only one action may be specified")); - } - else - throw std::logic_error((format(_("%1%: invalid action")) % action).str()); ---- schroot-1.4.1.orig/bin/schroot-base/schroot-base-options.cc -+++ schroot-1.4.1/bin/schroot-base/schroot-base-options.cc -@@ -155,7 +155,7 @@ - else if (this->debug_level == "critical") - sbuild::debug_log_level = sbuild::DEBUG_CRITICAL; - else -- throw opt::validation_error(_("Invalid debug level")); -+ throw opt::error(_("Invalid debug level")); - } - else - sbuild::debug_log_level = sbuild::DEBUG_NONE; ---- schroot-1.4.1.orig/bin/schroot-listmounts/schroot-listmounts-options.cc -+++ schroot-1.4.1/bin/schroot-listmounts/schroot-listmounts-options.cc -@@ -86,5 +86,5 @@ - - if (this->action == ACTION_LISTMOUNTS && - this->mountpoint.empty()) -- throw opt::validation_error(_("No mount point specified")); -+ throw opt::error(_("No mount point specified")); - } ---- schroot-1.4.1.orig/bin/schroot-mount/schroot-mount-options.cc -+++ schroot-1.4.1/bin/schroot-mount/schroot-mount-options.cc -@@ -99,5 +99,5 @@ - - if (this->action == ACTION_MOUNT && - this->mountpoint.empty()) -- throw opt::validation_error(_("No mount point specified")); -+ throw opt::error(_("No mount point specified")); - } ---- schroot-1.4.1.orig/bin/schroot-releaselock/schroot-releaselock-options.cc -+++ schroot-1.4.1/bin/schroot-releaselock/schroot-releaselock-options.cc -@@ -89,5 +89,5 @@ - - if (this->action == ACTION_RELEASELOCK && - this->device.empty()) -- throw opt::validation_error(_("No device specified")); -+ throw opt::error(_("No device specified")); - } ---- schroot-1.4.1.orig/test/schroot-base-option-action.cc -+++ schroot-1.4.1/test/schroot-base-option-action.cc -@@ -37,10 +37,10 @@ - CPPUNIT_TEST(test_current); - CPPUNIT_TEST_EXCEPTION(test_current_fail, std::logic_error); - CPPUNIT_TEST_EXCEPTION(test_current_fail_multipleset, -- opt::validation_error); -+ opt::error); - CPPUNIT_TEST(test_operators); - CPPUNIT_TEST_EXCEPTION(test_operators_fail_multipleset, -- opt::validation_error); -+ opt::error); - CPPUNIT_TEST_SUITE_END(); - - protected: diff --git a/dev-util/schroot/files/schroot-1.4.7-tests.patch b/dev-util/schroot/files/schroot-1.4.7-tests.patch new file mode 100644 index 000000000000..4a492e7feb97 --- /dev/null +++ b/dev-util/schroot/files/schroot-1.4.7-tests.patch @@ -0,0 +1,81 @@ +--- 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/metadata.xml b/dev-util/schroot/metadata.xml index c764bed00c60..da18660a6408 100644 --- a/dev-util/schroot/metadata.xml +++ b/dev-util/schroot/metadata.xml @@ -7,7 +7,8 @@ <name>Jonathan Callen</name> </maintainer> <use> + <flag name="btrfs">Enable support for chroots using btrfs snapshots.</flag> <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg>.</flag> - <flag name="lvm">Enable support for chroots on LVM.</flag> + <flag name="lvm">Enable support for chroots using LVM snapshots.</flag> </use> </pkgmetadata> diff --git a/dev-util/schroot/schroot-1.4.0.ebuild b/dev-util/schroot/schroot-1.4.0.ebuild deleted file mode 100644 index b16fe8dfcd98..000000000000 --- a/dev-util/schroot/schroot-1.4.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.0.ebuild,v 1.2 2010/02/13 22:29:07 abcd Exp $ - -EAPI="2" -WANT_AUTOMAKE="1.11" - -inherit autotools base pam - -DESCRIPTION="Utility to execute commands in a chroot environment" -HOMEPAGE="http://packages.debian.org/source/sid/schroot" -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+dchroot debug doc lvm nls pam test" - -COMMON_DEPEND=" - >=dev-libs/boost-1.39.0 - dev-libs/lockdev - >=sys-apps/util-linux-2.16 - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) -" - -DEPEND="${COMMON_DEPEND} - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext ) - test? ( >=dev-util/cppunit-1.10.0 ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/debianutils - dchroot? ( !sys-apps/dchroot ) - nls? ( virtual/libintl ) -" - -PATCHES=( - "${FILESDIR}/${P}-tests.patch" -) - -src_prepare() { - base_src_prepare - - # Don't depend on cppunit unless we are testing - use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac - - echo -e "Package: ${PN}\nVersion: ${PV}" > VERSION - - eautoreconf -} - -src_configure() { - root_tests=no - use test && (( EUID == 0 )) && root_tests=yes - econf \ - $(use_enable doc doxygen) \ - $(use_enable dchroot) \ - $(use_enable dchroot dchroot-dsa) \ - $(use_enable debug) \ - $(use_enable lvm lvm-snapshot) \ - $(use_enable nls) \ - $(use_enable pam) \ - --enable-block-device \ - --enable-loopback \ - --enable-uuid \ - --enable-root-tests=$root_tests \ - --enable-shared \ - --disable-static \ - --localstatedir=/var \ - --with-bash-completion-dir=/usr/share/bash-completion -} - -src_test() { - if [[ $root_tests == yes && $EUID -ne 0 ]]; then - ewarn "Disabling tests because you are no longer root" - return 0 - fi - default -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed" - newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed" - - dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" - if use doc; then - docinto html/sbuild - dohtml doc/sbuild/html/* || die "installation of html docs failed" - docinto html/schroot - dohtml doc/schroot/html/* || die "installation of html docs failed" - fi - - if use pam; then - rm -f "${D}"/etc/pam.d/schroot - pamd_mimic_system schroot auth account session - fi - - # Remove *.la files - find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed" -} diff --git a/dev-util/schroot/schroot-1.4.1.ebuild b/dev-util/schroot/schroot-1.4.1.ebuild deleted file mode 100644 index 97567e380e31..000000000000 --- a/dev-util/schroot/schroot-1.4.1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.1.ebuild,v 1.1 2010/02/27 02:06:47 abcd Exp $ - -EAPI="2" -WANT_AUTOMAKE="1.11" - -inherit autotools base pam - -DESCRIPTION="Utility to execute commands in a chroot environment" -HOMEPAGE="http://packages.debian.org/source/sid/schroot" -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+dchroot debug doc lvm nls pam test" - -COMMON_DEPEND=" - >=dev-libs/boost-1.39.0 - dev-libs/lockdev - >=sys-apps/util-linux-2.16 - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) -" - -DEPEND="${COMMON_DEPEND} - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext ) - test? ( >=dev-util/cppunit-1.10.0 ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/debianutils - dchroot? ( !sys-apps/dchroot ) - nls? ( virtual/libintl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.0-tests.patch" -) - -src_prepare() { - base_src_prepare - - # Don't depend on cppunit unless we are testing - use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac - - echo -e "Package: ${PN}\nVersion: ${PV}" > VERSION - - eautoreconf -} - -src_configure() { - root_tests=no - use test && (( EUID == 0 )) && root_tests=yes - econf \ - $(use_enable doc doxygen) \ - $(use_enable dchroot) \ - $(use_enable dchroot dchroot-dsa) \ - $(use_enable debug) \ - $(use_enable lvm lvm-snapshot) \ - $(use_enable nls) \ - $(use_enable pam) \ - --enable-block-device \ - --enable-loopback \ - --enable-uuid \ - --enable-root-tests=$root_tests \ - --enable-shared \ - --disable-static \ - --localstatedir=/var \ - --with-bash-completion-dir=/usr/share/bash-completion -} - -src_test() { - if [[ $root_tests == yes && $EUID -ne 0 ]]; then - ewarn "Disabling tests because you are no longer root" - return 0 - fi - default -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed" - newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed" - - dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" - if use doc; then - docinto html/sbuild - dohtml doc/sbuild/html/* || die "installation of html docs failed" - docinto html/schroot - dohtml doc/schroot/html/* || die "installation of html docs failed" - fi - - if use pam; then - rm -f "${D}"/etc/pam.d/schroot - pamd_mimic_system schroot auth account session - fi - - # Remove *.la files - find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed" -} - -pkg_preinst() { - export had_older_1_4_1=false - has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true - if ${had_older_1_4_1}; then - einfo "Moving config files to new location..." - mkdir "${ROOT}etc/schroot/default" - mv_conffile etc/schroot/script-defaults etc/schroot/default/config - mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab - mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles - mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases - fi -} - -mv_conffile() { - local OLDFILE=${ROOT}$1 - local NEWFILE=${ROOT}$2 - - # if the old file doesn't exist, or is a symlink, stop - [[ -f ${OLDFILE} ]] || return 0 - [[ -L ${OLDFILE} ]] && return 0 - - # if the new file already exists, then we have a problem... - if [[ -e ${NEWFILE} ]]; then - # but if they are the same, then don't worry about it - if cmp -s "${OLDFILE}" "${NEWFILE}"; then - rm -f "${OLDFILE}" - else - ewarn "${NEWFILE} already exists, not moving ${OLDFILE}" - fi - else - mv "${OLDFILE}" "${NEWFILE}" - fi - - local x y - # now move all the unmerged config files as well - for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do - [[ -f ${x} ]] || continue - # /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config - y=${x##*/} - y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/} - mv "${x}" "${y}" - done -} - -pkg_postinst() { - local x - if ${had_older_1_4_1}; then - for x in script:config mount:fstab copyfiles nssdatabases; do - if [[ ! -e ${ROOT}etc/schroot/${x%:*}-defaults && -f ${ROOT}etc/schroot/default/${x#*:} ]]; then - einfo "Creating compatibility symlink for ${x%:*}-defaults" - ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults" - fi - done - - ewarn "Your config files have been moved to the new location in" - ewarn "/etc/schroot/default. Compatibility symlinks have been installed in" - ewarn "/etc/schroot, and may be removed if no running chroot refers to them." - fi -} diff --git a/dev-util/schroot/schroot-1.4.1-r1.ebuild b/dev-util/schroot/schroot-1.4.7.ebuild index cd2a5c01a8d3..759fe7c54cd4 100644 --- a/dev-util/schroot/schroot-1.4.1-r1.ebuild +++ b/dev-util/schroot/schroot-1.4.7.ebuild @@ -1,25 +1,28 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.1-r1.ebuild,v 1.1 2010/03/26 18:14:15 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.7.ebuild,v 1.1 2010/08/13 09:04:04 abcd Exp $ -EAPI="2" +EAPI="3" WANT_AUTOMAKE="1.11" inherit autotools base pam +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}/${PN}_${PV}.orig.tar.gz" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+dchroot debug doc lvm nls pam test" +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 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) " @@ -39,9 +42,7 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-1.4.0-tests.patch" - # This patch requires boost >= 1.42.0 - "${FILESDIR}/${PN}-1.4.1-boost-validation_error.patch" + "${FILESDIR}/${P}-tests.patch" ) src_prepare() { @@ -50,8 +51,6 @@ src_prepare() { # Don't depend on cppunit unless we are testing use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac - echo -e "Package: ${PN}\nVersion: ${PV}" > VERSION - eautoreconf } @@ -59,6 +58,7 @@ src_configure() { root_tests=no use test && (( EUID == 0 )) && root_tests=yes econf \ + $(use_enable btrfs btrfs-snapshot) \ $(use_enable doc doxygen) \ $(use_enable dchroot) \ $(use_enable dchroot dchroot-dsa) \ @@ -72,8 +72,8 @@ src_configure() { --enable-root-tests=$root_tests \ --enable-shared \ --disable-static \ - --localstatedir=/var \ - --with-bash-completion-dir=/usr/share/bash-completion + --localstatedir="${EPREFIX}"/var \ + --with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion } src_test() { @@ -87,10 +87,14 @@ src_test() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/share/doc/${PF}/contrib/setup.d + doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed" + newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed" newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed" dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" + if use doc; then docinto html/sbuild dohtml doc/sbuild/html/* || die "installation of html docs failed" @@ -99,7 +103,7 @@ src_install() { fi if use pam; then - rm -f "${D}"/etc/pam.d/schroot + rm -f "${ED}"etc/pam.d/schroot pamd_mimic_system schroot auth account session fi @@ -112,7 +116,7 @@ pkg_preinst() { has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true if ${had_older_1_4_1}; then einfo "Moving config files to new location..." - mkdir "${ROOT}etc/schroot/default" + mkdir "${EROOT}etc/schroot/default" mv_conffile etc/schroot/script-defaults etc/schroot/default/config mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles @@ -121,8 +125,8 @@ pkg_preinst() { } mv_conffile() { - local OLDFILE=${ROOT}$1 - local NEWFILE=${ROOT}$2 + local OLDFILE=${EROOT}$1 + local NEWFILE=${EROOT}$2 # if the old file doesn't exist, or is a symlink, stop [[ -f ${OLDFILE} ]] || return 0 @@ -155,7 +159,7 @@ pkg_postinst() { local x if ${had_older_1_4_1}; then for x in script:config mount:fstab copyfiles nssdatabases; do - if [[ ! -e ${ROOT}etc/schroot/${x%:*}-defaults && -f ${ROOT}etc/schroot/default/${x#*:} ]]; then + if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then einfo "Creating compatibility symlink for ${x%:*}-defaults" ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults" fi |