bump(sys-libs/zlib): sync with upstream

Latest openssl ebuilds depend on new multilib style zlib ebuilds.
2025-08-18 21:11:08 +02:00 · 2014-06-05 12:27:32 -07:00 · 2014-06-05 12:27:32 -07:00 · d26d134365
commit d26d134365
parent afd9b06010
12 changed files with 313 additions and 29 deletions
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/ChangeLog
@ -1,6 +1,59 @@
 # ChangeLog for sys-libs/zlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.120 2012/09/30 17:26:34 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.136 2014/01/17 04:23:20 vapier Exp $
+
+  17 Jan 2014; Mike Frysinger <vapier@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Add arm64 keywords.
+
+  16 Jan 2014; Mike Frysinger <vapier@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Mark m68k/s390/sh stable.
+
+  27 Dec 2013; Akinori Hattori <hattya@gentoo.org> zlib-1.2.8-r1.ebuild:
+  ia64 stable wrt bug #488916
+
+  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for sparc, wrt bug #488916
+
+  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for ppc, wrt bug #488916
+
+  22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for ppc64, wrt bug #488916
+
+  21 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable on arm, wrt bug #488916
+
+  03 Nov 2013; Matt Turner <mattst88@gentoo.org> zlib-1.2.8-r1.ebuild:
+  alpha stable, bug 488916.
+
+  01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for x86, wrt bug #488916
+
+  01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for amd64, wrt bug #488916
+
+  25 Oct 2013; Jeroen Roovers <jer@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Stable for HPPA (bug #488916).
+
+  28 Jul 2013; Alexis Ballier <aballier@gentoo.org> zlib-1.2.8-r1.ebuild:
+  Fix blocker on emul-libs
+
+*zlib-1.2.8-r1 (23 Jun 2013)
+
+  23 Jun 2013; Pacho Ramos <pacho@gentoo.org> +zlib-1.2.8-r1.ebuild:
+  Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier
+  for their help)
+
+  17 Jun 2013; Mike Frysinger <vapier@gentoo.org> zlib-1.2.8.ebuild:
+  Fix transposed emake #473370 by Michał Górny.
+
+  05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
+  Add upstream CPE tag (security info) from ChromiumOS.
+
+*zlib-1.2.8 (04 May 2013)
+
+  04 May 2013; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.8.ebuild:
+  Version bump #468014 by Samuli Suominen.

  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> zlib-1.2.7.ebuild:
  ia64/m68k/s390/sh/sparc stable wrt #435754
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest
@ -21,19 +21,32 @@ DIST zlib-1.2.5.1.tar.gz 548499 SHA256 c1f24a64f808528293cf04ba09a2dffbc3dd65ad7
 DIST zlib-1.2.5.tar.bz2 486374 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307 SHA512 88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede WHIRLPOOL d660761c4f437dd6c20e5cd23e442672c77264e6dc639bbf749d253c2fffd6b9fd32a9a9df7f5e9c3ec791afebbf486b8a4d6e8bac35cd2d2371dba759bb83a7
 DIST zlib-1.2.6.tar.gz 557220 SHA256 21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b SHA512 f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9 WHIRLPOOL 9655627d9770b6850d33b18ef7dc349396454fc217b90d3f7c2ffdac028533ff741c3a70ee4280ef91baf67425d037e6559dcea1da4c568ca51df8e9b7ab6df3
 DIST zlib-1.2.7.tar.gz 560351 SHA256 fa9c9c8638efb8cb8ef5e4dd5453e455751e1c530b1595eed466e1be9b7e26c5 SHA512 b1c073ad26684e354f7c522c14655840592e03872bc0a94690f89cae2ff88f146fce1dad252ff27a889dac4a32ff9f8ab63ba940671f9da89e9ba3e19f1bf58d WHIRLPOOL 2f0bc05a9c14033adc33cdd14d1dce72a57c650304692141a89af26274b62ffa67d09afbc68562d07279f80e214e396b357f20094ecf4b9576bc200cafa01a6d
