Version bump.

Package-Manager: portage-13717-svn/cvs/Linux x86_64

7 files changed, 24 insertions, 252 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index d78fd377c8d5..fea56c647c81 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.69 2009/06/15 03:25:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.70 2009/06/28 11:06:21 arfrever Exp $
+
+*pcsc-lite-1.5.4 (28 Jun 2009)
+
+  28 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pcsc-lite-1.4.2.ebuild, -pcsc-lite-1.4.4.ebuild,
+  -pcsc-lite-1.4.99.ebuild, -pcsc-lite-1.4.102.ebuild,
+  -pcsc-lite-1.5.2.ebuild, +pcsc-lite-1.5.4.ebuild:
+  Version bump.
 
   15 Jun 2009; Jeroen Roovers <jer@gentoo.org> pcsc-lite-1.5.3.ebuild:
   Stable for HPPA (bug #271911).
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index f873b3e5264b..f81b786485e9 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,16 +1,8 @@
 AUX pcscd-confd 84 RMD160 02f722d5cae6dc5c160a76e923a7e23964b3fe83 SHA1 6cbb6873928d87b7ce02292075fbe56d791f3e18 SHA256 b2ca734ebf73e367f24434895935e6215582a104bc7924d1d02af0d74877322b
 AUX pcscd-init 567 RMD160 e919fea24e9003edaea0763c4f310cfb20dc4462 SHA1 865696383095191ce9c3c0db0ff1b43309467c67 SHA256 71d043ced8f70939f569f48677ed6ad544876389a79a96d0277c4c29b7a81755
-DIST pcsc-lite-1.4.102.tar.bz2 460324 RMD160 a99730a937515885200f71d36cfdf1c2ff6768ce SHA1 bd7cf389e99de0960cc0b21758a4ca65eb8b65ac SHA256 56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333
-DIST pcsc-lite-1.4.2.tar.gz 624242 RMD160 9bb5bcf3d376ce9e470e0e0cf64e902100de8ad8 SHA1 9532cbd1e151289cbec9e3a3cb6f9b2cd1d25d53 SHA256 a56195b1999e5401df17b62c53944204393ec3e3759699fa00633d8f94bb6570
-DIST pcsc-lite-1.4.4.tar.gz 627128 RMD160 2feb7f76e19a30984897cf614846c00203d5a063 SHA1 2f5eb95b3acc2a3e32bf73d52c0c3fe991bb24aa SHA256 9d48114ced4e32f60668f7db72231b5ce9104e460269f72f378e2fec7575291d
-DIST pcsc-lite-1.4.99.tar.gz 637727 RMD160 689d99ae26a13dc78856670b0deafbd5fed517ab SHA1 7f5ff7d8e187c1d46f3bc26567d393107ac0e362 SHA256 630adc2e9b62168c9735395c8f39c63284112e431ca6f550b06d97d37edfc519
-DIST pcsc-lite-1.5.2.tar.bz2 467157 RMD160 1e73e088a58c6713e3af23afbe47e39fffbc2264 SHA1 179d84193c215b770ad1d932b1185d29799ec0ad SHA256 a0c11b0b5cc46d4c4ec499b875cfdc4e766fdf12fe2f6ea635e1b11ab7b8821e
 DIST pcsc-lite-1.5.3.tar.bz2 469752 RMD160 b3ae810be8f15701e0ec815308990e96716bda7d SHA1 00b936acbfd14686eba66c26e00cd86c811ab78a SHA256 2dd18024f5730587cbfac04da8fd57b8910ce79e4e98f5a311f72e797f0485dd
-EBUILD pcsc-lite-1.4.102.ebuild 1871 RMD160 29d234dc2b4828f8c69e8f22edae70ca9d7ffe90 SHA1 ee84c8ae5eca1ff5e655bc0156efc3a89430935e SHA256 6eb92e838c98af16f235266d5dc070216d7d2d637bbfbe37a8be0d9c1bae6332
-EBUILD pcsc-lite-1.4.2.ebuild 1297 RMD160 3aa46024eb222d08d0b40a38baab837fb4f55081 SHA1 80648c0c7462ebb76fec28dfc859df7a1ca175e4 SHA256 9103a108ce917d140d1f9ebb1439a9bef45abced0bcb5d0860490249fec6680b
-EBUILD pcsc-lite-1.4.4.ebuild 1309 RMD160 4525f57b7d798ac54be111dfff762c4d4a206479 SHA1 bfe3de1e013b4791b5c50f029057d1a3927f07be SHA256 3f1ee8709a07f7dc9a86a84a27bc93b8bc285bcad8abd71d0d830cc8f8666356
-EBUILD pcsc-lite-1.4.99.ebuild 1310 RMD160 0a7b41019883382607d9c495f3631d1ba3735348 SHA1 4d57ca49ff4ec8ee917ef1fb0547885bae180291 SHA256 cd77c8cc3a2317cea80ff16aca564df19e3983f00d06aabb6951e5cc70a0216e
-EBUILD pcsc-lite-1.5.2.ebuild 1878 RMD160 30f2e2f804189e89cd8978a1d9d427949e0ea873 SHA1 7e7073c450589d90283ef0ac2ef0fd8f25699e6b SHA256 1dddff2a0b43c2155d638b7d4c5742555e715f9b0224cf4919887bb5e8e515d1
+DIST pcsc-lite-1.5.4.tar.bz2 464524 RMD160 f41f5f291346b016a137fbcddcfbb8051958a80a SHA1 00527ccea75abe171245b6b699d617995d61ddbc SHA256 1ba02b420ce73461655c3e62f1a5fec685c02e902ec8785cff33d4451897c71d
 EBUILD pcsc-lite-1.5.3.ebuild 1753 RMD160 cb5fca93d6c6cb685bc54831bec04d368fdb6a87 SHA1 c8f1956bd3dbd1c67cd6e3e83b96bfddcced7e58 SHA256 ed478302849750609134ea30426b055e405014b28d753122b95f12b9c00b6ad4
-MISC ChangeLog 8932 RMD160 79b443a781254e3d19890e3809d718d95a3c056c SHA1 5d4eafee4406d8abe1a281a9fd9bd666ded1af6b SHA256 36c428cdb1611126078291ca36eeeff6717e3089690d42403d3ebf8df346201f
+EBUILD pcsc-lite-1.5.4.ebuild 1699 RMD160 0e051623b9883f9155303d5ff5d768e41800179f SHA1 564a7277c6c94f487cf54d354a4cfded13cc7f7c SHA256 d6a7f2aefe429870227eec4a66d6495cf3b5808788cacccffe7dcdb4bde7963d
+MISC ChangeLog 9218 RMD160 6f983947d551196155b2aa04534607db31a6b4a6 SHA1 b8728a08a2b527dfd0d4315f2021f51cbcdff779 SHA256 9b909f5d6a71ac89d351a316a9337ed3658bc55c5579da4a9be580b22c72542a
 MISC metadata.xml 244 RMD160 9a9367ba3a24404b82d10ffe6493dbe43dfcb718 SHA1 b609f191e50f68af8331dfd824a8d72d48fd3ac0 SHA256 b93928eec206138ccf14d2c0dd1ebd2bbbf1cda0b8b69f540eb7f17e729cb5bf
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild
deleted file mode 100644
index 4ce241e6e782..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild,v 1.4 2009/05/16 08:51:43 robbat2 Exp $
-
-inherit multilib
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://www.linuxnet.com/middle.html"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion autotools
-	ESVN_REPO_URI="svn://svn.debian.org/pcsclite/trunk"
-	S="${WORKDIR}/trunk"
-else
-	STUPID_NUM="2479"
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="static debug usb hal"
-
-RDEPEND="usb? ( =virtual/libusb-0* )
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use hal && use usb; then
-		ewarn "The usb and hal useflag can not be enabled at the same time"
-		ewarn "Disabling the effect of USE=usb"
-	fi
-}
-
-src_unpack() {
-	if [ "${PV}" != "9999" ]; then
-		unpack ${A}
-		cd "${S}"
-	else
-		subversion_src_unpack
-		S="${WORKDIR}/trunk/PCSC"
-		cd "${S}"
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_compile() {
-	local myconf
-	if use hal; then
-		myconf="--enable-libhal --disable-usb"
-	else
-		myconf="--disable-libhal $(use_enable usb libusb)"
-	fi
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		--enable-muscledropdir="/usr/share/pcsc/services" \
-		--enable-runpid="/var/run/pcscd.pid" \
-		${myconf} \
-		$(use_enable debug) \
-		$(use_enable static) \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	prepalldocs
-
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-
-	newinitd "${FILESDIR}/pcscd-init" pcscd
-	newconfd "${FILESDIR}/pcscd-confd" pcscd
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.4.2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.4.2.ebuild
deleted file mode 100644
index 90f9d130d7ba..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.2.ebuild,v 1.10 2009/05/16 08:51:43 robbat2 Exp $
-
-inherit multilib
-
-STUPID_NUM="1977"
-MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://www.linuxnet.com/middle.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE="static debug"
-
-RDEPEND="!static? ( =virtual/libusb-0* )"
-DEPEND="=virtual/libusb-0*
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		--enable-muscledropdir="/usr/share/pcsc/services" \
-		--enable-runpid="/var/run/pcscd.pid" \
-		$(use_enable debug) \
-		$(use_enable static) \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS DRIVERS HELP INSTALL README SECURITY
-	prepalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init pcscd
-	newconfd "${FILESDIR}"/pcscd-confd pcscd
-}
-
-pkg_postinst() {
-	ewarn "You should run 'revdep-rebuild --library libpcsclite.so.0'"
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.4.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.4.4.ebuild
deleted file mode 100644
index 6afd1b62b574..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.4.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.4.ebuild,v 1.3 2009/05/16 08:51:43 robbat2 Exp $
-
-inherit multilib
-
-STUPID_NUM="2106"
-MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://www.linuxnet.com/middle.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static debug"
-
-RDEPEND="!static? ( =virtual/libusb-0* )"
-DEPEND="=virtual/libusb-0*
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		--enable-muscledropdir="/usr/share/pcsc/services" \
-		--enable-runpid="/var/run/pcscd.pid" \
-		$(use_enable debug) \
-		$(use_enable static) \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-	prepalldocs
-
-	newinitd "${FILESDIR}/pcscd-init" pcscd
-	newconfd "${FILESDIR}/pcscd-confd" pcscd
-}
-
-pkg_postinst() {
-	ewarn "You should run 'revdep-rebuild --library libpcsclite.so.0'"
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.4.99.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.4.99.ebuild
deleted file mode 100644
index 99e6a55eb7fa..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.4.99.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.99.ebuild,v 1.2 2009/05/16 08:51:43 robbat2 Exp $
-
-inherit multilib
-
-STUPID_NUM="2257"
-MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://www.linuxnet.com/middle.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static debug"
-
-RDEPEND="!static? ( =virtual/libusb-0* )"
-DEPEND="=virtual/libusb-0*
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		--enable-muscledropdir="/usr/share/pcsc/services" \
-		--enable-runpid="/var/run/pcscd.pid" \
-		$(use_enable debug) \
-		$(use_enable static) \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-	prepalldocs
-
-	newinitd "${FILESDIR}/pcscd-init" pcscd
-	newconfd "${FILESDIR}/pcscd-confd" pcscd
-}
-
-pkg_postinst() {
-	ewarn "You should run 'revdep-rebuild --library libpcsclite.so.0'"
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.5.2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.5.4.ebuild
index 5dab37e099e6..381e3416d90d 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.5.2.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.5.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.5.2.ebuild,v 1.2 2009/05/16 08:51:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.5.4.ebuild,v 1.1 2009/06/28 11:06:21 arfrever Exp $
+
+EAPI="2"
 
 inherit multilib
 
@@ -12,7 +14,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="svn://svn.debian.org/pcsclite/trunk"
 	S="${WORKDIR}/trunk"
 else
-	STUPID_NUM="2795"
+	STUPID_NUM="3052"
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
@@ -20,8 +22,8 @@ fi
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug hal static usb"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="hal static usb"
 
 RDEPEND="usb? ( =virtual/libusb-0* )
 	hal? ( sys-apps/hal )"
@@ -35,22 +37,18 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	if [ "${PV}" != "9999" ]; then
-		unpack ${A}
-		cd "${S}"
-	else
-		subversion_src_unpack
+if [[ "${PV}" == "9999" ]]; then
+	src_prepare() {
 		S="${WORKDIR}/trunk/PCSC"
 		cd "${S}"
 		AT_M4DIR="m4" eautoreconf
-	fi
-}
+	}
+fi
 
-src_compile() {
+src_configure() {
 	local myconf
 	if use hal; then
-		myconf="--enable-libhal --disable-usb"
+		myconf="--enable-libhal --disable-libusb"
 	else
 		myconf="--disable-libhal $(use_enable usb libusb)"
 	fi
@@ -58,12 +56,8 @@ src_compile() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		--enable-muscledropdir="/usr/share/pcsc/services" \
-		--enable-runpid="/var/run/pcscd.pid" \
 		${myconf} \
-		$(use_enable debug) \
 		$(use_enable static)
-	emake || die "emake failed"
 }
 
 src_install() {