Fix bug #371889 by flameeyes caused by bad system-zlib patch.

Package-Manager: portage-2.2.0_alpha37-r1/cvs/Linux x86_64

4 files changed, 33 insertions, 21 deletions

diff --git a/net-irc/ultimate/ChangeLog b/net-irc/ultimate/ChangeLog
index 6e7746b61e98..7d2f47f052b8 100644
--- a/net-irc/ultimate/ChangeLog
+++ b/net-irc/ultimate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/ultimate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.21 2011/05/04 21:04:09 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.22 2011/06/16 13:06:44 binki Exp $
+
+*ultimate-3.0.2-r2 (16 Jun 2011)
+
+  16 Jun 2011; Nathan Phillip Brink <binki@gentoo.org>
+  -ultimate-3.0.2-r1.ebuild, +ultimate-3.0.2-r2.ebuild,
+  -files/ultimate-3.0.2-system-zlib.patch,
+  +files/ultimate-3.0.2-system-zlib-r1.patch:
+  Fix bug #371889 by flameeyes caused by bad system-zlib patch.
 
   04 May 2011; Nathan Phillip Brink (binki) <binki@gentoo.org> metadata.xml:
   Take ownership of this package now that I don't need to proxy it.
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
index bced01b1366c..04bacdaad5f9 100644
--- a/net-irc/ultimate/Manifest
+++ b/net-irc/ultimate/Manifest
@@ -7,31 +7,31 @@ AUX ultimate-3.0.2-config.patch.in 1390 RMD160 7e01b69519400773398eed100ac1271f3
 AUX ultimate-3.0.2-entropy-path.patch 1578 RMD160 f6f1ea495acd4fa610c7c2bf76b761e7f68a24fb SHA1 d38d8996399f33577e4a12e41415402fddc33f45 SHA256 41fc97b9817108f2288bd304a7c2e84707b68efe45c484c32f23892334f2fedc
 AUX ultimate-3.0.2-make-failfast.patch 1693 RMD160 c550992da24cb0ab0bec41a91297a65f7d219d6d SHA1 a4ca21db5fe922768ef6d7c9cfef3a40aa31b512 SHA256 e07dab5efc3ea3ca5af4930775e96599ea1de660006d4d300b358f7b00a7c999
 AUX ultimate-3.0.2-open-mode.patch 2758 RMD160 77b27d505a6824a77fe6fde8978606057ed94505 SHA1 b4bdb08e43b4f981e371d32112944f9f25f5195f SHA256 b31addc28d05c925ca34dd314435d3482a8b27a9be6300d1112bb592bdae638a
-AUX ultimate-3.0.2-system-zlib.patch 1440 RMD160 f0f0979115ca1f730801427814be7b7e60775ee6 SHA1 d800dbe83af12cfb3ee63e33806830f7fcaa95c8 SHA256 89298699e9a206685fe995cc33e3515adca6a272008a17a776122e55c5290cd1
+AUX ultimate-3.0.2-system-zlib-r1.patch 1640 RMD160 81f436870d5e288e40faaa61077ce097ff217d1c SHA1 f72ab21822a262d2709a85ce8518d12593b3670b SHA256 305c10668d64fd856ed989ee8f03376dd20c9670df0e74a2c88b0bdf36c374c8
 AUX ultimateircd.conf 283 RMD160 7d000eebcb5e94d0156b82d815c72d3e131b07d5 SHA1 33d659d3072919b6ad31433bf54306152a44f2d1 SHA256 0d9dd80d278173855854a367f53f8afa8874d4bb2a57902e93f3b3eea755bf69
 AUX ultimateircd.conf.2 291 RMD160 cda84c8b6cf72775cb4b33e359b98d3d6f66ae3a SHA1 8a8f61ac32c01d647dbe1696237d56a733a12b09 SHA256 6b29bdc55d5d2ec4fd7a3a046f770348d0a86907caf3eda441855fb6255fa80b
 AUX ultimateircd.rc 514 RMD160 49244994f77b9cb3a325eb0732b94d1c61864094 SHA1 97fb2b9388e7383967b981d226910b2620896d9e SHA256 1506849da55c0e53afdacf27404086821ffa7fbbaaf62d32008308dd6c156e89
 AUX ultimateircd.rc-3.0.0 561 RMD160 fbb2e0c4200d143de5b87ce09f9394134d333846 SHA1 d2cb60f01d4f037c6ea92f361cc8961bccf8aef5 SHA256 69c84233e6aae67fc9d8ae115be54e5a770d9c795eb9326b6e4540abb5294348
 AUX ultimateircd.rc.2 543 RMD160 c39cc638fb4ba3061cd6859fd178aec867064c15 SHA1 4f5150e815990170ed83a67d7f67b96dc3364b5e SHA256 739a922a6256bada943e95f4b1d9b606c2aa3fae5c221c69c4a097f04e2caf9d
 DIST Ultimate3.0.2.tar.bz2 615944 RMD160 6faa9b4834097b4d695ad09c4c55fb38704644c3 SHA1 00a46adb92c47dfcded1725b2996bab47fff0121 SHA256 b4564f76d074b3bafde6a7d2cdc8da177759949ed933979d801d107dc6fd8934
