From: Diego Elio Pettenò Date: Wed, 30 Jun 2010 01:38:56 +0000 (+0000) Subject: Multiple fixes, partly for QA: fix install with USE=-gtk; avoid patching, both for... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9cb3c0a825797a847092232a1b0ad8b5fa83ac32;p=gentoo.git 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). Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/sys-apps/pcsc-tools/ChangeLog b/sys-apps/pcsc-tools/ChangeLog index f0a70d98aedf..f9e575c52a0a 100644 --- a/sys-apps/pcsc-tools/ChangeLog +++ b/sys-apps/pcsc-tools/ChangeLog @@ -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ò + 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) diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest index da3ac80a7830..ff1d55f29780 100644 --- a/sys-apps/pcsc-tools/Manifest +++ b/sys-apps/pcsc-tools/Manifest @@ -1,9 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 pcsc-tools-1.4.16.tar.gz 78732 RMD160 e01517259bf3c24cb8fe38529cea9dbd6cdeeb24 SHA1 10dffcee881f3846420d267e755e84d31c8d69e6 SHA256 dd86355430d39f3a15da1e9d1c65779c75a237b87c7ee9cb30badbc283e253fa +DIST pcsc-tools-smartcard_list-20100630.txt.bz2 28367 RMD160 49807b37b8ed33730815c019acee440b4f0be9ad SHA1 af58897307652f92a1d0b258f846b9e3262ebcb1 SHA256 0bb7319f3e7db9f4ea7b2814eff763825aa2228c87b5aa29211ff31742ea61fd DIST smartcard_list.txt 74636 RMD160 ce99dd5df9a33b185bf40afb03e4cfa6a358be78 SHA1 5dfd096fee336b6e226e07478829a02a49920163 SHA256 2e0ae30bc772d1631c47388ff53b841b76a14543c0547da53826923067af238b EBUILD pcsc-tools-1.4.15.ebuild 2040 RMD160 eada583398f983da538f6708c64a439ea19c0d5d SHA1 a8c489170df375fba57e9854d9e91e9f29b5460d SHA256 e08a2276d736bbe759fa0cd111c5c3c91da54aabcc1b2cae0a77b75e14979abe -EBUILD pcsc-tools-1.4.16.ebuild 2048 RMD160 b833f90fbc8544556784929bc046c1a419494879 SHA1 75a8dffe877534495d6bb041d84b2d252ac934a5 SHA256 226cc5b7bd91a079e7c5930aead39fff3b16b4c7cce6d4a920678499191bbafb -MISC ChangeLog 1738 RMD160 0b986dfcd0e95f992d9c856defa21b665d4b0047 SHA1 fbd15b81ae71372f2e4bf443283d93224effdd1a SHA256 f29f58abe4d740d509f34002190f19dea1cb6cccf3a108c84cde99ea7f8ed805 +EBUILD pcsc-tools-1.4.16.ebuild 2284 RMD160 3a17ce2790e9336abb75688320e964b1b5ceef28 SHA1 ab0b5cf1f60b284e909f805d2ac8e01572f50d09 SHA256 f12e76110277fb54682041edddc0d897bbfb85859ddefcbf3c86326eb5767cf5 +MISC ChangeLog 2585 RMD160 2586e1223440bdb2df19b2accedee30c2227036b SHA1 bd92f7e52fe5852396fa560ad0b8745670ed7ccc SHA256 ce986da209d409b1ddd5e437acc2d4fb0b7bef3800c69033d97dd2a6480482f2 MISC metadata.xml 392 RMD160 a0b7f7f213da5f7b7f79ba13a1cd4df444558d33 SHA1 d38241d582bb438599511cddce5fe51df301505c SHA256 698922e4324835d3a61042acffd70999ca6e1b1486a2347a16aabf0062a6c42e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwqoEMACgkQAiZjviIA2XgJxQCgyGoPeibM7uyA3mOj8/MEquLM +ha4An1aHWHibORrNzokH3pgv2UgBtZxm +=Moze +-----END PGP SIGNATURE----- diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild index 2bdcb665c185..36de30a4d8cd 100644 --- a/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild +++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild @@ -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"