Fix m4 rule for openssl detection. Bug #430434

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 37 insertions, 17 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 557ebb1850a2..3c4a2b3356fe 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/icecast
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.87 2012/08/07 17:46:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.88 2012/08/08 17:18:53 hwoarang Exp $
+
+  08 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/icecast-2.3.3-fix-xiph_openssl.patch, icecast-2.3.3.ebuild:
+  Fix m4 rule for openssl detection. Bug #430434
 
   07 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/icecast-2.3.3-libkate.patch, icecast-2.3.3.ebuild, metadata.xml:
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index f2dd59a7638a..f3698f8f4312 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX icecast-2.3.3-fix-xiph_openssl.patch 648 SHA256 5804664e9add19dd679056b7ea07f19aa63205c7e5b84b2bc858c420e9688c57 SHA512 fa4014a3aad9886b14f6551cf72c8ae8d97b6879302fc11e8a7b120464540c077786a3209e5f87316393362a9e00d759686c9a3448dd00ec0503e025d28301f2 WHIRLPOOL 2b1e52069b970ecd2091236287c09034741959d61b9a18dcb66fc7059817367e5cabea7334d3887f432b4a26a578225cfb240ff68cdaa5c03ea35bfb2dd9077e
 AUX icecast-2.3.3-libkate.patch 1175 SHA256 880cef8feed886933eae495f547d10b3f9462a87f0812718bca6f454f25ecc40 SHA512 4ecacacb422ceb71bb6f8857228b2c00e2564d6926124aa8e9430b0f1466df934146fcbbc67194a6e644f6c4c16421474016909c385ec2271967730f80f5b8b3 WHIRLPOOL 0a2bea3dc404a61663b606bb14e862a3e2a985519133d80919406a7e4c86dddb3d2bb25e2af044cc02fd5d0528dcf7889e66b30dc5c05a3068cd3ab0af7b98d0
 AUX icecast.xml 6810 SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb SHA512 605628963c989661936249bccf7318f0de40ae65f0122297d7cdce2a21f6db93d127b9b17d695a0218a3eea5bccbc31c3c8ef8c3e3750ac3351c9de1038190b3 WHIRLPOOL 412f9a578f59c2a29deb97451be28e095a3492fff0895cbb867f6a90f7e3c88beee6bd35233b4997b0e9fa5e5cd80321bd73e8915a97726964f92e0adc392482
 AUX init.d.icecast 357 SHA256 bffdb754a923d12fd619b022b94398b609b940214ef012ed8e9cd03ebb2b60e6 SHA512 fa6a738f1ed2c238cdcbd4dd92bce161ea2ed40c8886afe62006f2baa898859285d8a6cf2e2fad780533d35d954fd5dd69b6be6bf4f41bc9bcee475a53c8628d WHIRLPOOL cf79f403af7ee142a4a0199dd09f077e698e15c39ecf8b904f7f70f050a260cd3145d26446f3a14ed52c6cb28424db2153ca14ac08c51129d4a6ef9c9173fd40
 DIST icecast-2.3.2.tar.gz 1152319 SHA256 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0 SHA512 c971b1ead32e76e493d95de34297084a6c09d6ade1aa3836c36e58290aec294e57b2729c0f9e2765bd3d7a0d728761b7f5174e8abddb72375a8b24f7df45db34 WHIRLPOOL af33bc0c4555c868acaa0c764b2fcb98672fedaa9fbf4adea06392a059c8935df23cd1c07a680bb158f0cd7046a73c35b2ae9197bea1cd7545f4337eaf457357
 DIST icecast-2.3.3.tar.gz 1161774 SHA256 1b1d06f5f83c9a983cd28cc78aa90e4038f933511b3d20d7fd2cfc116645c36d SHA512 e0ae26047744bfcb902dd5418bb83a6e25956109bd410f244fb23dd21216d2d0456c29684c38db99cfa6c5496353a860be776f569964b98286f0deca78156aba WHIRLPOOL 7042eb5f86f03b613e56c9a2362738cde9cf8bb6addfdc36a53b5a476c12edfbf6ff83612de4acba0cec7c62f7b26cf06a7f0b55cde67d81f9dd2a12fa6a8af8
 EBUILD icecast-2.3.2.ebuild 1855 SHA256 94dcf2b31dd1cfb9dd0324bc38e5b255886e10eaaefd893551234836adf9663a SHA512 251e346552116777e2378cdba7a4890dc018f70fbf31cd375ab2d4a88e49e59f4ee6baf85fcfcca02affe531941c20ceae1df37cb7abba92263f93a638848134 WHIRLPOOL c9d1d5d371986c7fefdc921c336cc8d430fe1455a05b4631aecd9819aaa78c361886b529591d5c5f4ccb88aa3a4f4ea6acf3cc61604e30e3d08a3a80028fb1f4
