Query udev.pc pkg-config file for correct udevdir. Fix building with sys-devel/gcc >= 4.7 wrt #423757 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index 6ea600e27fae..44f0935a8f21 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cyberjack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.30 2012/05/04 18:35:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.31 2012/08/12 11:26:26 ssuominen Exp $
+
+*cyberjack-3.99.5_p03-r1 (12 Aug 2012)
+
+  12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +cyberjack-3.99.5_p03-r1.ebuild, +files/cyberjack-3.99.5_p03-gcc47.patch:
+  Query udev.pc pkg-config file for correct udevdir. Fix building with
+  sys-devel/gcc >= 4.7 wrt #423757 by Diego Elio Pettenò.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> cyberjack-3.99.5_p03.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 8b70d1693889..750ad83dcb57 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cyberjack-3.99.5_p03-gcc47.patch 705 SHA256 f3a19a32fec0ed9b17a4c6e97d08f196a5596d12e5926b5e66d67d6f1a1085a9 SHA512 d05d4af0178003f722c49e06a1fc5027261f36c71f4ca3c9cadef627b6dd5719fed3d65358a6917711b1a5772498b8420e5645e8a51ff5c2f0616c1de361d088 WHIRLPOOL 093d35207833117d5c4b309c12cedebbc03345caa3e666d7929d0091c0763c118716b38e060c5f7201262e83a3631ede96e12786ee05b8920786db9883eef995
 AUX cyberjack.rules 321 SHA256 294d043daeb3b1c321cda80fd2b3b51ce1d29e754e9fadb5a042e08c7781980d SHA512 ca7ece7d34b21055e7a38efa04914dd07dab423041142eef309352924207c4ae25bfde3b1cc171eb6aec32539589006900669e38d5d699f1f942cd344c7a0cda WHIRLPOOL 7e6d4e7adaa99e1e2be96103e1caf60b6a481458a96782ba760855e18f3dd7cc8fdc150d0d20d5e4fab3a3eb3f3e3a4898b72afa51b44a59985cbf2514dcbe74
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05 WHIRLPOOL 51429512a9037e6ec4a98cc33576176cafda5fe3a3b33c56b2d928c7a7bc06135ac93e92a713836e4dc20e90f6106f9ca3643de5baed7c25672c26f6fc4a6368
+EBUILD cyberjack-3.99.5_p03-r1.ebuild 1922 SHA256 1d8dd8e405d747f8f3e6cbbf71b4963a0ce711d9e7088c66ee32bf2d8585bd8f SHA512 8dc8976ff314c5d7907e584e8bd1ea26f6c0452318b12f60c8ef80c2019cbd512ebdbaa80c1cb8acbbc335b4da2d20fa5876818435b6bd3859ed74c9d16755cd WHIRLPOOL 74801475fd280c2d9dc054308529e7aa55bf05c2aee39bd21f2f1ee2094bdc96a360624ce3b3cfb30293a4f36434bb31f171788f63ca27af9fc55110c7f60c38
 EBUILD cyberjack-3.99.5_p03.ebuild 1753 SHA256 37b49a426fb03a94865d1267695f92f43487ad1060ab4c4a2c34ce9e0114af12 SHA512 dad8cfaf7516f67232c0ef9911663cb747aa4262d04c4cbfd074cef4c3d78d7d62992a4eb17c043c3e27d70e66ddb35108c490e24b893c99fbb726631f81d59f WHIRLPOOL 54aed05e38c41699010b3c79673565eeaef1ff75d0efef51cdbe1f6c769df2197ac02c23b2b93dfc78301ed4b6aab273b3a7a66d166940c582709d2164122a30
