Gentoo Archives: gentoo-commits

From: "Jonathan Callen (jcallen)" <jcallen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/schroot: schroot-1.6.10-r2.ebuild ChangeLog schroot-1.4.23.ebuild schroot-1.4.25.ebuild schroot-1.6.10-r1.ebuild schroot-1.4.26.ebuild schroot-1.4.23-r1.ebuild
Date: Fri, 31 Jul 2015 22:46:30
Message-Id: 20150731224623.E52CA112@oystercatcher.gentoo.org
1 jcallen 15/07/31 22:46:23
2
3 Modified: ChangeLog
4 Added: schroot-1.6.10-r2.ebuild
5 Removed: schroot-1.4.23.ebuild schroot-1.4.25.ebuild
6 schroot-1.6.10-r1.ebuild schroot-1.4.26.ebuild
7 schroot-1.4.23-r1.ebuild
8 Log:
9 Add upstream patch to work with GCC 4.9 and GCC 5. Fixes bug 555648. Remove old.
10
11 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 229E5838)
12
13 Revision Changes Path
14 1.44 dev-util/schroot/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.44&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?rev=1.44&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/ChangeLog?r1=1.43&r2=1.44
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v
23 retrieving revision 1.43
24 retrieving revision 1.44
25 diff -u -r1.43 -r1.44
26 --- ChangeLog 14 Jun 2015 02:41:01 -0000 1.43
27 +++ ChangeLog 31 Jul 2015 22:46:23 -0000 1.44
28 @@ -1,6 +1,15 @@
29 # ChangeLog for dev-util/schroot
30 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.43 2015/06/14 02:41:01 jcallen Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.44 2015/07/31 22:46:23 jcallen Exp $
33 +
34 +*schroot-1.6.10-r2 (31 Jul 2015)
35 +
36 + 31 Jul 2015; Jonathan Callen <jcallen@g.o>
37 + +files/schroot-1.6.10-cmake-add-additional-regex-tests.patch,
38 + +schroot-1.6.10-r2.ebuild, -schroot-1.4.23-r1.ebuild, -schroot-1.4.23.ebuild,
39 + -schroot-1.4.25.ebuild, -schroot-1.4.26.ebuild, -schroot-1.6.10-r1.ebuild:
40 + Add upstream patch to work with GCC 4.9 and GCC 5. Fixes bug 555648. Remove
41 + old.
42
43 *schroot-1.6.10-r1 (14 Jun 2015)
44
45
46
47
48 1.1 dev-util/schroot/schroot-1.6.10-r2.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.6.10-r2.ebuild?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/schroot/schroot-1.6.10-r2.ebuild?rev=1.1&content-type=text/plain
52
53 Index: schroot-1.6.10-r2.ebuild
54 ===================================================================
55 # Copyright 1999-2015 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r2.ebuild,v 1.1 2015/07/31 22:46:23 jcallen Exp $
58
59 EAPI="5"
60
61 inherit cmake-utils eutils pam versionator bash-completion-r1
62
63 MY_P=${PN}_${PV}
64 DEB_REL=1
65
66 DESCRIPTION="Utility to execute commands in a chroot environment"
67 HOMEPAGE="http://packages.debian.org/source/sid/schroot"
68 SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
69 mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
70
71 LICENSE="GPL-3"
72 SLOT="0"
73 KEYWORDS="~amd64 ~arm ~x86"
74 IUSE="btrfs +dchroot debug doc lvm nls pam test"
75
76 COMMON_DEPEND="
77 >=dev-libs/boost-1.42.0
78 >=sys-apps/util-linux-2.16
79 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
80 lvm? ( sys-fs/lvm2 )
81 pam? ( sys-libs/pam )
82 "
83
84 DEPEND="${COMMON_DEPEND}
85 app-arch/xz-utils
86 sys-apps/groff
87 doc? (
88 app-doc/doxygen
89 media-gfx/graphviz
90 )
91 nls? (
92 >=app-text/po4a-0.40
93 sys-devel/gettext
94 )
95 test? ( >=dev-util/cppunit-1.10.0 )
96 "
97 RDEPEND="${COMMON_DEPEND}
98 sys-apps/debianutils
99 dchroot? ( !sys-apps/dchroot )
100 nls? ( virtual/libintl )
101 "
102
103 PATCHES=(
104 "${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.patch"
105 )
106
107 src_unpack() {
108 unpack ${MY_P}.orig.tar.xz
109 cd "${S}"
110 unpack ${MY_P}-${DEB_REL}.debian.tar.xz
111 }
112
113 src_prepare() {
114 sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
115 sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
116
117 cmake-utils_src_prepare
118 }
119
120 src_configure() {
121 local mycmakeargs=(
122 $(cmake-utils_use btrfs btrfs-snapshot)
123 $(cmake-utils_use dchroot dchroot)
124 $(cmake-utils_use dchroot dchroot-dsa)
125 $(cmake-utils_use debug debug)
126 $(cmake-utils_use doc doxygen)
127 $(cmake-utils_use lvm lvm-snapshot)
128 $(cmake-utils_use nls nls)
129 $(cmake-utils_use pam pam)
130 $(cmake-utils_use test test)
131 -Dbash_completion_dir="$(get_bashcompdir)"
132 -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
133 )
134 if ! use nls; then
135 mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
136 fi
137
138 cmake-utils_src_configure
139 }
140
141 src_compile() {
142 cmake-utils_src_compile all $(usev doc)
143 }
144
145 src_test() {
146 if [[ $EUID -ne 0 ]]; then
147 ewarn "Disabling tests because you are not root"
148 return 0
149 fi
150
151 cmake-utils_src_test
152 }
153
154 src_install() {
155 cmake-utils_src_install
156
157 insinto /usr/share/doc/${PF}/contrib/setup.d
158 doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
159
160 newdoc debian/schroot.NEWS NEWS.debian
161
162 newinitd "${FILESDIR}"/schroot.initd schroot
163 newconfd "${FILESDIR}"/schroot.confd schroot
164
165 if use doc; then
166 docinto html/sbuild
167 dohtml "${BUILD_DIR}"/doc/sbuild/html/*
168 docinto html/schroot
169 dohtml "${BUILD_DIR}"/doc/schroot/html/*
170 fi
171
172 if use pam; then
173 rm -f "${ED}"etc/pam.d/schroot
174 pamd_mimic_system schroot auth account session
175 fi
176 }
177
178 pkg_postinst() {
179 if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
180 elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
181 elog "upgrade information."
182 fi
183 }