version bump, removed old versions. also fixes bug #227539.

(Portage version: 2.2_rc50/cvs/Linux x86_64)

11 files changed, 82 insertions, 331 deletions

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index 399a0d216e74..9617ad5d69e6 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/cyberjack
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.9 2009/05/16 09:22:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.10 2009/11/19 23:20:21 wschlich Exp $
+
+*cyberjack-3.3.2 (19 Nov 2009)
+
+  19 Nov 2009; Wolfram Schlich <wschlich@gentoo.org>
+  -files/91-cyberjack.rules, -cyberjack-2.0.13.ebuild,
+  -files/cyberjack-2.0.13-build.patch, -files/cyberjack-2.0.13-qa.patch,
+  -files/cyberjack-2.0.13-udev.patch, -cyberjack-2.0.14_beta1.ebuild,
+  -cyberjack-3.0.4.ebuild, -files/cyberjack-3.0.4-udev.patch,
+  +cyberjack-3.3.2.ebuild, +files/cyberjack-3.3.2-nohal.patch,
+  +files/cyberjack-3.3.2-nopcsc.patch, +files/cyberjack-3.3.2-udev.patch:
+  version bump, removed old versions. also fixes bug #227539.
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org>
   cyberjack-2.0.13.ebuild, cyberjack-2.0.14_beta1.ebuild,
