Rename OF/ON defines in exported header to avoid collisions with other packages #383179 by Ben Longbons.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

3 files changed, 88 insertions, 5 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 069eab35b663..eb1c72932801 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.93 2011/09/11 18:49:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.94 2011/09/16 21:40:42 vapier Exp $
+
+*zlib-1.2.5.1-r1 (16 Sep 2011)
+
+  16 Sep 2011; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.5.1-r1.ebuild:
+  Rename OF/ON defines in exported header to avoid collisions with other
+  packages #383179 by Ben Longbons.
 
 *zlib-1.2.5.1 (11 Sep 2011)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9e5f5a76651d..ad25d00f2de0 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -20,13 +20,14 @@ DIST zlib-1.2.5.1.tar.gz 548499 RMD160 9f7d449167427c8add0b61a76a51bee164856592
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
 EBUILD zlib-1.2.3-r1.ebuild 2108 RMD160 86035d0567fbd74c1e4f066a8650a235824527c1 SHA1 f329bb4098c9b4d526bed79ef2d3932d178004e7 SHA256 1826babce8086b210791956f9a698909e5aea6ad695d18a15d5fbb774e058552
 EBUILD zlib-1.2.5-r2.ebuild 1985 RMD160 51991cece3b068936d37ba832d51813536888d13 SHA1 785858d4dee04e3ac110f6bdfc29e2dc76276683 SHA256 0a99b2f2b02be7316b92390f0b7d2f3654b9e9e4cad2616f96a6c304ea3ac598
+EBUILD zlib-1.2.5.1-r1.ebuild 2120 RMD160 f8eb787ce206bafafae3cba50f4982b4beea60e4 SHA1 3cb35b8e30ea41fdf6029274862ace3922f3ff14 SHA256 d4211f602ec3fb4f7f18655af3a49b22bd7e247b551328f35fd599cb2223f56c
 EBUILD zlib-1.2.5.1.ebuild 1969 RMD160 fd7596c2f8d93859ae68329622b93b3c2cb3eca6 SHA1 4fb8715b7b760e8e8bd8d7558f2c61791dc1bf38 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280
-MISC ChangeLog 13285 RMD160 7f53e3648177a799749a5e4b42efaebce23ae2a9 SHA1 6e1d09c0623f0772e35697d0dde45f511149388c SHA256 7e7854e5d9a9a8301c043d90fb1177295f2c81f2f41adb035fb6427336acf93b
+MISC ChangeLog 13502 RMD160 f5ae7a198b422e26642039210d5477e8181173b6 SHA1 bd45967f51627a7a523a0b890073200aef5d3a3e SHA256 af58db7d7039c03b910ba4568295afd2e97ee2a262d49b0179ac4c68738895fe
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5tA0cACgkQaC/OocHi7JahaQD/cgjr6TGrFNsfvgDOhIBaDRnG
-FoC/MvbRD4kdPrv4SMgA/0nhl5xEIs5I2Cp2rZEZ3AHJtHGPXE2i2EU+OFLr7CBV
-=l0Od
+iF4EAREIAAYFAk5zwmEACgkQaC/OocHi7JY7wgD8DutbmDZePkm2GZEeqfoIo0T4
+l8rhU0fC28L5FFGXrW4A/3IoRp2/9LtFXbdYBhhDw94n8frlmEJIx6kPDRQQI0Tm
+=/Ghc
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild b/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild
new file mode 100644
index 000000000000..d55325d0f433
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 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.1-r1.ebuild,v 1.1 2011/09/16 21:40:42 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.zlib.net/"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.gz
+	http://www.zlib.net/current/beta/${P}.tar.gz"
+
+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}"
+	# 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
+
+	epatch "${FILESDIR}"/${P}-version.patch
+	epatch "${FILESDIR}"/${P}-symlinks.patch
+}
+
+echoit() { echo "$@"; "$@"; }
+src_compile() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
+		sed \
+			-e 's|@prefix@|/usr|g' \
+			-e 's|@exec_prefix@|${prefix}|g' \
+			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
+			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
+			-e 's|@includedir@|${prefix}/include|g' \
+			-e 's|@VERSION@|'${PV}'|g' \
+			zlib.pc.in > zlib.pc || die
+		;;
+	*)	# not an autoconf script, so can't use econf
+		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
+		emake || die
+		;;
+	esac
+}
+
+src_install() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc install \
+			BINARY_PATH="${D}/usr/bin" \
+			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
+			INCLUDE_PATH="${D}/usr/include" \
+			SHARED_MODE=1 \
+			|| die
+		insinto /usr/share/pkgconfig
+		doins zlib.pc || die
+		;;
+
+	*)
+		emake install DESTDIR="${D}" LDCONFIG=: || die
+		gen_usr_ldscript -a z
+		;;
+	esac
+
+	# clean up namespace a little #383179
+	# we do it here so we only have to tweak 2 files
+	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "${D}"/usr/include/*.h
+
+	dodoc FAQ README ChangeLog doc/*.txt
+}