-EBUILD ultimate-3.0.2-r1.ebuild 2565 RMD160 3885c43dea7f8eb0a8997c6f3c85316757f664e2 SHA1 3bd6089e4add01626ba255f266f80e257ef4bf38 SHA256 e5711042934fd7bf4553570e6ccf370982be7ce8ab29fb58680f5d9ff8004ec6
+EBUILD ultimate-3.0.2-r2.ebuild 2564 RMD160 20e691675e335d3af4e6062dbeefb66520b76449 SHA1 1b59a83b84b76236c0fdb61e7614d7f5a42c98a9 SHA256 fb0ffba0bb7f1a0e296370335ca65018e277a74215a879bf880a16c08afca6ab
 EBUILD ultimate-3.0.2.ebuild 1538 RMD160 90cbe044c002ebd1f7ca70977f4d524b0cc01798 SHA1 c5b3cf7efef0c1f250189058f74dc64e3fb34f85 SHA256 834e8d16e9076894f4e04dafe2fa6d066f730fa1b032330df74b187cd9aefca9
-MISC ChangeLog 3624 RMD160 87409dcf883200076bb0ec1ced1bd3619576bfdf SHA1 f7e4a80d6e1981a1284445b1caeacef1fd4e00d3 SHA256 b741d09807c18c5f8d986f0f7978a17c872ed91cd524d15a04b2ca5b7a840fa7
+MISC ChangeLog 3923 RMD160 b1ed10f0a3e9ed6ef1ea584e568549714aa7aba4 SHA1 9e98fc2315abc48a19c1e652873b7c4caaf96f38 SHA256 16bc1381f3df77c410008d248a22a31b2205bc64263affe6181e62b51301d3c5
 MISC metadata.xml 267 RMD160 4e8e2b593366fedbaac878ff173c5cab64cede9c SHA1 e3325f2c0af0066f8a631348bfa7c000f6d0c0fd SHA256 0af2c1af367b00b54ea1e6163b7c1f6a3138683413baa091175e7914623dd360
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNwcBZAAoJEHQ6UuhrqBBQKm0QALZv1S5xwtAj0+3rxYGnZTPA
-ItcJaiQTGS75ZsmrpthsD0gs72uRCFKdH+AiZ+zPBwNtFZxsBUW+VMBGAsi4Tx45
-c4mwFUBhdISxOjom5ZUuOysWj2fvHxWT3yv0sm/idXoJbt3ERKK9gRokkYBFZmIq
-VIRzeHeONMUBqb+kl4wtBSjlqiHUmkBbTrad3spS+M3mvNqiQ6DGWVO3i0qoFlpd
-sWMz5sRpfXulOpSAAGxq0N7Hv7LTxL2N9rVOH6MjGAmGAu6JS5ZHpAu4W2b3GJkQ
-pXQVHCQ2j8nlZbp3VzPKJzlCbQbTI82cHVfnaj8SVU16mcfdLfr1r2fuH+772dLJ
-66E7JUtQ1CZ4QGIAHMHIV0PAYMLIJ2OGUNhp39s9pa0w9IUQ2TA+GqSEwwknjhAq
-lr01/3JiNdj2S3VZuyQanfn+QJ3IMaqpte++tUB/eh16wf+uPpyurgwZ7/sgTOPs
-KTiEOCtMLwYTjWnBTwzPgnrlZGDfF38KIc/jAYERlmrvgavPD1hJAl3lYkKHkszN
-IyAO3z5qVWSxkWy7ZN6d1BBDzVODw6rWEniJLpWhnVk4BBY6awNERifwf33E8Hwf
-fceZP2wa2USk5Rr+Q523pNS60Pvs4IuySAEnEVfhwq0M55+juheSYLeh1BahSkip
-hmM38kO4CW2FcTmvB1TY
-=hZyB
+iQIcBAEBCAAGBQJN+gAQAAoJEHQ6UuhrqBBQP7oP/A9A1No3MLoeSFDLJFHB/XGc
+xApeDNlVaGTTFlHQLLKI7rlqhJoJVlOaZTm5tF4KkaqT0pZL6GbeH6YZ1P47mgcf
+tKDASlK4TTv6jVJfKawKcALMQLYlsyVRLMTUxk+YF3foOPi/9aLSZEqs01x7maHH
+6qV+95zIHFphx/9m4BTOAMRvwcrFE8MkCLiS7Noy/2+iPDBonJSU1KyryGLPkwBQ
+gx1WNQXoP0PORJv1pB6ulXh6XsXjNPzkXnUWRK1QnQeSVdk5qOIBsZWOEGcixgyw
+SZ94hO1mxy2j8BHQdnM8c5HfP4HvQZ4tmXcXE68kMSekXyWxzXKl//kwh0hKqsH3
+Y/JxY76inwiVrFvQgdQbNlsKUJ6rg1SHT8YfJspG5bGs5hCSKIpNRP2hbQzKpYVQ
+z+vma8ilHQ+SimJXehhrHR0Sg74dtAIwslXXzJMgAAtj75pdX/Wpc4EyqU7Bd/UT
+4WCqsIj72dcmfN77lh3SVw7imy+E3MdvahU/NkyF0PcEXejxv2DNKUcpAGhII34T
+pgyFsryhc34JzNYk7z3lqOCgBR6iyeIqFsjIgw/m1fPb25F3q4ypN3foWEabQyXO
+9Lznr/6XmPpNHcq+JvA+/8hJqwstax9rwtVCCeZwDQXz4HYr+L58D55FXmFTzQjw
+IlcFql0Ug2j6AQzwA000
+=8GVR
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch
index e2e86a0481e0..acbb71c73d42 100644
--- a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch
+++ b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch
@@ -3,6 +3,10 @@ Subject: Don't  compile against internal  zlib. Missing ./configure.ac
 	changes  because ./configure.ac wasn't  shipped with  the dist
 	tarball.
 Date: 2011/04/27
