Add a 'compat' USE-flag for gdialog; removes perl rdepend. Helps in cross-compiling.

(Portage version: 2.1.7.17/cvs/Linux i686)

3 files changed, 26 insertions, 5 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index 78222f25e585..b1860696d547 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.178 2010/01/18 00:18:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.179 2010/02/07 19:19:28 nirbheek Exp $
+
+*zenity-2.28.0-r1 (07 Feb 2010)
+
+  07 Feb 2010; Nirbheek Chauhan <nirbheek@gentoo.org> -zenity-2.28.0.ebuild,
+  +zenity-2.28.0-r1.ebuild, metadata.xml:
+  Add a 'compat' USE-flag for gdialog; removes perl rdepend. Helps in
+  cross-compiling.
 
   18 Jan 2010; Jeroen Roovers <jer@gentoo.org> zenity-2.26.0.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
index da6fd63d0085..a7293fcdc37c 100644
--- a/gnome-extra/zenity/metadata.xml
+++ b/gnome-extra/zenity/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="compat">Installs gdialog for compatibility with older shell
+			scripts which uses <pkg>dev-lang/perl</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-2.28.0.ebuild b/gnome-extra/zenity/zenity-2.28.0-r1.ebuild
index 1cce87756498..ad597f2ed5e5 100644
--- a/gnome-extra/zenity/zenity-2.28.0.ebuild
+++ b/gnome-extra/zenity/zenity-2.28.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.28.0.ebuild,v 1.2 2010/01/07 21:42:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.28.0-r1.ebuild,v 1.1 2010/02/07 19:19:28 nirbheek Exp $
+
+EAPI="1"
 
 inherit gnome2
 
@@ -10,11 +12,11 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify"
+IUSE="+compat libnotify"
 
 RDEPEND=">=x11-libs/gtk+-2.15.2
 	>=dev-libs/glib-2.8
-	>=dev-lang/perl-5
+	compat? ( >=dev-lang/perl-5 )
 	libnotify? ( >=x11-libs/libnotify-0.4.1 )"
 
 DEPEND="${RDEPEND}
@@ -32,3 +34,11 @@ pkg_setup() {
 		--disable-scrollkeeper
 		$(use_enable libnotify)"
 }
+
+src_install() {
+	gnome2_src_install
+
+	if ! use compat; then
+		rm "${D}/usr/bin/gdialog" || die "rm gdialog failed!"
+	fi
+}