From 712ff4e40c84b74146f914a2f4014e6c973738ca Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 29 May 2007 17:15:59 +0000 Subject: Do not install .desktop file if we don't compile GTK UI. (Portage version: 2.1.2.7) --- net-im/pidgin/ChangeLog | 6 +++++- net-im/pidgin/files/pidgin-2.0.1-desktop.patch | 15 +++++++++++++++ net-im/pidgin/pidgin-2.0.1.ebuild | 9 +++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.0.1-desktop.patch (limited to 'net-im') diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index dc97856c635b..330d1c931357 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.14 2007/05/27 20:05:49 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.15 2007/05/29 17:15:59 drizzt Exp $ + + 29 May 2007; Timothy Redaelli + +files/pidgin-2.0.1-desktop.patch, pidgin-2.0.1.ebuild: + Do not install .desktop file if we don't compile GTK UI. 27 May 2007; +files/pidgin-2.0.1-purple-remote-syntax-fix.patch, pidgin-2.0.1.ebuild: diff --git a/net-im/pidgin/files/pidgin-2.0.1-desktop.patch b/net-im/pidgin/files/pidgin-2.0.1-desktop.patch new file mode 100644 index 000000000000..4de3bff28347 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.0.1-desktop.patch @@ -0,0 +1,15 @@ +--- Makefile.am.orig 2007-05-29 18:26:31.000000000 +0200 ++++ Makefile.am 2007-05-29 18:26:58.000000000 +0200 +@@ -29,12 +29,12 @@ + distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm + # cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common + ++if ENABLE_GTK + appsdir = $(datadir)/applications + apps_in_files = pidgin.desktop.in + apps_DATA = $(apps_in_files:.desktop.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ + +-if ENABLE_GTK + GTK_DIR=pidgin + endif \ No newline at end of file diff --git a/net-im/pidgin/pidgin-2.0.1.ebuild b/net-im/pidgin/pidgin-2.0.1.ebuild index bd1944347ad2..d6bd0b04ab4a 100644 --- a/net-im/pidgin/pidgin-2.0.1.ebuild +++ b/net-im/pidgin/pidgin-2.0.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.1.ebuild,v 1.3 2007/05/27 20:05:49 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.1.ebuild,v 1.4 2007/05/29 17:15:59 drizzt Exp $ + +WANT_AUTOMAKE=1.9 inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2 @@ -140,7 +142,7 @@ pkg_setup() { if ! use gtk && ! use ncurses ; then einfo - elog "As you did not pick gtk or console use flag, building" + elog "As you did not pick gtk or ncurses use flag, building" elog "console only." einfo fi @@ -161,6 +163,9 @@ src_unpack() { epatch "${FILESDIR}/${PN}-2.0.0-cchar_t-undeclared.patch" epatch "${FILESDIR}/pidgin-2.0.1-purple-remote-syntax-fix.patch" + epatch "${FILESDIR}/${P}-desktop.patch" + + eautomake } src_compile() { -- cgit v1.2.3-65-gdbad