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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 13 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/Manifest b/sys-apps/pcsc-tools/Manifest
index 94de4004885d..e778daba5c58 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,6 +1,7 @@
+AUX pcsc-tools_no-gtk.patch 389 RMD160 c38bfb64b561deb5cab0159a48e1092a5094ee06 SHA1 55e2eea17fea6a78beb6bf77c9a29659d6e07c04 SHA256 6d3befa993e1b7e866f3060b961b7c60b0b4f5017b77ab8355a8ef48137a2a7e
 AUX smartcard.svg 13308 RMD160 0ac4082b8e27b9ec661e70328e964d32a70b4ea7 SHA1 db036b0bb1f98fd363262faa3b5435c705f78715 SHA256 ad846a422e0ca0967a4bbee57c61c9b481df4559470ea6145d0cc7cfd502dc5b
 DIST pcsc-tools-1.4.15.tar.gz 64090 RMD160 e5f278a43cf138a6bcdaa1ac478d64fb123bab5b SHA1 cdc37f7763ebeb927487585d4eecd84d8e366421 SHA256 a46ade975d4dd5722e9f087bbb26410f2eda5d889d078d0d5eeee15b9133e4b6
 DIST smartcard_list.txt 74636 RMD160 ce99dd5df9a33b185bf40afb03e4cfa6a358be78 SHA1 5dfd096fee336b6e226e07478829a02a49920163 SHA256 2e0ae30bc772d1631c47388ff53b841b76a14543c0547da53826923067af238b
-EBUILD pcsc-tools-1.4.15.ebuild 1890 RMD160 22034de18188de3789e6c3cb961a69ecaa777eb7 SHA1 f5074dda857e3e5d615fb58b8dd4f16f9414e858 SHA256 c40ffb10bc3c0c2baa449fabff5aa571c4efa6593cd1be85df27e82804a7a8b4
-MISC ChangeLog 1380 RMD160 c7a0e77225d587018d3a3ffbb16c72375c607fa3 SHA1 ee6e3857b2d8311e980b0f40ef66f815d0a887d7 SHA256 448b79a8769d84ffd05f68a248c14ab6dfbcc67b244ddad5fd8e48200691f466
+EBUILD pcsc-tools-1.4.15.ebuild 2040 RMD160 eada583398f983da538f6708c64a439ea19c0d5d SHA1 a8c489170df375fba57e9854d9e91e9f29b5460d SHA256 e08a2276d736bbe759fa0cd111c5c3c91da54aabcc1b2cae0a77b75e14979abe
+MISC ChangeLog 1584 RMD160 6731a3f98039975ab129752b808d42b053e08df8 SHA1 cfbffaec1565f780b1ec49531742c7b6e5212455 SHA256 76031fd5a127622c0cad6b814f6901b74c7664d0066808159fd9bda37c370dea
 MISC metadata.xml 392 RMD160 a0b7f7f213da5f7b7f79ba13a1cd4df444558d33 SHA1 d38241d582bb438599511cddce5fe51df301505c SHA256 698922e4324835d3a61042acffd70999ca6e1b1486a2347a16aabf0062a6c42e
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