1 |
mgorny 15/06/03 02:34:55 |
2 |
|
3 |
Modified: xz-utils-9999.ebuild ChangeLog |
4 |
Added: xz-utils-5.2.1-r1.ebuild |
5 |
Removed: xz-utils-5.2.1.ebuild |
6 |
Log: |
7 |
Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/139 by nigoro. |
8 |
|
9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.21 app-arch/xz-utils/xz-utils-9999.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?rev=1.21&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?rev=1.21&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?r1=1.20&r2=1.21 |
17 |
|
18 |
Index: xz-utils-9999.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v |
21 |
retrieving revision 1.20 |
22 |
retrieving revision 1.21 |
23 |
diff -u -r1.20 -r1.21 |
24 |
--- xz-utils-9999.ebuild 28 Apr 2014 17:19:43 -0000 1.20 |
25 |
+++ xz-utils-9999.ebuild 3 Jun 2015 02:34:55 -0000 1.21 |
26 |
@@ -1,6 +1,6 @@ |
27 |
-# Copyright 1999-2014 Gentoo Foundation |
28 |
+# Copyright 1999-2015 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.20 2014/04/28 17:19:43 mgorny Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.21 2015/06/03 02:34:55 mgorny Exp $ |
32 |
|
33 |
# Remember: we cannot leverage autotools in this ebuild in order |
34 |
# to avoid circular deps with autotools |
35 |
@@ -28,7 +28,7 @@ |
36 |
# See top-level COPYING file as it outlines the various pieces and their licenses. |
37 |
LICENSE="public-domain LGPL-2.1+ GPL-2+" |
38 |
SLOT="0" |
39 |
-IUSE="nls static-libs +threads" |
40 |
+IUSE="elibc_FreeBSD nls static-libs +threads" |
41 |
|
42 |
RDEPEND="!<app-arch/lzma-4.63 |
43 |
!app-arch/lzma-utils |
44 |
@@ -46,6 +46,7 @@ |
45 |
} |
46 |
|
47 |
multilib_src_configure() { |
48 |
+ use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 |
49 |
ECONF_SOURCE="${S}" econf \ |
50 |
$(use_enable nls) \ |
51 |
$(use_enable threads) \ |
52 |
|
53 |
|
54 |
|
55 |
1.96 app-arch/xz-utils/ChangeLog |
56 |
|
57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?rev=1.96&view=markup |
58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?rev=1.96&content-type=text/plain |
59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?r1=1.95&r2=1.96 |
60 |
|
61 |
Index: ChangeLog |
62 |
=================================================================== |
63 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v |
64 |
retrieving revision 1.95 |
65 |
retrieving revision 1.96 |
66 |
diff -u -r1.95 -r1.96 |
67 |
--- ChangeLog 4 Apr 2015 22:34:26 -0000 1.95 |
68 |
+++ ChangeLog 3 Jun 2015 02:34:55 -0000 1.96 |
69 |
@@ -1,6 +1,13 @@ |
70 |
# ChangeLog for app-arch/xz-utils |
71 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
72 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.95 2015/04/04 22:34:26 vapier Exp $ |
73 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.96 2015/06/03 02:34:55 mgorny Exp $ |
74 |
+ |
75 |
+*xz-utils-5.2.1-r1 (03 Jun 2015) |
76 |
+ |
77 |
+ 03 Jun 2015; Michał Górny <mgorny@g.o> +xz-utils-5.2.1-r1.ebuild, |
78 |
+ -xz-utils-5.2.1.ebuild, xz-utils-9999.ebuild: |
79 |
+ Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo- |
80 |
+ portage-rsync-mirror/pull/139 by nigoro. |
81 |
|
82 |
04 Apr 2015; Mike Frysinger <vapier@g.o> xz-utils-5.0.8.ebuild: |
83 |
Mark arm64/m68k/s390/sh stable. |
84 |
|
85 |
|
86 |
|
87 |
1.1 app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: xz-utils-5.2.1-r1.ebuild |
93 |
=================================================================== |
94 |
# Copyright 1999-2015 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild,v 1.1 2015/06/03 02:34:55 mgorny Exp $ |
97 |
|
98 |
# Remember: we cannot leverage autotools in this ebuild in order |
99 |
# to avoid circular deps with autotools |
100 |
|
101 |
EAPI="4" |
102 |
|
103 |
inherit eutils multilib toolchain-funcs libtool multilib-minimal |
104 |
|
105 |
if [[ ${PV} == "9999" ]] ; then |
106 |
EGIT_REPO_URI="http://git.tukaani.org/xz.git" |
107 |
inherit git-2 autotools |
108 |
SRC_URI="" |
109 |
EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 |
110 |
else |
111 |
MY_P="${PN/-utils}-${PV/_}" |
112 |
SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz" |
113 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
114 |
S=${WORKDIR}/${MY_P} |
115 |
EXTRA_DEPEND= |
116 |
fi |
117 |
|
118 |
DESCRIPTION="utils for managing LZMA compressed files" |
119 |
HOMEPAGE="http://tukaani.org/xz/" |
120 |
|
121 |
# See top-level COPYING file as it outlines the various pieces and their licenses. |
122 |
LICENSE="public-domain LGPL-2.1+ GPL-2+" |
123 |
SLOT="0" |
124 |
IUSE="elibc_FreeBSD nls static-libs +threads" |
125 |
|
126 |
RDEPEND="!<app-arch/lzma-4.63 |
127 |
!app-arch/lzma-utils |
128 |
!<app-arch/p7zip-4.57" |
129 |
DEPEND="${RDEPEND} |
130 |
${EXTRA_DEPEND}" |
131 |
|
132 |
src_prepare() { |
133 |
if [[ ${PV} == "9999" ]] ; then |
134 |
eautopoint |
135 |
eautoreconf |
136 |
else |
137 |
elibtoolize # to allow building shared libs on Solaris/x64 |
138 |
fi |
139 |
} |
140 |
|
141 |
multilib_src_configure() { |
142 |
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 |
143 |
ECONF_SOURCE="${S}" econf \ |
144 |
$(use_enable nls) \ |
145 |
$(use_enable threads) \ |
146 |
$(use_enable static-libs static) \ |
147 |
$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}) |
148 |
} |
149 |
|
150 |
multilib_src_install() { |
151 |
default |
152 |
multilib_is_native_abi && gen_usr_ldscript -a lzma |
153 |
} |
154 |
|
155 |
multilib_src_install_all() { |
156 |
prune_libtool_files --all |
157 |
rm "${ED}"/usr/share/doc/xz/COPYING* || die |
158 |
mv "${ED}"/usr/share/doc/{xz,${PF}} || die |
159 |
} |
160 |
|
161 |
pkg_preinst() { |
162 |
preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) |
163 |
} |
164 |
|
165 |
pkg_postinst() { |
166 |
preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) |
167 |
} |