Version bump.

(Portage version: 13717-svn/cvs/Linux x86_64)

6 files changed, 21 insertions, 241 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/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() {