Quickly fix zpaqopt contents.

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

4 files changed, 23 insertions, 16 deletions

diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 5e0f8ebf8ca6..2d74a47d3da1 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST bmp_j4.zip 1711 RMD160 14791dd3b9737c11eea9f3dd21f9e515108a5bff SHA1 d1c7f2755dc91a639d2f95baf8c92fc9a3c12799 SHA256 1b43969dcd0f04ff6f1f90b9ae40c790b8740fa6fd1011d0c2153fc4c52fc842
+DIST bmp_j4a.zip 1852 RMD160 89583287e2d9b6fcf2eafe2920f31ca1cee299eb SHA1 c1ef0b546b869f985bbac9030c76fee6d3e48644 SHA256 6b314e518f5b9ceffdac183229ddf74e6b5a0f4ef0e47181f652bf46e55de03c
 DIST bwt_j3.zip 16535 RMD160 523b09d25217531ed9829a1cc4e27413a15a0dcb SHA1 06b24a7cd749eac1958e73725bf4849395616939 SHA256 c5e75abdd8d8a3fb6effa3c467e98aeb3175068bd454a635baae79de024b9120
 DIST bwt_slowmode1.zip 138176 RMD160 71d456f7ebfa8af38f9e7e379105c4a3a7151637 SHA1 3bd01c1ca32d07fdb5ed71851de50e46d528394d SHA256 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b793558207001b2565f06e145a92
 DIST exe_j1.zip 9828 RMD160 5a2c83290a03fd54e6261ae4d791df5775500458 SHA1 28fa03a186aa47f7217201727fa3cdbd2ee7f635 SHA256 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239
@@ -10,13 +11,16 @@ DIST min.zip 9560 RMD160 76111480419f6e577df5f73521ded14aeb9dd950 SHA1 427d0d4f9
 DIST zpaq-fast.cfg 359 RMD160 345ebcc3a7faa880d1e1c215cc9ceb4fa059a6b4 SHA1 9268e938c04a7aebe16da1d55953db033b195222 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda
 DIST zpaq-max.cfg 1754 RMD160 1819fab274ac370a002cc3478cfcff7c1b8c128c SHA1 25f030f7a50085e00a2fd50088c44b8c8e3ee63a SHA256 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7
 DIST zpaq-mid.cfg 786 RMD160 0d55dd691d517479c0f8dad0aaf38e3b58ba8df2 SHA1 e0ecba365fb9e50ec74ec9f3331a6140b1dfa21c SHA256 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa
