Version bump wrt #314081 by Peter Gantner.

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

5 files changed, 37 insertions, 70 deletions

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index 9617ad5d69e6..7aad7243c414 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2009/11/19 23:20:21 wschlich Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.11 2010/05/18 19:40:28 ssuominen Exp $
+
+*cyberjack-3.3.5 (18 May 2010)
+
+  18 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +cyberjack-3.3.5.ebuild:
+  Version bump wrt #314081 by Peter Gantner.
 
 *cyberjack-3.3.2 (19 Nov 2009)
 
diff --git a/dev-libs/cyberjack/cyberjack-3.3.2.ebuild b/dev-libs/cyberjack/cyberjack-3.3.5.ebuild
index be1eaa2377fb..e446f7c6454f 100644
--- a/dev-libs/cyberjack/cyberjack-3.3.2.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.3.5.ebuild
@@ -1,66 +1,63 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.3.2.ebuild,v 1.1 2009/11/19 23:20:21 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.3.5.ebuild,v 1.1 2010/05/18 19:40:28 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
+inherit autotools eutils flag-o-matic
 
-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://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 hal"
+IUSE="fox pcsc-lite +udev"
 
 RDEPEND="dev-libs/libusb
 	sys-fs/sysfsutils
-	hal? ( sys-apps/hal )
+	fox? ( >=x11-libs/fox-1.6 )
 	pcsc-lite? ( sys-apps/pcsc-lite	)"
-
 DEPEND="${RDEPEND}
 	pcsc-lite? ( dev-util/pkgconfig )"
 
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	use noudev || enewgroup "${PN}"
+	use udev && enewgroup ${PN}
 }
 
 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."
+	if use udev; then
+		epatch "${FILESDIR}"/${PN}-3.3.2-udev.patch
+		cp "${FILESDIR}"/cyberjack.sh etc/udev/ || die
+		cp "${FILESDIR}"/cyberjack.rules etc/udev/rules.new || die
+		AT_M4DIR="m4" eautoreconf
 	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_configure() {
 	append-flags -fno-strict-aliasing
-	local with_usbdropdir=''
+
+	local with_usbdropdir
 	use pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
+
 	econf \
-		--sysconfdir=/etc/"${PN}" \
+		--sysconfdir=/etc/${PN} \
+		--disable-dependency-tracking \
+		--disable-hal \
 		$(use_enable pcsc-lite pcsc) \
-		${with_usbdropdir} \
-		$(use_enable !noudev udev) \
-		|| die "Configuration of package failed."
-}
-
-src_compile() {
-	emake || die "Compilation of package failed."
+		$(use_enable fox) \
+		$(use_enable udev) \
+		${with_usbdropdir}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Installation of package failed."
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS doc/README.txt
-	use noudev || rm -rf "${D}"/usr/hotplug
+	use udev && rm -rf "${D}"/usr/hotplug
 }
 
 pkg_postinst() {
@@ -71,7 +68,7 @@ pkg_postinst() {
 	elog "to ${conf}"
 	elog "and modify the latter as needed."
 	elog
-	if ! use noudev; then
+	if use udev; 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"
diff --git a/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch b/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch
deleted file mode 100644
index 4ded8182eaa2..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-3.3.2-nohal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 0fa7cacb9bb1..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-3.3.2-nopcsc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/metadata.xml b/dev-libs/cyberjack/metadata.xml
index d70aab3eb21c..429b20741ca6 100644
--- a/dev-libs/cyberjack/metadata.xml
+++ b/dev-libs/cyberjack/metadata.xml
@@ -8,8 +8,10 @@
 	<description>Primary maintainer</description>
 </maintainer>
 <use>
-  <flag name='noudev'>Disable installation of udev rules</flag>
+  <flag name='udev'>Enable installation of udev rules</flag>
   <flag name='pcsc-lite'>Enable installation of <pkg>sys-apps/pcsc-lite</pkg>
     driver</flag>
+  <flag name='fox'>Enable installation of <pkg>x11-libs/fox</pkg> based
+    fxcyberjack program</flag>
 </use>
 </pkgmetadata>