-EBUILD zlib-1.2.3-r1.ebuild 2108 SHA256 1826babce8086b210791956f9a698909e5aea6ad695d18a15d5fbb774e058552 SHA512 8dec9aa46412a5263ebb39fbef01f47a644acb3723475a5b6d95d2a3fe1912a53d6f474be3f1ad649fddea20ed62891e127016f2f42b288f3dd6d86f32e5665d WHIRLPOOL ddab54ffd708ea37c854906878357de807a552e5749f720a98632616e2d7538a1ab4bc03248f35868c9d645cb9773329bcc6b67c60750c25ba1660f8a1a2527a
-EBUILD zlib-1.2.5-r2.ebuild 1985 SHA256 0a99b2f2b02be7316b92390f0b7d2f3654b9e9e4cad2616f96a6c304ea3ac598 SHA512 38fdd87cbc8479b6f3077702e8471afe974e1cd3e69d4007117502296ecf4c23d7e003b60ef8e7cdb0c383f18202c33e2d1b9f99d880d3c173136df319c5eda8 WHIRLPOOL 2be4bf54c5afd28cbdf125b7126a4cf2b6fccd8747f9b901c101df6990dff2a3629b76f6e69bf029b7bfae93a0efe949cb6e16af7ae9ed4a6425cc56952a6257
-EBUILD zlib-1.2.5.1-r1.ebuild 2121 SHA256 e24f97b53c93de1797c48dd4a24d55277a22cec362c63ff40f300f74283629e3 SHA512 c7c734830a6b27027fc609cf880aa45a959011967ad9184cf246c83eff71650d70b7dc27d26595f365e9215d3266de05460929e8d4c1b36c4beb50746661154b WHIRLPOOL 23737051c323e6f2d5b26fba07d7af0d741d397bb45dda452275e54be1743fe709e6aa864349695f8a72d15c3e9e248797c88a568b3116c67adc44b09ce63a1a
-EBUILD zlib-1.2.5.1-r2.ebuild 2764 SHA256 3a517532b8ffab90c5889f092ec81622921fd39d4779a5eec8326ecb72d8850d SHA512 5920357a4e392ce4c2d36eeb1acf27c245bf11c343f1ce4a699dcde15e4d39431a8c0ff7ad3fbf31ab5d1a1daa1ef207319beaf8b2f1c0546c0f44c200480cbf WHIRLPOOL 437d86ac4625d42f1d9dfc56ba3b47a305db97e1017ce2e0169e9b86c9e45584e11a9d7a517432bfb3d5bbcdb32af837f300505b1b943a0d1376b1bc1a609f70
-EBUILD zlib-1.2.5.1.ebuild 1969 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280 SHA512 31f2ae0ac6f686d1757bc210a415b87efb0c57c44bbf72eb49b9c935834647da2e7509817e793a0d9bbb43571aec774f809a3a84023f077cc3783c7e3bd48cb3 WHIRLPOOL 8c1dd1314d08f53a5d55ceb67091b292a13da1098880a523b6bf6ec58f39b9769993ee4f088708f8ea20b37af00f737bf43cdb52af94f293c02722b0dbc3af34
-EBUILD zlib-1.2.6.ebuild 2375 SHA256 678becca220a7c23d0f498cc148e9a8af05ac8384a46578edf7a2b907bd837e9 SHA512 70a43d0fd98d2c01fda8ba13e5e692974315ebf25d3fc0c2884825e1b9154c933321adbb5f885a341abb55e7bfb957ec7fc480535b4a0782f3a905e9e9777632 WHIRLPOOL 5b0358c090442efbd4cdbd484982dfae91c41bddd5efc64c69e41f5f70dfd45f5ea88984687223fbb19374819201a261867bd8d10bffedf84604560de8f5a1b4
-EBUILD zlib-1.2.7.ebuild 2513 SHA256 615603bf2fc1986299cb7e2c0ed6a57ccfea187b3a6c4045e2912a8e4bfd3bbd SHA512 33f2ff84681c0e9a1def41bf32982fe6bcb8cff507c4c66a88624fdc7c3e2753cb449d3d38df08192473992f081329d2bbf3da49b15db4af502f7cf02ac49bf2 WHIRLPOOL 316a3c582670f13a7bf37cf9d6546055de4c9536a6d91d64aeb4dc719fe70d37363ab2178183743486cc28b9280316b7bfa67f026e1cfbc45687b42efaa46bdb
-MISC ChangeLog 16709 SHA256 3d717afa73dd4325f5bf8c932c42ed1cc390cc88b290bb433f4461b761b0d26c SHA512 4dfcc6286783277e196ac6373efab79d3ae49c91252f7092c56a13cc52bbc52f66fa24b8fc48d53317af48c22e39d07e3ef84ba590b16c1941108b0280fc45a6 WHIRLPOOL e64ee3a7e25792303ec1562ef857754c341ad4ad809620d0b88ed319ea8e28b4b77706339a72f6740fae76876296924b7af7bbdaa81306eadb8c6ec57bb10c72
-MISC metadata.xml 273 SHA256 bb3ecfbae6d5e5ed47a494e99378545b9e66a0bdbced6f1d5120155f9e068a5d SHA512 85f1ea1bbbab6fa8a5250fa44faac577ed11a8dd910a7e3cd3a6ce030dd672d8a7f04a0bdf96a4f3ed18d94b77539ec6f93df35d5fdd26a2ee2976558f2663b8 WHIRLPOOL 6cc771cc416419b1a589412eee34e1864aaed3e750ee14493783c1f723165f1929ce0cfff125ac41bde2dfb6eee131979785979dd3660ba515b803621e358e39
+DIST zlib-1.2.8.tar.gz 571091 SHA256 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d SHA512 ece209d4c7ec0cb58ede791444dc754e0d10811cbbdebe3df61c0fd9f9f9867c1c3ccd5f1827f847c005e24eef34fb5bf87b5d3f894d75da04f1797538290e4a WHIRLPOOL bcb6243f1a9370eafcea03c227938da1cc106c934193ce59ef4fbdca0167777b95c9baa376feb6d8d369023024a74de5df17c2b6ec5887cdb732ffc95808ef95
+EBUILD zlib-1.2.3-r1.ebuild 2119 SHA256 29ce018a4109188b1fbf5617282f5f002b73ddc7d4e835a324ebfe5db070a200 SHA512 585493a84004b9481a195b554a47aaf5b2030ea772866ea325f8a8028b9c6ce3cf5146a504081be978a65d5044c9efd0c57dd8c2b277e6fa995b91bf1d5bde8e WHIRLPOOL 6ce69b357f8c0c7092aa91dbe17998cd60abbe781cdde244db99d805741ac5a1a63c8c7ea61934ded39953a8d4b84cc981e522e4a0f86fba81577d3a1658b6a4
+EBUILD zlib-1.2.5-r2.ebuild 1990 SHA256 75e0db1dc2ac78f6e629f5cda4635028fe5e33e7e6e4f1db8a68b9bcb49acbe9 SHA512 c979c655c809e5257c32e1d173bffc097a7f1617afa8f5784e2c28c6c0fa8a96bd700ae0032a8d6e3c236a9cd7e543ba183d3b5c33a151a0477a5d81a3ec12de WHIRLPOOL 1cf6c96b11ad30f38c94a9a4128534e8d913c217894aad430c1c121190b804e3725ef65f5c41df8a777ba64c64f3bc659d9ca7bd96e577f373af0b5bd89f58a5
+EBUILD zlib-1.2.5.1-r1.ebuild 2129 SHA256 160412b0a5e50f827077a6396a8834b1225670b893d8f937e049e88880c96966 SHA512 7dffeb5b73d5a4281a7c4982d1ce2086e02cc17a957228f4cb26d37dc5b6a39377ecc6ca654956c02e00c7b741cdb2b9bbf2bb071e790a93f2b567f6e9925d4d WHIRLPOOL f557df9d9b49faa8ee23ea81beb047b7a27c4d7f694fe733c1344b16d3430361a0dd38c1f59252447040aef2084024ca4c8658a08a0918fe9b570ae2699cca63
+EBUILD zlib-1.2.5.1-r2.ebuild 2772 SHA256 7d976dd0132e208d8127d600fa6d6ce33cf419873d13aec81dc49012833b8fd8 SHA512 b061c41e9ec9f976b9cea133d5c446b8304cfab6dd5e2e4db05a5245e7b883228ae500d4d2944192ec0b7e2f443fd62628394d19fe1ede58d2bd3089d1120a94 WHIRLPOOL 3645665e940fd54b3a8ff5a71505800b73bdb91de325ffe63a1685f5a1714cc68c190ba57609e7e902695f926cfc6f8d75ce3904de5d4c39855037f82238e279
+EBUILD zlib-1.2.5.1.ebuild 1978 SHA256 daf91a9db719d6db404df3423b5c16e30e15bde7cb639ba4f4bdd5f595348bfd SHA512 1d6e0a1baff507bd9690daf9bea1eddb5c94faaeb710501fe686822a6c1f1dbfe9aece9d6350fde38ac8711ae17ded17b544448a5d28724b2158a7c8426ba065 WHIRLPOOL 0317a2841967a3c42ec9d2c9fb29059ae6aab7dd13cbb2d042932845eee02a86ce02fdfab185618bd60624249ff3cdf6b9b435ae619a6166b31938949ed53644
+EBUILD zlib-1.2.6.ebuild 2384 SHA256 0a549e860c658f2eac688b4d956d101c10f85525626128a5bf9e826b9f220e49 SHA512 1310a3935d0fe11db4601ee61b3a14121e446036042b971e3a61305c68560f507d9dafa9799faaa9d5d6d4c7e4f8163df19fe6cb682e9feb13500f1e2cf22f21 WHIRLPOOL 0eb9c2e14fb33355cf717a93b8e25828524a3add9e8e068a6f47e2294e9ba9dac36a900387d851deebaaf22c820046eba83e255b380c65d33a5d603ae3f19df0
+EBUILD zlib-1.2.7.ebuild 2521 SHA256 1d47bd9bd6bd7c1ef09ec4183032289c98c95bfc14bb2bc0c28336c333e627ca SHA512 7c19f08ee61380da9e9115a133d68b63f3ddd18f60c7c73fcf9824139e0f57ff488606e73dc9abe7defc333b0fb54d20ec955c3234d8ebebdeecd90e3d1d6c4d WHIRLPOOL 1b37518ac0f9dd653c6d574b945e1224175e9ff5a873905f40b2a2a77d68d5a2b411d6262298d0b77bbe4c7f76521be3bbba8ca407d1b509bc846692f2b67bc7
+EBUILD zlib-1.2.8-r1.ebuild 2898 SHA256 2d4fa5d4f3b02d8fa87b815b3544f1632795b4e8a45d934834c4a32a3c1e873d SHA512 c9742da81393f64741f89527c613d2addaf80c0e78bb399fae09031ef4c6843da34e4ace5aeda25eaec864d720442dfb93942a03b7f9bbf7afffb789b296df59 WHIRLPOOL e92a0243cd612cba9704029ab777775af24c1381e388bac25cf0c6696352374fda5c9fcabc588ac30ccfa08f9a1e5004e128655011599ee50689da6b75ade02d
+EBUILD zlib-1.2.8.ebuild 2532 SHA256 103f8c24f7900e89f0e158b42449388c3b636a66867050bfb4f295448dcbb5bc SHA512 0e80382820823a7f150346f4d595ab2a5788e05f9e384dbc326d5dd53c7dd457fdb5491183735aa2dfa2aa64e0b6d21069f764f181d6b78beb708973ecd4037a WHIRLPOOL 2ed794a3b3051576f15e27c79baa8764936da8743ae6a8baa1c2847b05b81f49afd40fd858c5f9b250251aaf8e342d2be24f8d176371e1c89efdb9b60534081b
+MISC ChangeLog 18533 SHA256 4d97faf5b6f64cd59bdf027d8150044cb9e37e48c14a2aa3d1ffadd8f6b2ba9e SHA512 8274af7f6e2931f659e8cf895b423233f8be84d18b769573374b400cffdbaf95b3ff2393e062dfbe5824b28bea687d70d0710a4a295c9f1f4da189d044526f8c WHIRLPOOL e5fc8260f89cd61ff45e45bac801e53972155c84a9f0ef3fde517d69f0aadcc3f779efa34e758123f3632f90425ab0749dbb110cd91f7af258beb81d8213cc4c
+MISC metadata.xml 350 SHA256 4eb380d7bf14e79af8acffb3db2d71aeebf9f8859b60df89d068e455246aaae3 SHA512 4d9c036be5cfbb5ddb92df7dd64f41721baf96d1433429d3630f02454599278102d04d174d982c57fb84e6df00ebf6844ec562b24aaf3cb97538bf0b1eb9b4e2 WHIRLPOOL ea8c9d20dc5d46b0717994c8adf894c673bcaf898bbb532dd3c940c3de60e2a0cb7b26cb7c524c12b5befbb02a94bdf36669a87c2a06cce7bad6e0150ec787fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)