-EBUILD zpaq-extras-0_p20110106.ebuild 1520 RMD160 e033e1cd22eeb8359765b71e0df0e62cff7996bd SHA1 749664d240a23727e767455c0c21d9afc80301d1 SHA256 613e85a35ecb2e46ffa4836c29b984901ebfa949be6c3a22c1b3ba93aa66cb97
-MISC ChangeLog 1037 RMD160 1f55e3ef4b02e2e83013c0f880c35e7a32a05756 SHA1 87344e8a9f0e5b0a643ba8e44e9716f889dab7d5 SHA256 71956b352d53cceaa1ad8cfb8b151b324f8b1d656a4c626fc4776c6740770081
+EBUILD zpaq-extras-0_p20110106.ebuild 1538 RMD160 76a319e87b9bb7c21f9e53b0769bc160c2615f31 SHA1 08641de230f36968200bfc01581e5608298a6f38 SHA256 a05256c6c3f0c98905a10b8a099144be2d5c5377309d1d859cef92c7dc4a6772
+EBUILD zpaq-extras-1.ebuild 1535 RMD160 d7d1226ca58ffec136300049f503c5448755d77b SHA1 d9e7b23dfb5256a2d40a6a31f8dd033ccce3ede1 SHA256 397c797de99157fb1484c2a3676768399a48edb63a8615ea9f99eae8dfc35d23
+MISC ChangeLog 1219 RMD160 7c68d51ff3b1ba181403adcd1a39bd7ca9f733ec SHA1 5094b154ccef267ffdcad310798a76947b27efff SHA256 af99a046bb1f07415e7f2d59ac9167150361354f2b06df51b8654e78d62a42ec
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk0l6KcACgkQnGSe5QXeB7vpTACgwIsWETPyztnjiT/se0rHHuO4
-NOUAoJ03j5n35V84n8F2olL0bnds1alh
-=P7L/
+iJwEAQEIAAYFAk5WPR8ACgkQfXuS5UK5QB1TfgP+JhuR/ehN61XaFMO41G4vmwtY
+/M7LGd7NrWpiFQaPeX5jxzNzBHf7uSo7d0KJ2PB/Rk6bgeUlYQBOW/4iDf84N1rS
+M2EeFdau1vZMG+sKi0ae0sh8G8GezDttBQI2XIsiCDfwb3QoFZa4bYgcJ2IVGipj
+6ekQTPFhIdZy8m04GgQ=
+=dPvT
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index 30fcb0f3fd93..f722809e2c5a 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/zpaq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.4 2011/08/25 11:34:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.5 2011/08/25 12:13:14 mgorny Exp $
+
+  25 Aug 2011; Michał Górny <mgorny@gentoo.org> files/zpaq-3-autotools.patch:
+  Quickly fix zpaqopt contents.
 
 *zpaq-3.01 (25 Aug 2011)
 
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 0c379358d0c2..4c7f138f354e 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 AUX zpaq-2-autotools.patch 2098 RMD160 4d78a4c95bd3b4d2c2b5d04b3832070a19e6ab68 SHA1 e964a7b8d8c88e58e95afd9c832178a22f2ca768 SHA256 6d02f25c1d327e693fcf9fa3214023cbf6653f60363cb37455ba740f33c289ae
-AUX zpaq-3-autotools.patch 13085 RMD160 ff8039b549d7520226cb7b3a457bc3866658acdf SHA1 45f8a0b57ddc91758b74de470dbac25e288f4c37 SHA256 9e101a4ed8bcc8096453b1f0037439c12210b11fc2c59ac8d510bfb3ae26560f
+AUX zpaq-3-autotools.patch 13117 RMD160 28315b1c663f944593e952cc7aae165d93a3d6b6 SHA1 40f10fd51247ef10f0706918a08b509c0b5f3d63 SHA256 d30aea3989594be8fc5512d9ea22a358c9739684efeefbb0cd07bd1bb20b054c
 DIST zpaq.205.zip 101297 RMD160 43129c0a6a2b6948b360fc9681c6799bfe32c2e3 SHA1 0767965f7c9f292358157e55b307415f20d22002 SHA256 44e089d52c24dca3346654e3d59806f453873a5fc49b4bedde49c9fc1ba72241
 DIST zpaq301.zip 197065 RMD160 41647194b0a9f77a962cca6bdb225dc926088f2b SHA1 ae856bf85fea4f126690c842bf67b85ebe52d040 SHA256 bf8b9a1e92604dcea0474f60ab4a6ba9f1aae0bd80247c281f36559d0d7da6e8
 EBUILD zpaq-2.05.ebuild 868 RMD160 6c28c20b51f8dfea71d5d67d07a71c61ea6d1d40 SHA1 61730fa954769df044b635df3c35906566f5f0ad SHA256 aa6f055e45981e7cebce9edeccc905214b72fd17cbe713089eef3e94814b081e
 EBUILD zpaq-3.01.ebuild 878 RMD160 3637303ac02a555b7a0fd9513389db9faf56c71a SHA1 a58021e977dea799a8068a7e5f3911aef0dd4338 SHA256 3550b2969f363db1e8b26373c1df9343486135a474cce5d17c890bac12813f28
-MISC ChangeLog 1291 RMD160 774877b0112bd5af0a35a4f5a800229323d7108b SHA1 7990d31a465023d10e6e06a0d8c23640ff0ecb17 SHA256 3d3eaa07edf43b39ef15f07ef1c797f4004466a3af8dc80f0279a11624762880
+MISC ChangeLog 1404 RMD160 d3f249f1a1a5f990a649ad3156104710573a4d73 SHA1 b62429f075930105693b083461435539af694b5f SHA256 ecdae2457e917727852fa246cfa313da1676e6a8d532148c1c073bdaa9817281
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5WM6kACgkQfXuS5UK5QB10IwP/SEOSnUaL+vubWnLrDG/KPqeo
-3GIUcShBnc+gnH70DRAzyg2yv+hcEh+8+yWsEL2Va3OtIllJOEi54/vwHkEzrenm
-TZAznX56QREv4SE1VvhVCidmPfA1KnkSn4X7g0G68DDARtyIJGc7RZS1e53dBDE7
-x8N5X8YgRLiexiCMlNY=
-=pjqH
+iJwEAQEIAAYFAk5WPMoACgkQfXuS5UK5QB3kywP9GR5AdO4BXaziVP48p7gu1aJu
+MUgHJS7Cd8tLL1REOcfHPKMYVf5hlBQmOlMEIqr6ZO/luedqOA2XjEFiuvLarJO0
+T5s6rvnUiCqJO60XiwTOWDabmYq+inUBp2NgIxDkHN1hsGwHW1jszIXP6Ce3UIIB
+7ALIn54L+NzRZjvmkEo=
+=8lVv
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq/files/zpaq-3-autotools.patch b/app-arch/zpaq/files/zpaq-3-autotools.patch
index 50977bf4968b..871fa533f803 100644
--- a/app-arch/zpaq/files/zpaq-3-autotools.patch
+++ b/app-arch/zpaq/files/zpaq-3-autotools.patch
@@ -40,7 +40,7 @@ index 0000000..d005d5e
 +zpaq_LDADD = -lzpaq $(PTHREAD_LIBS)
 +
 +zpaqopt:
-+	echo "$(CXX) $(CXXFLAGS) $$1.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o $$1.exe $(LIBS) -lzpaqstub" > $@
++	echo '$(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $$1.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o $$1.exe $(LIBS) $(zpaq_LDADD) -lzpaqstub' > $@
 +
 +.PHONY: zpaqopt
 +