Update by Alon Bar-Lev for mingw support #310307 by Nathan Phillip Brink.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 35 insertions, 36 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 9a55405b49de..6ee43ebdb9d5 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,9 @@
 # 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.82 2010/07/07 21:24:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.83 2010/07/08 04:28:06 vapier Exp $
+
+  08 Jul 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5-r2.ebuild:
+  Update by Alon Bar-Lev for mingw support #310307 by Nathan Phillip Brink.
 
   07 Jul 2010; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5-r2.ebuild,
   files/zlib-1.2.5-fbsd_chosts.patch, +files/zlib-1.2.5-ldflags.patch,
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index f4c59a393d3f..a69163d0264e 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-- - -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX zlib-1.2.1-build-fPIC.patch 2211 RMD160 c0283f640411a8a2c64073ea1833642cafff6fc9 SHA1 496fc5ad5341d81239a4e7b9d203aecbbaac0114 SHA256 c02fce932ea57fc417a51f5f0676abdcecc890e67a3c3cda510c0c151e2be88b
 AUX zlib-1.2.1-configure.patch 3149 RMD160 45a6e8fd83be0488bdf59f8965d394fc3be84246 SHA1 9c9165bbf4a009fb1629601da262e0497050b0c2 SHA256 ca0d5f7e50a90e6cafa554c85a9b19a8e2cbbb8c8f1de47fdd257ebfac4595aa
 AUX zlib-1.2.1-fPIC.patch 606 RMD160 eb8e4fbedada15a325b17e880d2757060d541ab4 SHA1 52f27eb898656bd47dc369328156a6f14e15e9af SHA256 ee63a55b3bed9422f03add48002310d8074527bf5ce5a70a69022ea77a23d8d6
@@ -22,27 +16,13 @@ AUX zlib-1.2.5-lfs-decls.patch 519 RMD160 2b9eee4022f6344c1bc61a4e2065651085979f
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde
-EBUILD zlib-1.2.5-r2.ebuild 1574 RMD160 f39e4ad227a53e6516e4b91a4a65bc0360520b37 SHA1 2777ade0707100e88bb45a1ceaa0fae5e94913a0 SHA256 95c1e3f3c3c0c2d3c59e1a3dfad251721184ca1d1461b4440ca55af45dd79631
-MISC ChangeLog 12023 RMD160 019d5b4b54a56d217f7d8ebc8090ecd2f88cfb55 SHA1 5ca051b6d995f2e7bc1282d60ba6ead51756f14e SHA256 b8dc56b83ccabb104a6f1bf450b61ee94568a70b04983d733997f435224e1020
+EBUILD zlib-1.2.5-r2.ebuild 1992 RMD160 0c1df29e03d4d8b2f10b5619f7376bd392bfac69 SHA1 3e0f941a88105ca1da83f0eb0f59757f93d1bc1e SHA256 45a8eaa046cefb53abce962d309746441e33c8030a9d1ccbb6201ed155a0f265
+MISC ChangeLog 12172 RMD160 1b0ddba10996ae2e3791e4e477fa9185bc0d3b56 SHA1 49d722f9f94fbbce8d1f362c203f8d8660a939c4 SHA256 44f4b90e50001a70b489fb45faa4386783578e08fbf077b6c5ce39ddabc9afc0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-- - -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkw08BoACgkQTwhj9JtAlp4nNQD+OconP2xCRxW/LXMTsjblAZ7e
-4lsezXclQmjKZXeSqugBAKA7fJDAxAckWd/CP61S65KEZYy6cX4d73A5FnVFh5hU
-=Rbqo
-- - -----END PGP SIGNATURE-----
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkw0+DUACgkQTwhj9JtAlp7MxgD/SuuOoq5RC55Vashb8LjGwmeM
-f2QRw/zCOUEdiEq8Ux4BAK787yatu05wnHGJnkRaz0LG16Z7YHqmCsOERCitUPp1
-=wUPU
-- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkw0+LoACgkQTwhj9JtAlp5qdgD/fTEY0dRLhCo61SAd2ofOXVZ6
-4RwUZsrhHb6PRjHxXecBAMZdU+gNY6nIOftVLC8zb+IK9Ym8Cbu03DzjMpcSv2Sg
-=up1p
+iF4EAREIAAYFAkw1U28ACgkQTwhj9JtAlp5iUQEAgJsyL57a0Yo1JdSMIkoVLrmW
+aa2z9wgniLRn+jv5/LMBALExKqbhVA/rx6G6wRyW7/ZIPHYf1jPoUN5lOJKAo0uz
+=VVPh
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.5-r2.ebuild b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
index 467396873b1e..1c0674677b87 100644
--- a/sys-libs/zlib/zlib-1.2.5-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2010/07/07 21:24:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.4 2010/07/08 04:28:06 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,7 +19,6 @@ 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
@@ -33,9 +32,17 @@ src_unpack() {
 src_compile() {
 	case ${CHOST} in
 	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die
+		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 cant use econf
+	*)	# not an autoconf script, so can't use econf
 		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
 		emake || die
 		;;
@@ -43,14 +50,23 @@ src_compile() {
 }
 
 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
+		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
 		;;
-	*) gen_usr_ldscript -a z ;;
 	esac
+
+	dodoc FAQ README ChangeLog doc/*.txt
 }