-EBUILD icecast-2.3.3.ebuild 1890 SHA256 f1f58b2ced4e056b75215a175a2a72a6cea3451e6adf2978fbb741c938fc9e4e SHA512 26516d8b802b8a24f3dd7bfdf95333081cec38cfd81331273c1b89adcbae0910a1357709e09293b888c61224f5539a6fa4f91f89c361e62dd39a9e89aa5cf361 WHIRLPOOL 94f59d310ea698e40dea2353ee61393d4a43847588c6f1859dc05478467f9a0e406abbf69cc9075949c7511ac8199ceb35a0d1df1c306b867b15fc63ed4f6309
-MISC ChangeLog 12497 SHA256 7f4eca68a4de894241df40eef8a5f8458ae070a0ad1cb78624bcbab04cd896c2 SHA512 6f171ac7e8add6395feadfe661b2efb08f0477ed691d8148e470bb7fb717473913d1848b1d4b419e16274b7a4b5a6e373d93b50bdd8bd95d79e901140ff4d6a3 WHIRLPOOL 02270980596452e774c7492d42e590c0bbf5d84ba2846f4a96d960f891d2520b5eefbaeb508542982a2a104f6ee7b7f8e56d17cf826db7adc2b6573cbde2297e
+EBUILD icecast-2.3.3.ebuild 1955 SHA256 d0d0dd2586846a01e541dec3832a11da302d9d8198a825d584430ef95fa229c9 SHA512 0bdc22f1f0e0988398f6a521ac462a9e29c70abc56c64336e41ba7010733fdac73c0ce299be066eadb387d4d154e93ef51dba2e3f81714d343cbe2a852bd2771 WHIRLPOOL a6402a37ec2bb3333436b7fa3de39badba8d8d9acc675b7000af9d570d38221b2ca138508f5626fb7182397163e476c3f994f080dbbd44dfc58b434b532f1ae0
+MISC ChangeLog 12669 SHA256 af266b0d46fcac62f8a5c299589fbab6705470e56ec5e2a09088747cc350a426 SHA512 f3ac27926a8761b3fbd0c2fbb961918b34a8197aa06816a26c79012262b94bc2788871becb17695cbe55acd73db2f82b61a4a3472e5c687827b13cd83e766bd6 WHIRLPOOL 2bfd7724ed71442a7760d9e062bb739c5c29f01d2b454e934c22db32bbfcfc850e3fe9dc88722eadd952fb8e1f8ea99c123fc7478dede4c2d197443b0527eb14
 MISC metadata.xml 437 SHA256 c644bb366bc4f4b3faa2390526516ce133d780f5781e7058be2284720dcdf9e3 SHA512 ed7862fc62ba469ad909a72bd03f56b513b97c792c016ca3d0bfbee72b5c983baf59a3b443eb9866dc7f674a05e9d3e9ed29425a8d41f8fc4f7c001b946d88ec WHIRLPOOL a00e9154160f5c2305ecbf7adb51d982968cedd4a07d71042a9a4fe9a0dfa12035ed664e46c62999edbbae530aad6fc12c71b4f0dc8aeacf528ceee530fe46db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIVRwAAoJEPqDWhW0r/LC4iAP/1AKhhH6De76J9QjdrU5ohr7