-MISC ChangeLog 5288 SHA256 890f06fac89cb44be50695169709db760f844bdba5a443eef65ca04d80b28356 SHA512 a9723dadc018bac3906bd7e9d286f1d0a9d30b5da1373b71776a65ce7e405899c43ac08b0e0733d967e823261def2b5f0897e4b9ebadd6d97f627de2e403b326 WHIRLPOOL afbab237cf710986226234a762cdc0c8acf20ae2261aa9ea041cb89691f32473e93f7b66f83dc5a85b9f6583e9e427befcbd4a7be4d7f60a428cd73b4bcd0bf2
+MISC ChangeLog 5592 SHA256 7f85d7552e0b6dedea0835bc4b1f7c434b81b6dd6c933722b077ab4689dc0b08 SHA512 4ba48ce6a98facd21310964e7028571d9266d7d804aa89c6251d239dcc09f986cfec5f02b716203c9bed52e46f309953210bd555e3e37ac4349ae9943de8bf3d WHIRLPOOL bac120d1b36ae8f8ee7a2826624e39e6472b79449f5ab013b0d612d8c470c314172061f8da854d3324ecd084ca33081711f2387bfd0c0ac8c58d75075bb18ae3
 MISC metadata.xml 343 SHA256 5b84dff3e34449a1b94d25284d8e003105c27403dcc279fb418642caa5939ae0 SHA512 098b59284018d50c701bff61d457699bdf2cf4012cf96bdc2a448429ce1f5de3f4bd33fbeb30cf6ffc6759d3c998bdccb1fff3eddb2af91404efa4a2f52234e5 WHIRLPOOL 2e4c9033ef3745c076432614b7d01dbf97612de6f69c44815b8bf18bec73bc8c4591c70ec29f0813c6636c7a23073b5c717f29415d1b6678bd3006f25d972955
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJ5LAAAoJEEdUh39IaPFNXSAH/1swbHd/yFkc7rspivGY1XrN
+H+gYLWgLUfmC7HKlFv/RrQYNj/+67VVGssfSxFuLrOaAHwNBmjsJcxag4C5u6SXo
+otnqinz/OmvDHVVtklSNCEUjl1RkCnLECY1WICnYyPhVPj211vkzDQzHN7Z7sLpN
+KK8v6gecl2cr5efd7huBEiZLndyy225fkFQb2/sAk92NZUl/CfVT2HZHEx26xYh1
+LhfENHtcw0l/eITk9IdF74n3cvzIUYYV8O3oSS+znMgl1mCFr8dsTJhzhxh0+0Oo
+hS3W/WvOad78x4sK67TOda58QDKTJ9qLbOpa96HygW+AKN6LRcEVgqQBzEHg1z8=
+=8Mx2
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
new file mode 100644
index 000000000000..75adf843ca1c
--- /dev/null
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild,v 1.1 2012/08/12 11:26:26 ssuominen Exp $
+
+EAPI=4
+inherit eutils linux-info toolchain-funcs
+
+MY_P=pcsc-${PN}_${PV/_p/final.SP}
+
+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/_p/_SP}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fox kernel_linux xml"
+
+COMMON_DEPEND="sys-apps/pcsc-lite
+	virtual/libusb:1
+	fox? ( >=x11-libs/fox-1.6 )
+	xml? ( dev-libs/libxml2 )"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-fs/udev )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P/_/-}
+
+DOCS="ChangeLog NEWS doc/*.txt"
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf \
+		--mandir=/usr/share/man/man8 \
+		--sysconfdir=/etc/${PN} \
+		--disable-hal \
+		--enable-pcsc \
+		$(use_enable xml xml2) \
+		$(use_enable fox) \
+		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"usr/lib*/cyberjack/pcscd_init.diff
+
+	prune_libtool_files --all
+
+	# http://bugs.gentoo.org/388329
+	if use kernel_linux; then
+		local udevdir=/lib/udev
+		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+		insinto "${udevdir}"/rules.d
+		newins "${FILESDIR}"/${PN}.rules 92-${PN}.rules
+	fi
+}
+
+pkg_postinst() {
+	local conf="${EROOT}/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
+}
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
new file mode 100644
index 000000000000..035d414a09d9
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/423757
+
+--- libcyberjack/checksuite/cm_distri.cpp
++++ libcyberjack/checksuite/cm_distri.cpp
+@@ -15,6 +15,7 @@
+ #include "cm_distri.h"
+ #include "checksuite.h"
+ 
++#include <unistd.h> /* unlink */
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- tools/fox-dialog/main.cpp
++++ tools/fox-dialog/main.cpp
+@@ -9,6 +9,8 @@
+ 
+ #include <fx.h>
+ 
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
+--- tools/mac-ui-helper/main.m
++++ tools/mac-ui-helper/main.m
+@@ -31,6 +31,8 @@
+ #import "PinDialog.h"
+ #import "Delegate.h"
+ 
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>