-iEYEAREIAAYFAlBogNAACgkQuQc30/atMkAg2ACgh4hYEKrLb+vTBT8ClNdq8BxY
-zcUAn3gkEfFAj5X8CbFIghzdYFiFKqJX
-=Vrew
+iQIcBAEBCAAGBQJS2LBAAAoJEPGu1DbS6WIAi0EP/2PlMQWDUQH0w548HlOzAYbB
+f/x/km75V8XUajB1C70APb+7MiL9MW8IAK138ZEr4H2CRDIBtKbF3aW3BFC2fLk/
+uYLKJUJezkEC+nwqJvJyWs7H1133Tjngg3UXZklIof6N4AhfJvdbk1BOSKwVfN76
+E0y8ijwM9I1+nFvWAMnJsvTuDMTHzGMdQ2ejqJ2cFS4KuOyWBu/MoyKIQVp1jYVO
+QFAakurkJZwlvaup3jkNvc8AZwlJIyRSFMfe07gMxP2rIqk656fDQUqwFiyLyLwR
+E92Ci0HVxa03ZwYnkA5cCuioqWJZulz6RvjXO579Ti6W4ddbpqrFYUkjna9ijt1K
+cdRQcQu12xIz1MFxPCGE1bOcZjs+LWKbh9Sp1JgSJsBAM6TtOpQQdbKeQ083Wz+F
+A9+FGEfoCGA8K6prjk5FrPoHgBqCbNjyzHWsFwfc05Pmq/RJ55bre0u/baQYJPyH
+XTW00ilo+sCl0RNl4aUZSQVaTl6MHeX6Rg+YllD9VY4NbB8Ee2eyCv1ZYnl7cCGj
+yxkiGaLfKU7lz4xQ7kNs7ySFELKVRrgocC2b/O8/isljeObQI2YTc8ezLPgHocC6
+VPgRoiGuOfI89A89Hn7RlFrrOu1ENrisIdGFH8PdTGWrjystE1u3EiQGWkMNXUaz
+00QgDUKo5XiVBJteW0Dm
+=0Icj
 -----END PGP SIGNATURE-----
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/metadata.xml
@ -5,4 +5,7 @@
 	<use>
 		<flag name="minizip">include the minizip library for quick and dirty zip extraction</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:zlib</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.3-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.3-r1.ebuild
