Fix compile when the ssl USE flag isn't selected.

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

4 files changed, 29 insertions, 18 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 4ae1c64c6c43..f5899b13646d 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.137 2011/01/27 11:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.138 2011/02/10 18:19:45 radhermit Exp $
+
+  10 Feb 2011; Tim Harder <radhermit@gentoo.org> bitlbee-3.0.1.ebuild,
+  +files/bitlbee-3.0.1-no-ssl.patch:
+  Fix compile when the ssl USE flag isn't selected.
 
   27 Jan 2011; Markos Chandras <hwoarang@gentoo.org> bitlbee-3.0.1.ebuild,
   +files/bitlbee-3.0.1-ldflags.patch:
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index eab7086f0656..d822f6921a89 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX bitlbee-1.2.2-fix_tests_check_set.patch 452 RMD160 22544fc0acde62566a44ca97a63f5c1a23e29d07 SHA1 5874404077a692a3c8be6fc29b3bbc2ff7324b58 SHA256 1569026c1c9e5d784e6deddbc71f9bf63a58c28fd62325294c733e897a151271
 AUX bitlbee-3.0-configure.patch 393 RMD160 eb546e7271549cd56b87168ccf0ccb3ffb80742d SHA1 7762bae624acf765d3905b46b84448762694a25f SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd
 AUX bitlbee-3.0-jabber.patch 481 RMD160 e3c96940bc3288ec34ade677f6a359d53753fd84 SHA1 f0cfd20158be0ae99b470db7409c0ae2438f10d1 SHA256 0d65fbe01c2a59b20f5f9f21c1bc3c9832c4d6332286f6eb8e47977327d5b6cd
 AUX bitlbee-3.0.1-ldflags.patch 371 RMD160 8a80b076afdf1c0c5d399a51d4f06cb423eaf690 SHA1 d3f3a6082f6ac922c831df8707d888fce00345df SHA256 f84238b02c06270855b97dcefb1d3bde4d9eca8c2421aba5db2081f7b0287564
+AUX bitlbee-3.0.1-no-ssl.patch 160 RMD160 9a088629bba90c6c0c7cb03bdc132c7a6ad8dd86 SHA1 51f858fc1acf4e6128008efeff4a7bd5924de7bb SHA256 af2860ef67318985c325d1d5a1c5bfcf8f6d06f8d3f5b6b3afcfbd6522e50ca4
 AUX bitlbee.confd 62 RMD160 f71fff4ab4fe49eebc071d693896f567291bee54 SHA1 80beb974922b2ff6cf9732a7bce1eb03cc10d870 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628
 AUX bitlbee.initd 605 RMD160 183c4a8117556cb474c01ba4038b357a6716f98e SHA1 3427fa5f558b2957046ef1a6afdd4bc2bb8807e3 SHA256 037091df1746b9a477f07cdac52d99f9310055646ce0e10f859835ba105e3fb4
 AUX bitlbeed.confd2 524 RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 SHA1 7ac73948da0ffeb705482cf1d05a6fa93c267f3d SHA256 8f9e258452d62eb15990b465e1f74251e7ceb4d6b2c93a35c42a026d75e96418
@@ -16,24 +17,18 @@ DIST bitlbee-3.0.tar.gz 662460 RMD160 7d3e9fbbf2835c014bbaf64d926aa00b3a66624d S
 EBUILD bitlbee-1.2.3-r1.ebuild 4847 RMD160 fdf50926a2eb62b90c337b85abd29a42b877fe89 SHA1 d7bd1bf22c96fcddbe16b34ea4eee0aae618dc63 SHA256 85a532a9a0fe4727d509561288b69ba92b549f12e45d7a3b497dfce03d499bd2
 EBUILD bitlbee-1.2.3.ebuild 4787 RMD160 91eaa868a2063ce56e11506c01318ae468a6e3e3 SHA1 9a3fb734afeeb7e037f49a2c78b1d50e9275da58 SHA256 46477796499b2a8a7251673e246b2e3a8631779b698b2f1d29873eb300446227
 EBUILD bitlbee-1.2.8.ebuild 4683 RMD160 ea6ab8deac113106af787e74d59b76f7a9352f02 SHA1 74053ece23aefbe6130e4899ae6883ed96b07ca9 SHA256 2cccea87333751df463aa95a92ba8bc593a10fe8b2dde30aaf4dd830e825d861
-EBUILD bitlbee-3.0.1.ebuild 5515 RMD160 a54f9142b389d68c5ff88d39bb7bbe293767cdce SHA1 624abe6100bd1e171d55d7d13ea7169b6f2050a0 SHA256 8fa49bc30551e9e8db0ef328d02581cc5cb9c0906f00174e2b4c2a82b3d7465b
+EBUILD bitlbee-3.0.1.ebuild 5556 RMD160 aa2b6e68638978430a8cfaf5001dad5b7a86c30c SHA1 09e2fcf922cd5a9f7e5f44454b87c0b7f70b300b SHA256 029586aed5887449f82b547bb75b60e8c96ebf9e1895e6c57b2099772006023c
 EBUILD bitlbee-3.0.ebuild 5501 RMD160 d41c34a90639140a87667b48aac30eb7c448a9ee SHA1 40a556908e372e304402c8764cf84f57e6d059b0 SHA256 9c4c59dcdf2031ffb1a0c944c28bb8904386692001062f6c0388405f1d81ede1
