Fix building with USE="-gtk" when x11-libs/gtk+:2 is not installed, wrt bug #460758. Thanks to Denis M. <god AT politeia.in> for proposed fixes

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 28 insertions, 13 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 19a761f82194..d5d5f5cd8d95 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.30 2013/03/08 12:30:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.31 2013/03/09 11:18:43 pinkbyte Exp $
+
+  09 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> hexchat-2.9.3.ebuild,
+  hexchat-2.9.4.ebuild:
+  Fix building with USE="-gtk" when x11-libs/gtk+:2 is not installed, wrt bug
+  #460758. Thanks to Denis M. <god AT politeia.in> for proposed fixes
 
   08 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> hexchat-2.9.4.ebuild:
   Stable on arm, wrt bug #459868
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 47597e7d036d..79981be191e5 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -6,18 +6,18 @@ AUX hexchat-2.9.3-cflags.patch 474 SHA256 ccf7236e3dbc9d6450901fcea49c8c5e8adc57
 AUX hexchat-2.9.3-nogtk.patch 348 SHA256 5426f06b93185befe04244290cefbdcff120d40db9812398a9b6ec99040753ad SHA512 cce7deb9809cd76d800c2629762148015b6bb8d5bb8195b9037dcc57069c9e0affccb64ff1e05d9281863d0a67df83790ad15c6ddee357af4ad41788bf3caa16 WHIRLPOOL 02f4ca5950cb3548efde42448a7f9e1aaaf5e70cf7e33bb9df4dfb285283c192b7de781ee2395b42f3f8d3fbd2e9afbbac9e62bc0b16795a378af9b41fdc3c8e
 DIST hexchat-2.9.3.tar.xz 1740220 SHA256 39e33462dbd44281819af805e1adda5e7c81c69a0b8bcc01ba61098dcbdf3d8c SHA512 62f5b09bd164da37b7722475b2442bdda5c9ecf33f98119a680aaa2be25867714ab5f9a57a2586af4c57dfd5af7dd2a0df9e3ee1e29fcfe3a30c515260a368f9 WHIRLPOOL 1c74d4ac3141ee1b2d8fdfa495c84f5224463b2fea88d18e88821be528bb6795507b40759e2da1a0ea6895ee3f3d135286e7d3d1b8fd0260a7a5f8c69b77be77
 DIST hexchat-2.9.4.tar.xz 1535324 SHA256 0705cc3a6b16d1adf367e52583d852dc35dfe20930057aebc2758784fa8ec6e6 SHA512 cd2fc1d4ca1d7cce4ac78dcb15bf8862e6fbe39e7ce981ed7544c9cdc0a5653a6e6493c149d1e40d36edf6e948223f079366431f129ea3440a66d3afe56db5d3 WHIRLPOOL 17cdc44e95b64331dca2eee4de22ccfa8812d165d828b4a17e33f905ef6b470ce593c4bf0482219c79088e79533dff9a9335f6dc88b3a86492c9a643c540c872
-EBUILD hexchat-2.9.3.ebuild 2517 SHA256 25f5e4968aed9bf7bb53fef40edaa7a218876ea8e2b46147f56c5a750345b658 SHA512 a32ac2d23ca0017b70e315f513c2314e5e65c03d49f142564ba8d1530d526c6fa09b5ca49920b872712865619c2df5e39e38752abcfce476b67b5b62315d0fa1 WHIRLPOOL e63620ee4bd3cf7a3bdbe4df855edcd97271e5e2c6f91136add9de85c3ddaccc8a872e5bc9fbafecade5bd1858d5f85c5060327b9c2b7bc18624d2dbde917e3d
-EBUILD hexchat-2.9.4.ebuild 2808 SHA256 eeebe6957e0690f0ccc8a890937b6aaca6dc5d66e3e9d7a870dd6d66d3ad1135 SHA512 2071d8ee379359c4e38cb8758831bf48d27bd2e147ed0e6e6874559cf008ed5c2714e5921f8043ef93bd023bb7d8d07648aea91db71d1e38b95cd40c03cbeae5 WHIRLPOOL 01e931fff307b4bf0772aee2f27f94baa27b30c00baffdb215ca305c3d7776f7d9b187df2053d51d4959c206800c7a5a0b538410f1e74036d1e1819ed5a9c927
-MISC ChangeLog 3984 SHA256 e505a71745c5dfe6f86d52170c4e9d82423db54a9ebc5bc8c0f60f6b82cb8c1b SHA512 599f4223476ebb432cb2270cc2274148d89b8748ce0c864407eef5c2ad88b854481b91e2582afbb0f31784f423c981e23a638da578bec98adaea167927468a63 WHIRLPOOL 236c409f202f691ff9dcdcd86adf00f35b210305663cdf0ee1e69b545e3eb69c52c3f6ec2fe296288775865c3026b043f7f11bd64c1dc9ec4f52c726443427a1
+EBUILD hexchat-2.9.3.ebuild 2667 SHA256 c2e98dc5ba6d68e0cb9f5f1f9e68d52c6be4c40a1f9c7c31c07aefa5ae30c0c6 SHA512 a938567651b72f07b210bd069f571fd7dc0e94aeef8e5e3f388526bae8cea6039d6a59727041a9a145591d74f848ad3fa1e3d5a3447d01ac7d9d73a051cc37ad WHIRLPOOL a6062c39d3d25a6eaf6780cb9493eeca91db7dd0abbd1833783ceff9bbf872fb617489195f9aace990a29c53a239e93d6e3d58a5233b8d659a380888034c3a82
+EBUILD hexchat-2.9.4.ebuild 3007 SHA256 bc2e3650fd2ad3625bfeba24ba1d34ca0548326e376c482565646c6d4f07c420 SHA512 69af67038d5141d812182d217226fe63c7b07ebc1c55c8e25bb1d6733685f73f125f59a2cd1c758297e41cfedfbbcf1406adeb3eb4174abfb4bd50efd9ccfff6 WHIRLPOOL f67d2d8ef17a513e3995ec5e8fecde9fe26cd9f4924040ccf126f5aebfb68462d5aa133ac232ed74368b8356f2286460b892d517910a1ca0061bf6af5ddacfcc
+MISC ChangeLog 4229 SHA256 02adb20fd3d6b62561beff74a766bceea1510479de85f31ea97a948eb571fc6e SHA512 17170e2a4dc5a7aef39025bff4d6e9f0f9b679d54752372be776d0ff6d35745dd714d6b03dd7eeaa2bbc27a96b805e40a08477a7cac2c6e079831518af0a2311 WHIRLPOOL b531a51cdafaf04aeb397ac0182c182b15489c36c4889fd09f0deddf796e0dfebfc9c572da602c0e9b552a63f48f0cee672034a8dfc893c4eb622bb051e65e94
 MISC metadata.xml 582 SHA256 95e1c6d1d353bab23a0dfc707c5dc65477478cbb32be13a5052cd12ec7ee4a64 SHA512 7bcd45980af9837a658dfe585c1cdb94227022008e5247403ead6e12987e7edd6904e3418f8aadaa5882a3a45aefa6afc2354e951436cf8f0cfbeddf450095eb WHIRLPOOL 47b2e3040c449c6ec2e20e97722ae234cc9cdc13d4b85cbc13ebdab13c735bfc6951740cfc70d6867407df99b5e30d8efec0aa8128b03123653eb2b486dc3d8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJROdnSAAoJECo/aRed9267p9QIAIEYHwtVJ34G9z5Zv5GJBzat
