[gentoo-commits] gentoo-x86 commit in sys-libs/zlib: zlib-1.2.5-r2.ebuild ChangeLog zlib-1.2.5-r1.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/04/29 17:49:03

  Modified:             ChangeLog
  Added:                zlib-1.2.5-r2.ebuild
  Removed:              zlib-1.2.5-r1.ebuild
  Log:
  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.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.80                 sys-libs/zlib/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/ChangeLog?r1=1.79&r2=1.80

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	25 Apr 2010 22:41:11 -0000	1.79
+++ ChangeLog	29 Apr 2010 17:49:03 -0000	1.80
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.79 2010/04/25 22:41:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.80 2010/04/29 17:49:03 flameeyes Exp $
+
+*zlib-1.2.5-r2 (29 Apr 2010)
+
+  29 Apr 2010; Diego E. Pettenò <flameeyes@g.o>
+  -zlib-1.2.5-r1.ebuild, +zlib-1.2.5-r2.ebuild,
+  files/zlib-1.2.5-lfs-decls.patch:
+  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.
 
 *zlib-1.2.5-r1 (25 Apr 2010)
 



1.1                  sys-libs/zlib/zlib-1.2.5-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild?rev=1.1&view=markup
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

Index: zlib-1.2.5-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $

inherit eutils toolchain-funcs

DESCRIPTION="Standard (de)compression library"
HOMEPAGE="http://www.zlib.net/"
SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
	http://www.zlib.net/${P}.tar.bz2"

LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""

RDEPEND="!<dev-libs/libxml2-2.7.7" #309623

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
	# trust exit status of the compiler rather than stderr #55434
	# -if test "`(...) 2>&1`" = ""; then
	# +if (...) 2>/dev/null; then
	sed -i 's|\<test "`\([^"]*\) 2>&1`" = ""|\1 2>/dev/null|' configure || die

	# bug #316377
	epatch "${FILESDIR}"/${P}-lfs-decls.patch
}

src_compile() {
	case ${CHOST} in
	*-mingw*|mingw*)
		emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die
		;;
	*)	# not an autoconf script, so cant use econf
		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
		emake || die
		;;
	esac
}

src_install() {
	emake install DESTDIR="${D}" LDCONFIG=: || die
	dodoc FAQ README ChangeLog doc/*.txt

	case ${CHOST} in
	*-mingw*|mingw*)
		dobin zlib1.dll || die
		dolib libz.dll.a || die
		;;
	*) gen_usr_ldscript -a z ;;
	esac
}