[gentoo-commits] gentoo-x86 commit in sys-apps/pcsc-tools: pcsc-tools-1.4.16.ebuild ChangeLog

[Diego Petteno (flameeyes)]

flameeyes    10/06/30 01:38:57

  Modified:             pcsc-tools-1.4.16.ebuild ChangeLog
  Log:
  Multiple fixes, partly for QA: fix install with USE=-gtk; avoid patching, both for USE=-gtk and for install paths, by not using the Makefile for install; avoid building the all target (simply build pcsc_scan so that the man pages are not compressed before portage gets to them); don't change the files in src_compile, but still respect the CFLAGS settings; respect CC settings; use emake; update the smartcard_list.txt as we were installing a very old copy; properly move the perl dependencies to runtime rather than build-time and run-time (ccid dependency still sounds shady, but nevermind that for now); drop debug USE flag that simply set a pointless -g; only rebuild mime database when gtk is used (during install; always on remove).
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild?r1=1.1&r2=1.2

Index: pcsc-tools-1.4.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcsc-tools-1.4.16.ebuild	29 Jun 2010 00:29:57 -0000	1.1
+++ pcsc-tools-1.4.16.ebuild	30 Jun 2010 01:38:56 -0000	1.2
@@ -1,65 +1,68 @@
 # 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.16.ebuild,v 1.1 2010/06/29 00:29:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild,v 1.2 2010/06/30 01:38:56 flameeyes Exp $
 
 EAPI="3"
 
-inherit eutils fdo-mime multilib
+SMARTCARD_DATE=20100630
+
+inherit eutils fdo-mime multilib toolchain-funcs
 
 DESCRIPTION="PC/SC Architecture smartcard tools"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
 SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz
-	mirror://gentoo/smartcard_list.txt"
+	mirror://gentoo/${PN}-smartcard_list-${SMARTCARD_DATE}.txt.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 ## ~arm waiting for keywords
-IUSE="debug gtk usb"
+IUSE="gtk usb"
 
-RDEPEND="usb? ( app-crypt/ccid )
-	>=sys-apps/pcsc-lite-1.4.14
-	dev-perl/pcsc-perl
-	gtk? ( dev-perl/gtk2-perl )"
+RDEPEND=">=sys-apps/pcsc-lite-1.4.14"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+	usb? ( app-crypt/ccid )
+	dev-perl/pcsc-perl
+	gtk? ( dev-perl/gtk2-perl )"
 
-src_compile() {
-	if ! use gtk; then
-	    epatch "${FILESDIR}"/${PN}_no-gtk.patch
-	fi
-
-	if use debug; then
-	    sed -i -e "s:-Wall -O2:${CFLAGS}:g" Makefile
-	else
-	    sed -i -e "s:-Wall -O2 -g:${CFLAGS}:g" Makefile
-	fi
-
-	sed -i -e "s:/usr/local:/usr:" Makefile
+src_prepare() {
+	sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile
+}
 
-	make DESTDIR="${D}usr" all || die
+src_compile() {
+	tc-export CC
+	# explicitly only build the pcsc_scan application, or the man
+	# pages will be gzipped first, and then unpacked.
+	emake pcsc_scan || die
 }
 
 src_install() {
-	make DESTDIR="${D}usr" install || die
+	# install manually, makes it much easier since the Makefile
+	# requires fiddling with
+	dobin ATR_analysis scriptor pcsc_scan || die
+	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p || die
 
-	# prepalldocs isn't supported any more?
-	dodoc README Changelog
+	dodoc README Changelog || die
 
 	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
+		doicon "${FILESDIR}"/smartcard.svg
+		domenu gscriptor.desktop
+		dosed "s:Categories=Utility;GTK;:Icon=smartcard.svg\\nCategories=System;:g" \
+			/usr/share/applications/gscriptor.desktop
+
+		dobin gscriptor || die
+		doman gscriptor.1p || die
 	fi
 
 	insinto /usr/share/pcsc
-	doins "${DISTDIR}"/smartcard_list.txt
+	newins "${WORKDIR}"/${PN}-smartcard_list-${SMARTCARD_DATE}.txt smartcard_list.txt || die
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	use gtk && fdo-mime_desktop_database_update
 
 	elog ""
 	elog "If your card reader isn't recognized, you should make sure you"



1.7                  sys-apps/pcsc-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pcsc-tools/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	29 Jun 2010 00:29:57 -0000	1.6
+++ ChangeLog	30 Jun 2010 01:38:56 -0000	1.7
@@ -1,6 +1,20 @@
 # ChangeLog for sys-apps/pcsc-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.6 2010/06/29 00:29:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.7 2010/06/30 01:38:56 flameeyes Exp $
+
+  30 Jun 2010; Diego E. Pettenò <flameeyes@g.o>
+  pcsc-tools-1.4.16.ebuild:
+  Multiple fixes, partly for QA: fix install with USE=-gtk; avoid patching,
+  both for USE=-gtk and for install paths, by not using the Makefile for
+  install; avoid building the all target (simply build pcsc_scan so that the
+  man pages are not compressed before portage gets to them); don't change
+  the files in src_compile, but still respect the CFLAGS settings; respect
+  CC settings; use emake; update the smartcard_list.txt as we were
+  installing a very old copy; properly move the perl dependencies to runtime
+  rather than build-time and run-time (ccid dependency still sounds shady,
+  but nevermind that for now); drop debug USE flag that simply set a
+  pointless -g; only rebuild mime database when gtk is used (during install;
+  always on remove).
 
 *pcsc-tools-1.4.16 (29 Jun 2010)