-BJF+Gal68DR0bUurrthOSDpY8ayMsTdoC8NWTtErtd/jfAHLACSoI2CCZs77dE59
-rZmHE5zZixMrTAbwplKiRVRxkGUrojUwcnYxWNltGB6aBSZxUwQmv+NSrCh/5Wh5
-HYkUMAqJ6L5kh/5TWp9aLdLEGphaReqMIkIzsj4pH+KiWBAD7odsRpEpe8YZuqVU
-Ne3ZOgyUYuD/ER4AX/YoRO6gngakTcWYgyThW1EUYVXm+x1WH3BYyVSHn1/nTtfE
-ZBdViSUEi6oVVeLKwQnkhOJdWO+50uuRa0MVVZdMW+yGjqO7Ddr79mWaeCo3rqo=
-=6MnF
+iQEcBAEBCAAGBQJROxqQAAoJECo/aRed9267td8H/R2yhvNghCqJifxXX3YJj2dK
+2iI2kDlaoiA4V9De7UOiZcsRI0ugj7zUYcAt7at/HIc1lnQRCSUQ18nhWbXE24x5
+uu6lgq84ZE4KsM3W79YhCyubHgfbAgIMt7C/LBs+7sX1s/lkWir2ExXtKs9e95if
+Eh/kCI7lmb76PJ9ot9aQI1okhTjwdlik4m7BUrNISmppNYqSiPMvDMVCVX9P8KQg
+Bi5fREz0m3JgU8BMRzSfPwGEkMBYh41Xcl8DvreyByaVYbHy/AYd9OYcsC/XztQZ
+UdoAy7hx1e6w19jwreU7rYi0fcxDfG7jg4rg8+RozN0Cv7CP+dXaBJLkfbwY+2w=
+=MiZL
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/hexchat-2.9.3.ebuild b/net-irc/hexchat/hexchat-2.9.3.ebuild
index d49845a8d7a7..c89e21ad7876 100644
--- a/net-irc/hexchat/hexchat-2.9.3.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.10 2013/01/14 07:14:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.11 2013/03/09 11:18:42 pinkbyte Exp $
 
 EAPI=4
 
@@ -54,6 +54,11 @@ src_prepare() {
 	# QA: remove deprecated line from desktop file
 	sed -e '/Encoding=UTF-8/d' -i ${PN}.desktop || die 'sed failed'
 
+	# Fix to compile with USE=-gtk when there is no gtk installed
+	if ! use gtk ; then
+		 sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed'
+	fi
+
 	./autogen.sh || die
 }
 
diff --git a/net-irc/hexchat/hexchat-2.9.4.ebuild b/net-irc/hexchat/hexchat-2.9.4.ebuild
index a9509ce13d3b..96b0f98df175 100644
--- a/net-irc/hexchat/hexchat-2.9.4.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.11 2013/03/08 12:30:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.12 2013/03/09 11:18:42 pinkbyte Exp $
 
 EAPI=5
 
@@ -50,6 +50,11 @@ src_prepare() {
 			-i configure.ac || die 'sed failed'
 	fi
 
+        # Fix to compile with USE=-gtk when there is no gtk installed          
+        if ! use gtk ; then
+                 sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed'
+        fi
+
 	mkdir "m4" || die "mkdir failed"
 	./autogen.sh || die "autogen.sh failed"
 }