@ -1,8 +1,8 @@
 # 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.3-r1.ebuild,v 1.15 2011/02/06 21:36:45 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3-r1.ebuild,v 1.16 2013/03/03 09:18:24 vapier Exp $

-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5-r2.ebuild
@ -1,8 +1,8 @@
 # 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-r2.ebuild,v 1.12 2011/05/01 09:52:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.13 2013/03/03 09:18:24 vapier Exp $

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.3 2012/07/08 16:38:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r1.ebuild,v 1.4 2013/03/03 09:18:24 vapier Exp $

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.11 2012/07/08 16:38:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild,v 1.12 2013/03/03 09:18:24 vapier Exp $

-inherit autotools eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.5.1.ebuild
@ -1,8 +1,8 @@
 # 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.ebuild,v 1.1 2011/09/11 18:49:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1.ebuild,v 1.2 2013/03/03 09:18:24 vapier Exp $

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.6.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.6.ebuild,v 1.4 2012/05/03 19:08:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.6.ebuild,v 1.5 2013/03/03 09:18:24 vapier Exp $

 AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.7.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.7.ebuild,v 1.12 2012/09/30 17:26:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.7.ebuild,v 1.13 2013/03/03 09:18:24 vapier Exp $

 AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs multilib

 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.8-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.8-r1.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.13 2014/01/17 04:23:20 vapier Exp $