-MISC ChangeLog 21407 RMD160 e4437973b046bbf8500ce33c407420fd198a961f SHA1 57bb250a748e2b8af8268cddc027a7f59e5f3cae SHA256 937b25c4f131d9084b3701725f7a063e514e71a88ec2193e4a2e2a20bdc0378c
+MISC ChangeLog 21569 RMD160 cef06950e1427ba494e276d83898355eb4c48f9f SHA1 9976fb5275ea711992c78621169a6de0d4e03eff SHA256 c7c50fc87e6662187f6538d880249bf5c1a2f30da7548fa58a123ddb11726f5a
 MISC metadata.xml 1048 RMD160 c56bfb0bdc9d2bdf8e0395355b60a0535d8b6087 SHA1 96d6f2f3c768f5508c07016e0f51f27e4423dd98 SHA256 19b7161da211dc6b51ce8c765a8a72d7dd43a5b1923867c39766cc2e1dbe8f1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNQU/9AAoJEPqDWhW0r/LCfvkP/iRtMCsKZP+1C8oEMiUlrC8A
-Jzs9mt5LoJPs+pYCJhBxIY21nLvtU9jPadxgH/vEVCAkOdCxwYXtuQVwJfymdI/6
-rvlsTaHybBszbNftJcuDxbWwzwX7vLRBgMS3qM3gFC8ACJyZDeegto21OcOw2mSD
-6YeJ4/36Tx9Y2Ne7tO742O6IlwSpgA1n60sMfxraDhZE6zNEIr9hoZuXB4yGzidG
-6aIH+OIF/EXojBGBJzUPTgGhxzPwgQQCfp8x+vvfzDzrd7C0Ud/od9ZmNx0+NYeF
-1lTUqppQzF7SU8/IMxJj8d3DzFJrWpEPCKmleqshhpHJ9QSCqlejj5du8GaVxtaJ
-omhNHlX9uW6A36Tnd9ec6UzZ9ZTHHC5VnAPpfACJk4Zuf6l+70D+GfTFWQCAwZN3
-dV6S8zYATkKlHlyi6ZCIK8/l8dzNZROkJtd3a4yLmPu9/NfGOti7XcwYBcaObkwT
-7aTRYe76+wEMgI0MdHX85mECLXvLagmeFco5OrwYO5Y9nwZ2OLnafBYwxHEUNEoo
-MEA9rxfHUAqPOORA1lUTvGa+eODbgOTUBli3tb8REku3fbNHQaTo01Kc8fBbck2T
-huGq26h0KE40fDiwjWgPYl1zYbza/Gp/e7ysKB+UX2o9IGnRXqhn1V9dGjc9mfLf
-DDZq3+OcLRFUZkQR7XKM
-=MPdN
+iQEcBAEBAgAGBQJNVCxLAAoJEEqz6FtPBkyjsloH/RmYKVFNZ1iqhu8mtshDX/+K
+Jc/GEGaec+M0cPVPKZznc76F9GyiMLQPDauRxjk6YUNLYWHxVUdU8DBsJd3IIu9N
+qJh4HbZx3Actv8PgAaVk4T7kokbCiCVpw/auOJjDXHb7KdcaHCKtBZv+H+SzvTpq
+9gXleeGOwBFD3DOpKImK6UVq+3RruljiXXSVO+gMwULCmfG/u+pCdsC2Ye6W1vdk
+FnoBHvObbblsqzrf8w1yMEls5MPie5ojpN/Qow0lVd3O6ma2A4sp6BH4e/6qsd2x
+YKFDPow1SoVI2cTS3mnuekuEl4HBJGKaCkevWJvM0EDFUOtSkRSD3EO5ylgfrHU=
+=6qpT
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.1.ebuild b/net-im/bitlbee/bitlbee-3.0.1.ebuild
index d43f1bf2348c..c80b86110b94 100644
--- a/net-im/bitlbee/bitlbee-3.0.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.1.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-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.6 2011/01/27 11:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.7 2011/02/10 18:19:45 radhermit Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs confutils multilib
@@ -88,6 +88,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-3.0-configure.patch
 	epatch "${FILESDIR}"/${PN}-3.0.1-ldflags.patch
+	epatch "${FILESDIR}"/${P}-no-ssl.patch
 }
 
 src_configure() {
diff --git a/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch b/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch
new file mode 100644
index 000000000000..6164ca9ed6b9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch
@@ -0,0 +1,11 @@
+--- bitlbee-3.0.1/lib/ssl_bogus.c.orig
++++ bitlbee-3.0.1/lib/ssl_bogus.c
+@@ -69,8 +69,3 @@
+ {
+ 	return 0;
+ }
+-
+-int ssl_pending( void *conn )
+-{
+-	return 0;
+-}