-JyDVXQuxF0GXve9GkUAToyO/D24l/xJobB7rd35EOMOtO+qgnWWpV4rjDfeB5N7E
-H41jr95y2aREXAmGXtInV+1Rl25qQrCuwk0GLy1QIwX8rAs2tsu7sFa5jjmi93qh
-DmuzYL2LyrXNx9zK7Ryl1gFDOqr/nRd6j+Puj1UWWqXxHGcn3UZcgNIa2lwIrriO
-n6+K+/CC9glL/QpVfYKYMyQPMXfuEpl2nUcOxWunaW0eDn+18pPQMBOIcjfEVKkg
-JbS9bV9qLIzjwn1/O9HLENBo29oB7ga5temxvr4uXO0pWKPOPQThrVe7XBBt2M1+
-83aKNbs3IEhwlRdYkdQuypuSThjOhUT2lB1IwcV0km6UvQ9NfF+2NOpe0p/cUD4n
-RgeBfUFEGRxprMZ89GKG2LdeUBJfjr3MBsMsabncjrsMno5TRy0i2v3v/KS7UM0Q
-byleAyuTS+J75HPW5qNbJmn++0+1eNvlmzCEpoicJtyUkmjSMR4jVjKhB71cRpIg
-NXkj+LSS88Iep5jfRnAZfYkET2h1tMBltgX1+lw+W6chTWCZ9xhyBvXben+KW2px
-HAUa8+SXb890I+MgrCwM5z5OmhnUQ6rMKQVWS4EPPkLilUavu9YIEj09heB7Wmv7
-oNNuhyMYFSvXaKNXqJ1Z
-=uBo2
+iQIcBAEBCAAGBQJQIp+CAAoJEPqDWhW0r/LCTR4P/1kxrV3yEMiYLkm/Ro2AEucN
+Wvnfyy8Ll0Izx52kfNuCJ9Iu5r4vNq7zLtR24pOWURyVs/WjozthVX0OJQa625eq
+QC6P6+IVfH3vDOfwphmB8uJIyhA+y4ujRPhYeUlJ7wrtEjAERqU9zEx0Dfh3bv06
+jrzgkevbO8YfLEX+GylGwyMfN1Rk4kS5ZHSzfbwIeyQJz/kTJ2Nzu9IWFqZq4U/1
+AMPoniTU3bhc1yTMNj3IfaoQqj6G4smswpK3VxCxpeNETkYXmXW5CLEoLDiDZll/
+ML6TyMqjfauJqQjs8SPk3fqICgM0u7s3hp+T81EOPu+VwoT86vmRTriGHkGcdBHD
+Bpz/w2NMlh1TtwYT32OHk4hu3hDgFVfwrvzYUfg6ACjwBsFIvHDuHuX+LeF4yWwG
+/P5MCaqhsRKma1Ya2A3kEYBl/2ghA5rvoccekux/FVD+R/7sgM9qYCnMih0ruAji
+aJ18Dupvr6d98PyyY799uegiRzT4pbYdfckcjAHsRtV0FOOqbJoao4al80BfyWWK
+EOYvWshco/E1dQ0tgM4oP8zPn8eFHxoriFSo1DM7WMKB22VvW9mCQsrDvtRXxuSL
+wDEW8S4WN+1g9nu9zVltXEoomt9w5XGdvPI9CtJN9p7K+7d0AmQp3BfneuU9xxXZ
+ZcSGTgsn9sao6oy72vc6
+=SPW5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch b/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch
new file mode 100644
index 000000000000..7db5be1500de
--- /dev/null
+++ b/net-misc/icecast/files/icecast-2.3.3-fix-xiph_openssl.patch
@@ -0,0 +1,13 @@
+Index: icecast-2.3.3/m4/xiph_openssl.m4
+===================================================================
+--- icecast-2.3.3.orig/m4/xiph_openssl.m4
++++ icecast-2.3.3/m4/xiph_openssl.m4
+@@ -10,7 +10,7 @@ AC_ARG_WITH(openssl,
+     AC_HELP_STRING([--with-openssl=PFX],[Prefix where openssl is installed (optional)]),
+     openssl_prefix="$withval", openssl_prefix="")
+ 
+-if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes"; then
++if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes" -a "x$openssl_prefix" != "xno"; then
+     OPENSSL_LIBS="-L$openssl_prefix/lib -lssl"
+     OPENSSL_CFLAGS="-I$openssl_prefix/include"
+ else
diff --git a/net-misc/icecast/icecast-2.3.3.ebuild b/net-misc/icecast/icecast-2.3.3.ebuild
index fd77bc4853a5..933d1f8fe5e0 100644
--- a/net-misc/icecast/icecast-2.3.3.ebuild
+++ b/net-misc/icecast/icecast-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.3.ebuild,v 1.2 2012/08/07 17:46:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.3.ebuild,v 1.3 2012/08/08 17:18:53 hwoarang Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -33,6 +33,8 @@ pkg_setup() {
 src_prepare() {
 	# bug #368539
 	epatch "${FILESDIR}"/${P}-libkate.patch
+	# bug #430434
+	epatch "${FILESDIR}"/${P}-fix-xiph_openssl.patch
 	eautoreconf
 }