+
+EAPI=4
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.zlib.net/"
+SRC_URI="http://zlib.net/${P}.tar.gz
+	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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="minizip static-libs"
+
+DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!<dev-libs/libxml2-2.7.7" #309623
+
+src_prepare() {
+	if use minizip ; then
+		cd contrib/minizip || die
+		eautoreconf
+	fi
+
+	multilib_copy_sources
+}
+
+echoit() { echo "$@"; "$@"; }
+
+multilib_src_configure() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		;;
+	*)      # not an autoconf script, so can't use econf
+		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
+		echoit ./configure \
+			--shared \
+			--prefix="${EPREFIX}/usr" \
+			--libdir="${EPREFIX}/usr/$(get_libdir)" \
+			${uname:+--uname=${uname}} \
+			|| die
+		;;
+	esac
+
+	if use minizip ; then
+		cd contrib/minizip || die
+		econf $(use_enable static-libs static)
+	fi
+}
+
+multilib_src_compile() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
+		sed \
+			-e 's|@prefix@|${EPREFIX}/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
+		;;
+	*)
+		emake
+		;;
+	esac
+	use minizip && emake -C contrib/minizip
+}
+
+sed_macros() {
+	# 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' "$@" || die
+}
+
+multilib_src_install() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc install \
+			BINARY_PATH="${ED}/usr/bin" \
+			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
+			INCLUDE_PATH="${ED}/usr/include" \
+			SHARED_MODE=1
+		insinto /usr/share/pkgconfig
+		doins zlib.pc
+		;;
+
+	*)
+		emake install DESTDIR="${D}" LDCONFIG=:
+		gen_usr_ldscript -a z
+		;;
+	esac
+	sed_macros "${ED}"/usr/include/*.h
+
+	if use minizip ; then
+		emake -C contrib/minizip install DESTDIR="${D}"
+		sed_macros "${ED}"/usr/include/minizip/*.h
+	fi
+
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
+}
+
+multilib_src_install_all() {
+	dodoc FAQ README ChangeLog doc/*.txt
+	use minizip && dodoc contrib/minizip/*.txt
+}
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.8.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8.ebuild,v 1.2 2013/06/17 02:33:13 vapier Exp $
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools toolchain-funcs multilib
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.zlib.net/"
+SRC_URI="http://zlib.net/${P}.tar.gz
+	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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="minizip static-libs"
+
+DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use minizip ; then
+		cd contrib/minizip
+		eautoreconf
+	fi
+}
+
+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
+		local uname=$(/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
+		echoit ./configure \
+			--shared \
+			--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			${uname:+--uname=${uname}} \
+			|| die
+		emake || die
+		;;
+	esac
+	if use minizip ; then
+		cd contrib/minizip
+		econf $(use_enable static-libs static)
+		emake || die
+	fi
+}
+
+sed_macros() {
+	# 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' "$@" || die
+}
+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
+	sed_macros "${D}"/usr/include/*.h
+
+	dodoc FAQ README ChangeLog doc/*.txt
+
+	if use minizip ; then
+		cd contrib/minizip
+		emake install DESTDIR="${D}" || die
+		sed_macros "${D}"/usr/include/minizip/*.h
+		dodoc *.txt
+	fi
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
+}