diff --git a/dev-libs/cyberjack/cyberjack-2.0.13.ebuild b/dev-libs/cyberjack/cyberjack-2.0.13.ebuild
deleted file mode 100644
index 4223408ad997..000000000000
--- a/dev-libs/cyberjack/cyberjack-2.0.13.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-2.0.13.ebuild,v 1.5 2009/05/16 09:22:27 robbat2 Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P="ctapi-${P}"
-
-DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/ http://sourceforge.net/projects/libchipcard/"
-SRC_URI="mirror://sourceforge/libchipcard/${MY_P}.tar.gz
-	http://support.reiner-sct.de/downloads/LINUX/V${PV}/${MY_P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="noudev pcsc-lite"
-
-RDEPEND="=virtual/libusb-0*
-	pcsc-lite? ( sys-apps/pcsc-lite )"
-DEPEND="${RDEPEND}
-	pcsc-lite? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	useq noudev || enewgroup "${PN}"
-}
-
-src_unpack() {
-	unpack ${A} || die "Unpacking failed."
-	cd "${S}" || die "Failed to change to source directory."
-	epatch "${FILESDIR}/${P}-build.patch" || die "Applying build patch failed."
-	epatch "${FILESDIR}/${P}-qa.patch" || die "Applying QA patch failed."
-	useq noudev || {
-		epatch "${FILESDIR}/${P}-udev.patch" || die "Applying udev patch failed."
-		cp ${FILESDIR}/cyberjack.sh etc/udev/ || die "Copying udev script failed."
-		cp ${FILESDIR}/91-cyberjack.rules etc/udev/ || die "Copying udev rules failed."
-	}
-	AT_M4DIR="m4" eautoreconf || die "Adopting configurations failed."
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	local with_usbdropdir=''
-	useq pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
-	./configure \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/"${P}" \
-		--sysconfdir=/etc/"${PN}" \
-		$(use_enable pcsc-lite pcsc) \
-		${with_usbdropdir} \
-		$(use_enable !noudev udev) \
-		|| die "Configuration of package failed."
-	emake || die "Compilation of package failed."
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Installation of package failed."
-	dodoc ChangeLog NEWS README TODO tools/ctshrc.example
-
-	# remove development files
-	rm -rf "${D}"/usr/include/ \
-		"${D}"/usr/lib/*.la \
-		"${D}"/usr/lib/readers/usb/ifd-"${PN}".bundle/Contents/Linux/*.la
-}
-
-pkg_postinst() {
-	local conf="/etc/${PN}/${PN}.conf"
-	elog
-	elog "To configure logging, key beep behaviour etc. you need to"
-	elog "copy ${conf}.default"
-	elog "to ${conf}"
-	elog "and modify the latter as needed."
-	elog
-	useq noudev || {
-		elog "Please run the following command as root to"
-		elog "make udevd read the cyberJack rules that were"
-		elog "just installed onto your system:"
-		elog
-		elog "  udevcontrol reload_rules"
-		elog
-		elog "To be able to use the cyberJack device, you need to"
-		elog "be a member of the group 'cyberjack' which has just"
-		elog "been added to your system. You can add your user to"
-		elog "the group by running the following command as root:"
-		elog
-		elog "  gpasswd -a youruser cyberjack"
-		elog
-		elog "Please be aware that you need to re-login to your"
-		elog "system for the group membership to take effect."
-		elog
-	}
-}
diff --git a/dev-libs/cyberjack/cyberjack-2.0.14_beta1.ebuild b/dev-libs/cyberjack/cyberjack-2.0.14_beta1.ebuild
deleted file mode 100644
index 3e075369fb88..000000000000
--- a/dev-libs/cyberjack/cyberjack-2.0.14_beta1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-2.0.14_beta1.ebuild,v 1.3 2009/05/16 09:22:27 robbat2 Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P="ctapi-${P/_/}"
-
-DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/ http://sourceforge.net/projects/libchipcard/"
-SRC_URI="mirror://sourceforge/libchipcard/${MY_P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="noudev pcsc-lite"
-
-RDEPEND="=virtual/libusb-0*
-	pcsc-lite? ( sys-apps/pcsc-lite )"
-DEPEND="${RDEPEND}
-	pcsc-lite? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	useq noudev || enewgroup "${PN}"
-}
-
-src_unpack() {
-	unpack ${A} || die "Unpacking failed."
-	cd "${S}" || die "Failed to change to source directory."
-	useq noudev || {
-		epatch "${FILESDIR}/${PN}-2.0.13-udev.patch" || die "Applying udev patch failed."
-		cp ${FILESDIR}/cyberjack.sh etc/udev/ || die "Copying udev script failed."
-		cp ${FILESDIR}/91-cyberjack.rules etc/udev/ || die "Copying udev rules failed."
-	}
-	AT_M4DIR="m4" eautoreconf || die "Adopting configurations failed."
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	local with_usbdropdir=''
-	useq pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
-	./configure \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/"${P}" \
-		--sysconfdir=/etc/"${PN}" \
-		$(use_enable pcsc-lite pcsc) \
-		${with_usbdropdir} \
-		$(use_enable !noudev udev) \
-		|| die "Configuration of package failed."
-	emake || die "Compilation of package failed."
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Installation of package failed."
-	dodoc ChangeLog NEWS README TODO tools/ctshrc.example
-
-	# remove development files
-	rm -rf "${D}"/usr/include/ \
-		"${D}"/usr/lib/*.la \
-		"${D}"/usr/lib/readers/usb/ifd-"${PN}".bundle/Contents/Linux/*.la
-}
-
-pkg_postinst() {
-	local conf="/etc/${PN}/${PN}.conf"
-	elog
-	elog "To configure logging, key beep behaviour etc. you need to"
-	elog "copy ${conf}.default"
-	elog "to ${conf}"
-	elog "and modify the latter as needed."
-	elog
-	useq noudev || {
-		elog "Please run the following command as root to"
-		elog "make udevd read the cyberJack rules that were"
-		elog "just installed onto your system:"
-		elog
-		elog "  udevcontrol reload_rules"
-		elog
-		elog "To be able to use the cyberJack device, you need to"
-		elog "be a member of the group 'cyberjack' which has just"
-		elog "been added to your system. You can add your user to"
-		elog "the group by running the following command as root:"
-		elog
-		elog "  gpasswd -a youruser cyberjack"
-		elog
-		elog "Please be aware that you need to re-login to your"
-		elog "system for the group membership to take effect."
-		elog
-	}
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.0.4.ebuild b/dev-libs/cyberjack/cyberjack-3.3.2.ebuild
index 19a1fd4471b0..be1eaa2377fb 100644
--- a/dev-libs/cyberjack/cyberjack-3.0.4.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.3.2.ebuild
@@ -1,59 +1,66 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.0.4.ebuild,v 1.3 2009/05/16 09:22:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.3.2.ebuild,v 1.1 2009/11/19 23:20:21 wschlich Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic autotools
 
-MY_P="ctapi-${P/_/}"
+MY_P="ctapi-${P}"
 
 DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/ http://sourceforge.net/projects/libchipcard/"
-SRC_URI="mirror://sourceforge/libchipcard/${MY_P}.tar.gz"
+HOMEPAGE="http://www.reiner-sct.de/ http://www.libchipcard.de/"
+SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="noudev pcsc-lite"
+IUSE="noudev pcsc-lite hal"
 
-RDEPEND="=virtual/libusb-0*
+RDEPEND="dev-libs/libusb
+	sys-fs/sysfsutils
+	hal? ( sys-apps/hal )
 	pcsc-lite? ( sys-apps/pcsc-lite	)"
+
 DEPEND="${RDEPEND}
 	pcsc-lite? ( dev-util/pkgconfig )"
 
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	useq noudev || enewgroup "${PN}"
+	use noudev || enewgroup "${PN}"
 }
 
-src_unpack() {
-	unpack ${A} || die "Unpacking failed."
-	cd "${S}" || die "Failed to change to source directory."
-	useq noudev || {
-		epatch "${FILESDIR}/${P}-udev.patch" || die "Applying udev patch failed."
-		cp ${FILESDIR}/cyberjack.sh etc/udev/ || die "Copying udev script failed."
-		cp ${FILESDIR}/cyberjack.rules etc/udev/rules.new || die "Copying udev rules failed."
-	}
+src_prepare() {
+	if ! use noudev; then
+		epatch "${FILESDIR}"/"${P}"-udev.patch || die "Applying udev patch failed."
+		cp "${FILESDIR}"/cyberjack.sh etc/udev/ || die "Copying udev script failed."
+		cp "${FILESDIR}"/cyberjack.rules etc/udev/rules.new || die "Copying udev rules failed."
+	fi
+	use hal || epatch "${FILESDIR}"/"${P}"-nohal.patch || die "Applying nohal patch failed."
+	use pcsc-lite || epatch "${FILESDIR}"/"${P}"-nopcsc.patch || die "Applying nohal patch failed."
 	AT_M4DIR="m4" eautoreconf || die "Adopting configurations failed."
 }
 
-src_compile() {
+src_configure() {
 	append-flags -fno-strict-aliasing
 	local with_usbdropdir=''
-	useq pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
-	./configure \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/"${P}" \
+	use pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
+	econf \
 		--sysconfdir=/etc/"${PN}" \
 		$(use_enable pcsc-lite pcsc) \
 		${with_usbdropdir} \
 		$(use_enable !noudev udev) \
 		|| die "Configuration of package failed."
+}
+
+src_compile() {
 	emake || die "Compilation of package failed."
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "Installation of package failed."
 	dodoc ChangeLog NEWS doc/README.txt
+	use noudev || rm -rf "${D}"/usr/hotplug
 }
 
 pkg_postinst() {
@@ -64,13 +71,7 @@ pkg_postinst() {
 	elog "to ${conf}"
 	elog "and modify the latter as needed."
 	elog
-	useq noudev || {
-		elog "Please run the following command as root to"
-		elog "make udevd read the cyberJack rules that were"
-		elog "just installed onto your system:"
-		elog
-		elog "  udevcontrol reload_rules"
-		elog
+	if ! use noudev; then
 		elog "To be able to use the cyberJack device, you need to"
 		elog "be a member of the group 'cyberjack' which has just"
 		elog "been added to your system. You can add your user to"
@@ -81,5 +82,5 @@ pkg_postinst() {
 		elog "Please be aware that you need to re-login to your"
 		elog "system for the group membership to take effect."
 		elog
-	}
+	fi
 }
diff --git a/dev-libs/cyberjack/files/91-cyberjack.rules b/dev-libs/cyberjack/files/91-cyberjack.rules
deleted file mode 100644
index e75c9f64466a..000000000000
--- a/dev-libs/cyberjack/files/91-cyberjack.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# using the cyberJack libusb driver
-ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="c4b/100/*", RUN+="cyberjack.sh"
-ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="c4b/300/*", RUN+="cyberjack.sh"
-# using the cyberJack kernel module
-ACTION=="add", SUBSYSTEM=="tty", DRIVERS=="cyberjack", RUN+="cyberjack.sh"
diff --git a/dev-libs/cyberjack/files/cyberjack-2.0.13-build.patch b/dev-libs/cyberjack/files/cyberjack-2.0.13-build.patch
deleted file mode 100644
index 6515ba2bc7a8..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-2.0.13-build.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urNp ctapi-cyberjack-2.0.13.org/configure.ac ctapi-cyberjack-2.0.13/configure.ac
---- ctapi-cyberjack-2.0.13.org/configure.ac	2007-01-09 08:51:18.000000000 +0100
-+++ ctapi-cyberjack-2.0.13/configure.ac	2007-01-20 01:21:30.000000000 +0100
-@@ -284,7 +284,24 @@ fi
- AC_SUBST(STRIPALL)
- AC_MSG_RESULT($enable_release)
- 
--
-+AC_ARG_ENABLE(udev,
-+  [  --enable-udev         create udev files],
-+  [ ENABLE_UDEV="${enableval}" ],
-+  [ ENABLE_UDEV="yes" ]
-+)
-+AM_CONDITIONAL(UDEV, test "${ENABLE_UDEV}" = "yes")
-+AC_ARG_ENABLE(pcsc,
-+  [  --enable-pcsc          create pcsc files],
-+  [ ENABLE_PCSC="${enableval}" ],
-+  [ ENABLE_PCSC="yes" ]
-+)
-+AM_CONDITIONAL(PCSC, test "${ENABLE_PCSC}" = "yes")
-+AC_ARG_WITH(usbdropdir,
-+  [  --with-usbdropdir       pcsc bundle location],
-+  [ usbdropdir="${withval}" ],
-+  [ usbdropdir="\$(libdir)/pcsc/drivers" ]
-+)
-+AC_SUBST(usbdropdir)
- 
- ###-------------------------------------------------------------------------
- #
-@@ -374,7 +391,11 @@ RPM_COMMAND="`which rpm`"
- RPM_DIST_NAME=""
- RPM_DIST_TAG=""
- RPM_DIST_VER=""
--ETC_SUBDIRS="udev"
-+if test "$ENABLE_UDEV" = "yes"; then
-+  ETC_SUBDIRS="udev"
-+else
-+  ETC_SUBDIRS=""
-+fi
- USE_HOTPLUG=0
- USE_UDEV=0
- 
-diff -urNp ctapi-cyberjack-2.0.13.org/pcsc/Makefile.am ctapi-cyberjack-2.0.13/pcsc/Makefile.am
---- ctapi-cyberjack-2.0.13.org/pcsc/Makefile.am	2006-12-24 15:20:42.000000000 +0100
-+++ ctapi-cyberjack-2.0.13/pcsc/Makefile.am	2007-01-20 01:20:57.000000000 +0100
-@@ -1,21 +1,30 @@
--INCLUDES=-I$(top_srcdir)/ctapi/include -I$(top_srcdir)/ctapi -I..
- 
- EXTRA_DIST=Info.plist PkgInfo
- 
-+ifd_cyberjack_la_SOURCES=ifdhandler.c
-+
-+noinst_HEADERS=\
-+  ctbcs.h \
-+  ifdhandler.h \
-+  pcscdefines.h
-+
-+if PCSC
-+
-+INCLUDES=-I$(top_srcdir)/ctapi/include -I$(top_srcdir)/ctapi -I..
-+
- AM_CFLAGS=$(visibility_cflags)
- 
--bundledir=$(libdir)/pcsc/drivers/ifd-cyberjack.bundle/Contents
-+bundledir=$(usbdropdir)/ifd-cyberjack.bundle/Contents
- bundle_DATA=Info.plist PkgInfo
- 
--bundlelinuxdir=$(libdir)/pcsc/drivers/ifd-cyberjack.bundle/Contents/Linux
-+bundlelinuxdir=$(usbdropdir)/ifd-cyberjack.bundle/Contents/Linux
- bundlelinux_LTLIBRARIES=ifd-cyberjack.la
- 
- ifd_cyberjack_la_LDFLAGS=-module
- ifd_cyberjack_la_LIBADD=$(top_builddir)/ctapi/libctapi-cyberjack.la
--ifd_cyberjack_la_SOURCES=ifdhandler.c
- 
--noinst_HEADERS=\
--  ctbcs.h \
--  ifdhandler.h \
--  pcscdefines.h
-+else
-+
-+EXTRA_DIST += $(ifd_cyberjack_la_SOURCES) $(noinst_HEADERS)
- 
-+endif
diff --git a/dev-libs/cyberjack/files/cyberjack-2.0.13-qa.patch b/dev-libs/cyberjack/files/cyberjack-2.0.13-qa.patch
deleted file mode 100644
index ef3427ddac9c..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-2.0.13-qa.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp ctapi-cyberjack-2.0.13.org/ctapi/ppa/cjppUpdate.c ctapi-cyberjack-2.0.13.qa/ctapi/ppa/cjppUpdate.c
---- ctapi-cyberjack-2.0.13.org/ctapi/ppa/cjppUpdate.c	2006-09-29 21:45:59.000000000 +0300
-+++ ctapi-cyberjack-2.0.13.qa/ctapi/ppa/cjppUpdate.c	2007-01-18 23:15:54.000000000 +0200
-@@ -11,6 +11,8 @@
- #endif /* _LINUX */

- 

- 

-+int cjppVerifyKey(HANDLE cjppDevice,unsigned char *sign);

-+

- //extern int cjppVerifyData(HANDLE cjppDevice,unsigned short addr,unsigned char *Data,unsigned char len);

- 

- static void cjppWINAPI ProgressbarThread(ProgressStr *Params)

diff --git a/dev-libs/cyberjack/files/cyberjack-2.0.13-udev.patch b/dev-libs/cyberjack/files/cyberjack-2.0.13-udev.patch
deleted file mode 100644
index bac228d01f5f..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-2.0.13-udev.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN ctapi-cyberjack-2.0.13.orig/etc/udev/Makefile.am ctapi-cyberjack-2.0.13/etc/udev/Makefile.am
---- ctapi-cyberjack-2.0.13.orig/etc/udev/Makefile.am	2006-11-22 15:49:56.000000000 +0100
-+++ ctapi-cyberjack-2.0.13/etc/udev/Makefile.am	2007-02-12 13:24:55.066001224 +0100
-@@ -3,8 +3,8 @@
- udevdir=/etc/udev/rules.d
- udev_DATA=91-cyberjack.rules
- 
--udscriptdir=/sbin
--udscript_SCRIPTS=udev.cyberjack.sh
-+udscriptdir=/lib/udev
-+udscript_SCRIPTS=cyberjack.sh
- 
--EXTRA_DIST=91-cyberjack.rules udev.cyberjack.sh
-+EXTRA_DIST=91-cyberjack.rules cyberjack.sh
- 
diff --git a/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch b/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch
new file mode 100644
index 000000000000..4ded8182eaa2
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch
@@ -0,0 +1,12 @@
+diff -urN ctapi-cyberjack-3.3.2.orig/configure.ac ctapi-cyberjack-3.3.2/configure.ac
+--- ctapi-cyberjack-3.3.2.orig/configure.ac	2009-07-23 18:29:12.000000000 +0200
++++ ctapi-cyberjack-3.3.2/configure.ac	2009-11-16 16:35:03.487652332 +0100
+@@ -293,7 +293,7 @@
+   #
+   
+   pkg_modules="hal >= 0.5.0"
+-  PKG_CHECK_MODULES(hal, [$pkg_modules], [have_hal="yes"], [have_hal="no"])
++  PKG_CHECK_MODULES(hal, [$pkg_modules], [have_hal="no"], [have_hal="no"])
+   if test "$have_hal" = "yes"; then
+     AC_DEFINE(HAVE_HAL, 1, [if HAL is available])
+     hal_includes="$hal_CFLAGS"
diff --git a/dev-libs/cyberjack/files/cyberjack-3.3.2-nopcsc.patch b/dev-libs/cyberjack/files/cyberjack-3.3.2-nopcsc.patch
new file mode 100644
index 000000000000..0fa7cacb9bb1
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.3.2-nopcsc.patch
@@ -0,0 +1,26 @@
+diff -urN ctapi-cyberjack-3.3.3beta4/checksuite/cm_reader.cpp ctapi-cyberjack-3.3.3beta5/checksuite/cm_reader.cpp
+--- ctapi-cyberjack-3.3.3beta4/checksuite/cm_reader.cpp	2009-09-17 16:59:30.000000000 +0200
++++ ctapi-cyberjack-3.3.3beta5/checksuite/cm_reader.cpp	2009-11-19 21:40:40.000000000 +0100
+@@ -465,6 +465,7 @@
+ bool CM_Reader::_checkPcsc(std::string &xmlString,
+ 			   std::string &reportString,
+ 			   std::string &hintString) {
++#ifdef HAVE_PCSC
+   Cyberjack::Driver *dr=Cyberjack::NewDriverPcsc();
+   bool b;
+ 
+@@ -477,6 +478,14 @@
+ 
+   delete dr;
+   return b;
++#else
++  reportString+="PC/SC Interface\n";
++  reportString+="  PC/SC-Interface nicht getestet (keine Unterstuetzung eincompiliert).\n";
++  xmlString+="<api type=\"pcsc\">\n";
++  xmlString+="  <result type=\"untested\">\n";
++  xmlString+="  </result>\n";
++  xmlString+="</api>\n";
++#endif
+ }
+ 
+ 
diff --git a/dev-libs/cyberjack/files/cyberjack-3.0.4-udev.patch b/dev-libs/cyberjack/files/cyberjack-3.3.2-udev.patch
index c1e085ebd6ff..d72813cc55ad 100644
--- a/dev-libs/cyberjack/files/cyberjack-3.0.4-udev.patch
+++ b/dev-libs/cyberjack/files/cyberjack-3.3.2-udev.patch
@@ -1,6 +1,6 @@
-diff -urN ../ctapi-cyberjack-3.0.4.orig/etc/udev/Makefile.am ../ctapi-cyberjack-3.0.4/etc/udev/Makefile.am
---- ../ctapi-cyberjack-3.0.4.orig/etc/udev/Makefile.am	2007-05-07 20:53:28.000000000 +0200
-+++ ../ctapi-cyberjack-3.0.4/etc/udev/Makefile.am	2007-09-19 15:28:50.000000000 +0200
+diff -urN ctapi-cyberjack-3.3.2.orig/etc/udev/Makefile.am ctapi-cyberjack-3.3.2/etc/udev/Makefile.am
+--- ctapi-cyberjack-3.3.2.orig/etc/udev/Makefile.am	2008-05-27 19:24:05.000000000 +0200
++++ ctapi-cyberjack-3.3.2/etc/udev/Makefile.am	2009-11-16 16:19:49.491648055 +0100
 @@ -2,8 +2,8 @@
  
  udevdir=/etc/udev/rules.d