Version bump wrt #314081 by Peter Gantner.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 41 insertions, 76 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/Manifest b/dev-libs/cyberjack/Manifest
index 83a48e15d64e..320ba9eb23f5 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,9 +1,7 @@
-AUX cyberjack-3.3.2-nohal.patch 572 RMD160 5d42c7375b05f37778d0d18a0b08d5898bd4846e SHA1 664a99274bf5173df18e67770f9e99f562f88344 SHA256 2c7c826c3daa62469cef482dfd4b432c8abc3f168215988128928419f0f048b3
-AUX cyberjack-3.3.2-nopcsc.patch 869 RMD160 ee6c5184ce245271e4de58ab877d3771ae4c5b9a SHA1 ae98acb6435315367b5e7c677776692efb2a4549 SHA256 d51d6d5c48607c53584e31632d4bd8a4e2938fd28761deaf03c4989002570d3f
 AUX cyberjack-3.3.2-udev.patch 608 RMD160 f82a74da23b3902f8a899fe0d07de57d8419ebe9 SHA1 fefd5d00ab6f4332a47e15c9df7cc0d0b67aed1d SHA256 984a95626452f17d9e22cce44ed1e43a00b79addcdc69c8b9fd645c657278fb3
 AUX cyberjack.rules 551 RMD160 0b8cd905d8c41630a821aef25159beb1bebd2509 SHA1 45ff50d8e6063132aa45f0a7415a3185ba50be93 SHA256 82ae422579f11b928a25144b6f49bc5144807aad2d9ccb59364aa76f2b9d14a9
 AUX cyberjack.sh 533 RMD160 91b567c025ec250720352aaeb1b736ea9fd4ab85 SHA1 94f79d78d2a964f5045f8558d478a8b458a3c056 SHA256 ca2b881a02a2fc5f20a1e770b0a7eb07539c98cb709243ad09eb858c5f16c81e
-DIST ctapi-cyberjack-3.3.2.tar.gz 1173533 RMD160 d41a06313f10f7d0ed4e5e278c7efe8d93446873 SHA1 b97fcb23203def01583cc1e6605f2ccd1e0ca67d SHA256 d6fe1190bad1d3cd6ed5477ac3d461d1873da2351f21239f3cf745903c762192
-EBUILD cyberjack-3.3.2.ebuild 2638 RMD160 bcc7ec81df73c8e893663f465fe9e2a3fb5adc52 SHA1 1801872490b7ec6823ecae6bcec6e77cb5b5292a SHA256 37205879840f0bec6c9634219a66130ba9fa613e7d3e06c320f3148d43f9e023
-MISC ChangeLog 2211 RMD160 a26302b16272b41af9100e26e69aa080437a9b82 SHA1 c1c75850ea53e4cd1afe08fcc8db04bc0abfc309 SHA256 6c547e0a32b0bc1220f94cf5b1132041e8d0cb8cfa27432d3cff21de63d393dc
-MISC metadata.xml 473 RMD160 d87a295ccdc6aebc1165958e8296b2f81641eaa8 SHA1 508a4164e37f5838f41304a97de89be66731cca7 SHA256 821213258ff6acb0f8967f0514bde3ea10a7c7433d349485da2078000d32d8dc
+DIST ctapi-cyberjack-3.3.5.tar.gz 1215789 RMD160 de7a5452cf876cd553fb4567b67a2f4bcf2e8ed4 SHA1 089ca17b3fe1c06f705ec3910d6a0cc82288656f SHA256 eba8788fb3de44d9184c6bc0ebdbaa0e348dfa29c285ba544c048dc926ec205b
+EBUILD cyberjack-3.3.5.ebuild 2224 RMD160 b25c26d9e745153861a32d550f9a6ead83c36f24 SHA1 3d606ebbfe695cd3d5865df69825a1f7fe03bc75 SHA256 fe034293c62cf595117fdbace29a687d5af5e4ba8a56aa3ed502429916760100
+MISC ChangeLog 2371 RMD160 34613c8a465365c8623a8d3aab462bab7f306f80 SHA1 898d1f70b30faca8c270f2c6da4e7028863f9a18 SHA256 6f73a50f8514d096561886a18aefa67d7c33b5a7e1c7fbe0bed868a0d701a8b1
+MISC metadata.xml 573 RMD160 556666394e8b052f2f23c509c2920a007b6f583e SHA1 c2fe9aa699177a7fa2251dd884996cd94cb46eaf SHA256 6b17f084f0eab686d1e62bee6fffcc91e4d4e8c1d53ddb022e05b888bcf0ea7f
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>