Added gtk use flag to make the gtk2-perl dep (and gscriptor GUI) optional.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 35 insertions, 11 deletions

diff --git a/sys-apps/pcsc-tools/ChangeLog b/sys-apps/pcsc-tools/ChangeLog
index 5cd1c877d483..74d4f0140e7e 100644
--- a/sys-apps/pcsc-tools/ChangeLog
+++ b/sys-apps/pcsc-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pcsc-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.4 2009/06/08 02:39:18 nerdboy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.5 2010/06/19 02:13:31 nerdboy Exp $
+
+  19 Jun 2010; Steve Arnold <nerdboy@gentoo.org> pcsc-tools-1.4.15.ebuild,
+  +files/pcsc-tools_no-gtk.patch:
+  Added gtk use flag to make the gtk2-perl dep (and gscriptor GUI) optional
+  per bug 323229.
 
   08 Jun 2009; Steve Arnold <nerdboy@gentoo.org> Manifest:
   Updating manifest for bug #271809.
diff --git a/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch b/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch
new file mode 100644
index 000000000000..1aceed0a55fb
--- /dev/null
+++ b/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch
@@ -0,0 +1,13 @@
+--- Makefile.orig	2008-09-07 04:51:40.000000000 -0700
++++ Makefile	2010-06-17 19:29:39.511217317 -0700
+@@ -17,8 +17,8 @@
+ #LDLIBS=-framework PCSC
+ 
+ BIN=pcsc_scan
+-BIN_SCRIPT=ATR_analysis gscriptor scriptor
+-MAN=pcsc_scan.1.gz gscriptor.1p.gz scriptor.1p.gz ATR_analysis.1p.gz
++BIN_SCRIPT=ATR_analysis scriptor
++MAN=pcsc_scan.1.gz scriptor.1p.gz ATR_analysis.1p.gz
+ 
+ all: $(BIN) $(MAN)
+ 
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild
index ed787746c956..0973d0b638fe 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild,v 1.2 2009/04/05 17:00:48 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild,v 1.3 2010/06/19 02:13:31 nerdboy Exp $
 
 inherit eutils fdo-mime multilib
 
@@ -13,18 +13,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 ## ~arm waiting for keywords
-IUSE="debug usb"
+IUSE="debug gtk usb"
 
 RDEPEND="usb? ( app-crypt/ccid )
 	>=sys-apps/pcsc-lite-1.4.14
 	dev-perl/pcsc-perl
-	dev-perl/gtk2-perl"
+	gtk? ( dev-perl/gtk2-perl )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	local myconf
+	if ! use gtk ; then
+	    epatch "${FILESDIR}"/${PN}_no-gtk.patch
+	fi
 
 	if use debug ; then
 	    sed -i -e "s:-Wall -O2:${CFLAGS}:g" Makefile
@@ -32,6 +34,8 @@ src_compile() {
 	    sed -i -e "s:-Wall -O2 -g:${CFLAGS}:g" Makefile
 	fi
 
+	sed -i -e "s:/usr/local:/usr:" Makefile
+
 	make DESTDIR="${D}usr" all || die
 }
 
@@ -41,10 +45,12 @@ src_install() {
 	# prepalldocs isn't supported any more?
 	dodoc README Changelog
 
-	doicon "${FILESDIR}"/smartcard.svg
-	domenu gscriptor.desktop
-	dosed "s:Categories=Utility;GTK;:Icon=smartcard.svg\\nCategories=System;:g" \
-	    /usr/share/applications/gscriptor.desktop
+	if use gtk ; then
+	    doicon "${FILESDIR}"/smartcard.svg
+	    domenu gscriptor.desktop
+	    dosed "s:Categories=Utility;GTK;:Icon=smartcard.svg\\nCategories=System;:g" \
+	        /usr/share/applications/gscriptor.desktop
+	fi
 
 	insinto /usr/share/pcsc
 	doins "${DISTDIR}"/smartcard_list.txt