+Subject: Use @ZLIB_LIBS@ and @ZLIB_CFLAGS@ instead of $(ZLIB_LIBS) and
+	friends because we don't get AC_SUBST() declared as Makefile
+	variables for free. https://bugs.gentoo.org/371889
+Date: 2011/06/16
 
 --- a/autoconf/configure.in
 +++ b/autoconf/configure.in
@@ -39,10 +43,10 @@ Date: 2011/04/27
  SSL_INCLUDES	= @SSL_INCLUDES@
  
 -IRCDLIBS	= ../zlib/libz.a @LIBS@ $(SSL_LIBS)
-+IRCDLIBS	= $(ZLIB_LIBS) @LIBS@ $(SSL_LIBS)
++IRCDLIBS	= @ZLIB_LIBS@ @LIBS@ $(SSL_LIBS)
  
 -INCLUDES	= -I../include -I../zlib $(SSL_INCLUDES)
-+INCLUDES	= -I../include $(ZLIB_CFLAGS) $(SSL_INCLUDES)
++INCLUDES	= -I../include @ZLIB_CFLAGS@ $(SSL_INCLUDES)
  CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
  
  default:	all
diff --git a/net-irc/ultimate/ultimate-3.0.2-r1.ebuild b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild
index 0f9daf96a72f..782a95b9fef1 100644
--- a/net-irc/ultimate/ultimate-3.0.2-r1.ebuild
+++ b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.2-r1.ebuild,v 1.1 2011/05/02 20:43:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.2-r2.ebuild,v 1.1 2011/06/16 13:06:45 binki Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ src_prepare() {
 	eprefixify "${T}"/${P}-config.patch
 	epatch "${T}"/${P}-config.patch
 
-	epatch "${FILESDIR}"/${P}-system-zlib.patch
+	epatch "${FILESDIR}"/${P}-system-zlib-r1.patch
 	epatch "${FILESDIR}"/${P}-make-failfast.patch
 	epatch "${FILESDIR}"/${P}-open-mode.patch
 	epatch "${FILESDIR}"/${P}-entropy-path.patch