1 |
mgorny 15/03/29 18:30:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: paludis-2.2.0-r2.ebuild |
5 |
Removed: paludis-2.2.0-r1.ebuild |
6 |
Log: |
7 |
Backport some EAPI support bugfixes. |
8 |
|
9 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.251 sys-apps/paludis/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?rev=1.251&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?rev=1.251&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/ChangeLog?r1=1.250&r2=1.251 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v |
21 |
retrieving revision 1.250 |
22 |
retrieving revision 1.251 |
23 |
diff -u -r1.250 -r1.251 |
24 |
--- ChangeLog 21 Mar 2015 15:37:58 -0000 1.250 |
25 |
+++ ChangeLog 29 Mar 2015 18:30:52 -0000 1.251 |
26 |
@@ -1,6 +1,17 @@ |
27 |
# ChangeLog for sys-apps/paludis |
28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.250 2015/03/21 15:37:58 mgorny Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.251 2015/03/29 18:30:52 mgorny Exp $ |
31 |
+ |
32 |
+*paludis-2.2.0-r2 (29 Mar 2015) |
33 |
+ |
34 |
+ 29 Mar 2015; Michał Górny <mgorny@g.o> |
35 |
+ +files/paludis-2.2.0-check-IUSE_EFFECTIVE-in-EAPI-5.patch, |
36 |
+ +files/paludis-2.2.0-filter-EBUILD_PHASE_FUNC.patch, |
37 |
+ +files/paludis-2.2.0-filter-IUSE_EFFECTIVE.patch, |
38 |
+ +files/paludis-2.2.0-fix-MERGE_TYPE.patch, |
39 |
+ +files/paludis-2.2.0-fix-PWD-handling.patch, +paludis-2.2.0-r2.ebuild, |
40 |
+ -paludis-2.2.0-r1.ebuild: |
41 |
+ Backport some EAPI support bugfixes. |
42 |
|
43 |
21 Mar 2015; Michał Górny <mgorny@g.o> paludis-2.2.0-r1.ebuild: |
44 |
Add -k to emake check, to get as many tests done as possible on failure. |
45 |
|
46 |
|
47 |
|
48 |
1.1 sys-apps/paludis/paludis-2.2.0-r2.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/paludis-2.2.0-r2.ebuild?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/paludis/paludis-2.2.0-r2.ebuild?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: paludis-2.2.0-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/sys-apps/paludis/paludis-2.2.0-r2.ebuild,v 1.1 2015/03/29 18:30:52 mgorny Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
|
61 |
PYTHON_COMPAT=( python2_7 ) |
62 |
|
63 |
inherit autotools bash-completion-r1 eutils python-single-r1 user |
64 |
|
65 |
DESCRIPTION="paludis, the other package mangler" |
66 |
HOMEPAGE="http://paludis.exherbo.org/" |
67 |
SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2" |
68 |
|
69 |
IUSE="doc pbins pink python ruby search-index test xml" |
70 |
LICENSE="GPL-2 vim" |
71 |
SLOT="0" |
72 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
73 |
|
74 |
COMMON_DEPEND=" |
75 |
>=app-admin/eselect-1.2.13 |
76 |
>=app-shells/bash-3.2 |
77 |
dev-libs/libpcre[cxx] |
78 |
sys-apps/file |
79 |
pbins? ( >=app-arch/libarchive-3.1.2 ) |
80 |
python? ( |
81 |
${PYTHON_DEPS} |
82 |
>=dev-libs/boost-1.41.0[python,${PYTHON_USEDEP}] ) |
83 |
ruby? ( dev-lang/ruby:1.9 ) |
84 |
search-index? ( >=dev-db/sqlite-3 ) |
85 |
xml? ( >=dev-libs/libxml2-2.6 )" |
86 |
|
87 |
DEPEND="${COMMON_DEPEND} |
88 |
>=app-text/asciidoc-8.6.3 |
89 |
app-text/htmltidy |
90 |
app-text/xmlto |
91 |
>=sys-devel/gcc-4.7 |
92 |
doc? ( |
93 |
|| ( |
94 |
>=app-doc/doxygen-1.5.3 |
95 |
<=app-doc/doxygen-1.5.1 ) |
96 |
python? ( |
97 |
dev-python/sphinx[${PYTHON_USEDEP}] ) |
98 |
ruby? ( dev-ruby/syntax ) |
99 |
) |
100 |
virtual/pkgconfig |
101 |
test? ( >=dev-cpp/gtest-1.6.0-r1 )" |
102 |
|
103 |
RDEPEND="${COMMON_DEPEND} |
104 |
sys-apps/sandbox" |
105 |
|
106 |
PDEPEND="app-admin/eselect-package-manager" |
107 |
|
108 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
109 |
|
110 |
pkg_pretend() { |
111 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
112 |
if id paludisbuild >/dev/null 2>/dev/null ; then |
113 |
if ! groups paludisbuild | grep --quiet '\<tty\>' ; then |
114 |
eerror "The 'paludisbuild' user is now expected to be a member of the" |
115 |
eerror "'tty' group. You should add the user to this group before" |
116 |
eerror "upgrading Paludis." |
117 |
die "Please add paludisbuild to tty group" |
118 |
fi |
119 |
fi |
120 |
fi |
121 |
|
122 |
if [[ ${MERGE_TYPE} != binary ]]; then |
123 |
if [[ $(gcc-major-version) -lt 4 |
124 |
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ) ]] |
125 |
then |
126 |
eerror "Paludis requires at least gcc 4.7 to build. Please switch the active" |
127 |
eerror "gcc version using gcc-config." |
128 |
die "Paludis requires at least gcc 4.7" |
129 |
fi |
130 |
fi |
131 |
} |
132 |
|
133 |
pkg_setup() { |
134 |
enewgroup "paludisbuild" |
135 |
enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty" |
136 |
|
137 |
use python && python-single-r1_pkg_setup |
138 |
} |
139 |
|
140 |
src_prepare() { |
141 |
# The package explicitly wants ruby1.9, so fix the script on it. |
142 |
# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2 |
143 |
sed -i -e '1s/ruby/&19/' ruby/demos/*.rb || die |
144 |
|
145 |
local PATCHES=( |
146 |
"${FILESDIR}"/${P}-fix-MERGE_TYPE.patch |
147 |
"${FILESDIR}"/${P}-fix-PWD-handling.patch |
148 |
"${FILESDIR}"/${P}-filter-IUSE_EFFECTIVE.patch |
149 |
"${FILESDIR}"/${P}-check-IUSE_EFFECTIVE-in-EAPI-5.patch |
150 |
"${FILESDIR}"/${P}-filter-EBUILD_PHASE_FUNC.patch |
151 |
) |
152 |
|
153 |
epatch "${PATCHES[@]}" |
154 |
epatch_user |
155 |
eautoreconf |
156 |
} |
157 |
|
158 |
src_configure() { |
159 |
local myconf=( |
160 |
--htmldir=/usr/share/doc/${PF}/html |
161 |
|
162 |
$(use_enable doc doxygen) |
163 |
$(use_enable test gtest) |
164 |
$(use_enable pbins) |
165 |
$(use_enable pink) |
166 |
$(use_enable python) |
167 |
$(use python && use_enable doc python-doc) |
168 |
$(use_enable ruby) |
169 |
$(use ruby && use_enable doc ruby-doc) |
170 |
$(use_enable search-index) |
171 |
$(use_enable xml) |
172 |
|
173 |
--enable-vim |
174 |
--with-config-framework=eselect |
175 |
--with-environments=default,portage |
176 |
--with-vim-install-dir=/usr/share/vim/vimfiles |
177 |
) |
178 |
|
179 |
econf "${myconf[@]}" |
180 |
} |
181 |
|
182 |
src_install() { |
183 |
default |
184 |
prune_libtool_files |
185 |
|
186 |
dobashcomp bash-completion/cave |
187 |
|
188 |
insinto /usr/share/zsh/site-functions |
189 |
doins zsh-completion/_cave |
190 |
} |
191 |
|
192 |
src_test() { |
193 |
# Work around Portage bugs |
194 |
local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks" |
195 |
local -x BASH_ENV=/dev/null |
196 |
|
197 |
if [[ ${EUID} == 0 ]] ; then |
198 |
# hate |
199 |
local -x PALUDIS_REDUCED_UID=0 |
200 |
local -x PALUDIS_REDUCED_GID=0 |
201 |
fi |
202 |
|
203 |
if ! nonfatal emake -k check ; then |
204 |
eerror "Tests failed. Looking for files for you to add to your bug report..." |
205 |
find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do |
206 |
eerror " $a" |
207 |
done |
208 |
die "Make check failed" |
209 |
fi |
210 |
} |
211 |
|
212 |
pkg_postinst() { |
213 |
local pm |
214 |
if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then |
215 |
pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" ) |
216 |
fi |
217 |
|
218 |
if [[ ${pm} != paludis ]] ; then |
219 |
elog "If you are using paludis or cave as your primary package manager," |
220 |
elog "you should consider running:" |
221 |
elog " eselect package-manager set paludis" |
222 |
fi |
223 |
} |