Fix build issue: create symlinks only in case USE=gtk is enabled, bug #323731, thank...

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

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 30182d13dd3320f373af4e374bb89c6902422335..de3bc3870528c179fed4e1301ccdb541b0a90455 100644 (file)
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.169 2010/06/11 19:48:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.170 2010/06/14 09:20:24 pva Exp $
+
+  14 Jun 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1-r1.ebuild:
+  Fix build issue: create symlinks only in case USE=gtk is enabled, bug
+  #323731, thank Nikoli for report.
 
 *pidgin-2.7.1-r1 (11 Jun 2010)
 

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f05b697032293f7f579484198354275727e5a9a7..4941cf6de3c5ea265c0889813f734447b1dcbaf5 100644 (file)
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,7 +2,7 @@ AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfa
 DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.1-r1.ebuild 6200 RMD160 ae9ad9539204c5d0c6836843c5d4e4d6ad363db6 SHA1 140d7958c70704a3e6524318e1ed804a19af89c9 SHA256 145f005430ac8ed2da1a7605f89b2298368fbd04843e798d987d292e80b1bda2
+EBUILD pidgin-2.7.1-r1.ebuild 6234 RMD160 845fcf399cd9a108b91a3f5787a2885a82129a96 SHA1 b8bb36c336efdb7cefc0a99c4cf9ac749cc6c3c0 SHA256 8e75c4ee11a5f4413da757815364a3ae749b53c241944fff5a50306b3003f891
 EBUILD pidgin-2.7.1.ebuild 5790 RMD160 99ae69219b883d6c2801bfabc56846215a2fe622 SHA1 467e3656ae2a2c75f6470918c9e0df3e384f21d5 SHA256 341d3edf186e7e3615aca9b5d945a1da6d75443cc971175886a54d539dcb1555
-MISC ChangeLog 23709 RMD160 c76118ee673736895c0e08f4291aa4bfbc05c4b5 SHA1 bd0c3cb535a225bf1732bc7585f8e5311036b8c6 SHA256 9cefb27d5f6b8347362578c783263326f648c63442ba7504ff46106965d94ec0
+MISC ChangeLog 23887 RMD160 2c1d9ac3cdd627491c03063fe6564e6a64781a79 SHA1 4ede44b92c3d7c77162283667df030e80ea5b96e SHA256 a3d54b5568cb2f83037026764c5fa636959320a1010a324cdf57312e6ee9c10b
 MISC metadata.xml 1287 RMD160 a4dbdb57292b295718c8925752fd0850056a0393 SHA1 f7ef2c046ed3bfd53a1c3b84e2724e53d3fa823b SHA256 7abefacd8163d7a36506085a0c00f14fcd56eb269e77fda65c81dd5c08fb87e1

diff --git a/net-im/pidgin/pidgin-2.7.1-r1.ebuild b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
index 7af74bf6ec549f639341e69c2b935f11a7c26032..80399a1a14bd2071fdd081e8a28b8afeedfbd36f 100644 (file)
--- a/net-im/pidgin/pidgin-2.7.1-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1-r1.ebuild,v 1.1 2010/06/11 19:48:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1-r1.ebuild,v 1.2 2010/06/14 09:20:24 pva Exp $
 
 EAPI=2
 
@@ -189,17 +189,19 @@ src_configure() {
 
 src_install() {
        gnome2_src_install
-       # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-       # implementations that are not complient with new hicolor theme yet, #323355
-       local pixmapdir
-       for d in 16 22 32 48; do
-               pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-               mkdir "${pixmapdir}" || die
-               pushd "${pixmapdir}" >/dev/null || die
-               for f in ../status/*; do
-                       ln -s ${f} || die
+       if use gtk; then
+               # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+               # implementations that are not complient with new hicolor theme yet, #323355
+               local pixmapdir
+               for d in 16 22 32 48; do
+                       pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+                       mkdir "${pixmapdir}" || die
+                       pushd "${pixmapdir}" >/dev/null || die
+                       for f in ../status/*; do
+                               ln -s ${f} || die
+                       done
+                       popd >/dev/null
                done
-               popd >/dev/null
-       done
+       fi
        use perl && fixlocalpod
 }