1 |
flameeyes 10/04/29 17:49:03 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zlib-1.2.5-r2.ebuild |
5 |
Removed: zlib-1.2.5-r1.ebuild |
6 |
Log: |
7 |
Try two at guessing what zlib wanted to do, assume a mistake between .4 and .5 where a condition was reversed, this one makes more sense in light of 1.2.4, the definitions _and_ the comments. |
8 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.80 sys-libs/zlib/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.80&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.80&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?r1=1.79&r2=1.80 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v |
20 |
retrieving revision 1.79 |
21 |
retrieving revision 1.80 |
22 |
diff -u -r1.79 -r1.80 |
23 |
--- ChangeLog 25 Apr 2010 22:41:11 -0000 1.79 |
24 |
+++ ChangeLog 29 Apr 2010 17:49:03 -0000 1.80 |
25 |
@@ -1,6 +1,15 @@ |
26 |
# ChangeLog for sys-libs/zlib |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.79 2010/04/25 22:41:11 flameeyes Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.80 2010/04/29 17:49:03 flameeyes Exp $ |
30 |
+ |
31 |
+*zlib-1.2.5-r2 (29 Apr 2010) |
32 |
+ |
33 |
+ 29 Apr 2010; Diego E. Pettenò <flameeyes@g.o> |
34 |
+ -zlib-1.2.5-r1.ebuild, +zlib-1.2.5-r2.ebuild, |
35 |
+ files/zlib-1.2.5-lfs-decls.patch: |
36 |
+ Try two at guessing what zlib wanted to do, assume a mistake between .4 |
37 |
+ and .5 where a condition was reversed, this one makes more sense in light |
38 |
+ of 1.2.4, the definitions _and_ the comments. |
39 |
|
40 |
*zlib-1.2.5-r1 (25 Apr 2010) |
41 |
|
42 |
|
43 |
|
44 |
|
45 |
1.1 sys-libs/zlib/zlib-1.2.5-r2.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: zlib-1.2.5-r2.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2010 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.1 2010/04/29 17:49:03 flameeyes Exp $ |
55 |
|
56 |
inherit eutils toolchain-funcs |
57 |
|
58 |
DESCRIPTION="Standard (de)compression library" |
59 |
HOMEPAGE="http://www.zlib.net/" |
60 |
SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2 |
61 |
http://www.zlib.net/${P}.tar.bz2" |
62 |
|
63 |
LICENSE="ZLIB" |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
66 |
IUSE="" |
67 |
|
68 |
RDEPEND="!<dev-libs/libxml2-2.7.7" #309623 |
69 |
|
70 |
src_unpack() { |
71 |
unpack ${A} |
72 |
cd "${S}" |
73 |
epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212 |
74 |
# trust exit status of the compiler rather than stderr #55434 |
75 |
# -if test "`(...) 2>&1`" = ""; then |
76 |
# +if (...) 2>/dev/null; then |
77 |
sed -i 's|\<test "`\([^"]*\) 2>&1`" = ""|\1 2>/dev/null|' configure || die |
78 |
|
79 |
# bug #316377 |
80 |
epatch "${FILESDIR}"/${P}-lfs-decls.patch |
81 |
} |
82 |
|
83 |
src_compile() { |
84 |
case ${CHOST} in |
85 |
*-mingw*|mingw*) |
86 |
emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die |
87 |
;; |
88 |
*) # not an autoconf script, so cant use econf |
89 |
./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die |
90 |
emake || die |
91 |
;; |
92 |
esac |
93 |
} |
94 |
|
95 |
src_install() { |
96 |
emake install DESTDIR="${D}" LDCONFIG=: || die |
97 |
dodoc FAQ README ChangeLog doc/*.txt |
98 |
|
99 |
case ${CHOST} in |
100 |
*-mingw*|mingw*) |
101 |
dobin zlib1.dll || die |
102 |
dolib libz.dll.a || die |
103 |
;; |
104 |
*) gen_usr_ldscript -a z ;; |
105 |
esac |
106 |
} |