old

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

7 files changed, 17 insertions, 224 deletions

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index e985dea74945..271baf061aa9 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2012/03/24 17:29:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.28 2012/03/24 19:32:16 ssuominen Exp $
+
+  24 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/cyberjack-3.3.2-udev.patch, -cyberjack-3.3.5-r2.ebuild,
+  -cyberjack-3.99.5_p02-r1.ebuild, -files/cyberjack.rules-r1,
+  -files/cyberjack.sh:
+  old
 
   24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   cyberjack-3.99.5_p03.ebuild:
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index a55d5cc31207..0b01cbebedcf 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX cyberjack-3.3.2-udev.patch 608 RMD160 f82a74da23b3902f8a899fe0d07de57d8419ebe9 SHA1 fefd5d00ab6f4332a47e15c9df7cc0d0b67aed1d SHA256 984a95626452f17d9e22cce44ed1e43a00b79addcdc69c8b9fd645c657278fb3
 AUX cyberjack.rules 321 RMD160 79562b2c7875da22eee5830411d966c9d3814e17 SHA1 d788eb4c563cf292ae0a084c9e18955d44690c09 SHA256 294d043daeb3b1c321cda80fd2b3b51ce1d29e754e9fadb5a042e08c7781980d
-AUX cyberjack.rules-r1 557 RMD160 9ed19421b90feaddc756020c74c054b5434ea92a SHA1 0b903b24657219ed0516d1e3ef078f2492d20d4e SHA256 5f67373deef6622de89edbeea0d1589ae1ec688db06e80463ce925bfcd9bbfcc
-AUX cyberjack.sh 533 RMD160 91b567c025ec250720352aaeb1b736ea9fd4ab85 SHA1 94f79d78d2a964f5045f8558d478a8b458a3c056 SHA256 ca2b881a02a2fc5f20a1e770b0a7eb07539c98cb709243ad09eb858c5f16c81e
-DIST ctapi-cyberjack-3.3.5.tar.gz 1215789 RMD160 de7a5452cf876cd553fb4567b67a2f4bcf2e8ed4 SHA1 089ca17b3fe1c06f705ec3910d6a0cc82288656f SHA256 eba8788fb3de44d9184c6bc0ebdbaa0e348dfa29c285ba544c048dc926ec205b
-DIST pcsc-cyberjack_3.99.5final.SP02.tar.gz 1166940 RMD160 df4ded861f7fd965ff9d18bed5208d105996e38e SHA1 d291f78e6804c81eaa0a91cc9c2ae87b23f2cb2f SHA256 e4e8e93cc44111c1ea2b70e95a0c9f3e978d463d250c39f73cf364d9f50e4b82
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 RMD160 2db3669805162e0a61727726b24de5a51fbe0fda SHA1 fc4a6ebdbd8ee6e28ec417e89548563c8b30039a SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9
-EBUILD cyberjack-3.3.5-r2.ebuild 2211 RMD160 da47a8e81888898f86126490a419ac93236f4519 SHA1 b80d51482f3e02e483a933e724ec7ce40d6c470d SHA256 3d600a49e0f4d0ec5d864b2b89aa8a21514a1a90c1b7b392c3d3deb34ee137fb
-EBUILD cyberjack-3.99.5_p02-r1.ebuild 1830 RMD160 fbf92f19eff3e88b710f8867008f3f2a3876efb4 SHA1 6c58951cfc2b086038fb10454455d238d7602fa1 SHA256 05c27c8d668c2ee6c814158b0d4cf89eacfe6a318fb648f05e0fe2c8f986ec6e
 EBUILD cyberjack-3.99.5_p03.ebuild 1758 RMD160 89303b39ef37f14f5a5323463c5e43a2bedfe87a SHA1 504c19580c36417a447017ce998b7d4ca80659c3 SHA256 3e9243cb8dc27dcb107c9bb8fbce324cca44003d598752c8a7a60178e549fab8
-MISC ChangeLog 4946 RMD160 2c934370df00f190a699df0dc7f7f621764369bb SHA1 25803ece974ed4590a6bdd1476ef45ea8a97de6b SHA256 75c9ba707ee6065c5a5cb7cfe48b40873fb0af89405b3c77025cb960a8e3a983
+MISC ChangeLog 5156 RMD160 835ccc1cc184b44d2317122204b2c21a37a01938 SHA1 55ad852fae1631d0861ad0e04e8aba50ad4f4d4c SHA256 a0f2fc56f91ae1d736fbe48a6a2a19724bc7946ecd8df3db1c4150423bac1640
 MISC metadata.xml 491 RMD160 f335218a7b97693494027360df10940415caa5de SHA1 7cf9dfc3775415632a2a2fd65445ac203c71a8ff SHA256 ebe2ae5d276501ceb701e01c3195fb8f96aa0ad149c4a65fb622dd725abb054d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk9uBG4ACgkQuUQtlDBCeQJG8wCfd54wR3V6atORANTDrgyqlh+8
-2dIAoIUZshFatZ9OGxQJ26/Zy5VKzFuN
-=7PyP
+iQEcBAEBAgAGBQJPbiFHAAoJEEdUh39IaPFNiXgIAJkrVn2dkA5Uqc0pKha7fH5y
++37RnPG8SH1gmp2d7/SbY3mpUCNmleDmBsTz2+5RuD7zuSCVu8Y0xCst/SdJxijT
+XgRJmHp1GMgU6t7QQO6+DZMSLs0ob1nItPK/khg23y5Kz0sFXveM1XH+wtlD/9ni
+zdC7/Ivg8K3zQ6ZdRRRGqYEcGgrWbIGU5rsIzaLAcqlOX8qHfawqXdzUyBMF+i+J
+ndI8GzSAglGLki536yGKPeNP/oFQ79ovyEXio6InQhwrV0H3k3Zxy0b9nTsC/Qda
+BxCgVBKNqSJz7EpsxJV3NmMC0xuyiAQKoBfkrxudj6bq03ePAl0+374RQ9ehdFk=
+=YVb0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyberjack/cyberjack-3.3.5-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.3.5-r2.ebuild
deleted file mode 100644
index b14ce2634795..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.3.5-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.3.5-r2.ebuild,v 1.4 2011/08/07 02:57:17 phajdan.jr Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic
-
-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="fox pcsc-lite +udev"
-
-RDEPEND="virtual/libusb:1
-	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 udev && enewgroup ${PN}
-}
-
-src_prepare() {
-	if use udev; then
-		epatch "${FILESDIR}"/${PN}-3.3.2-udev.patch
-		cp "${FILESDIR}"/cyberjack.sh etc/udev/ || die
-		cp "${FILESDIR}"/cyberjack.rules-r1 etc/udev/rules.new || die
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local with_usbdropdir
-	use pcsc-lite && with_usbdropdir="--with-usbdropdir=$(pkg-config libpcsclite --variable=usbdropdir)"
-
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-dependency-tracking \
-		--disable-hal \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable fox) \
-		$(use_enable udev) \
-		${with_usbdropdir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS doc/README.txt
-	use udev && rm -rf "${D}"/usr/hotplug
-}
-
-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
-	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"
-		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
-	fi
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p02-r1.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p02-r1.ebuild
deleted file mode 100644
index 517b5a28f2ee..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p02-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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_p02-r1.ebuild,v 1.2 2012/01/23 09:44:17 ssuominen Exp $
-
-EAPI=4
-inherit 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}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-DOCS=( ChangeLog NEWS doc/README.txt )
-
-src_prepare() {
-	# Fix building with recent pcsc-lite
-	has_version '>=sys-apps/pcsc-lite-1.7.3' && \
-		sed -i -e 's:FEATURE_MCT_READERDIRECT:FEATURE_MCT_READER_DIRECT:' ifd/ifd.cpp
-}
-
-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
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	# http://bugs.gentoo.org/388329
-	if use kernel_linux; then
-		insinto /lib/udev/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.3.2-udev.patch b/dev-libs/cyberjack/files/cyberjack-3.3.2-udev.patch
deleted file mode 100644
index d72813cc55ad..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-3.3.2-udev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
- 
--udscriptdir=/sbin
--udscript_SCRIPTS=udev.cyberjack.sh
-+udscriptdir=/lib/udev
-+udscript_SCRIPTS=cyberjack.sh
- 
- install-data-local:
- 	test -z "$(udevdir)" || $(mkdir_p) "$(DESTDIR)$(udevdir)"
-@@ -18,5 +18,5 @@
- EXTRA_DIST=\
-  rules.fc5 \
-  rules.new \
-- udev.cyberjack.sh
-+ cyberjack.sh
- 
diff --git a/dev-libs/cyberjack/files/cyberjack.rules-r1 b/dev-libs/cyberjack/files/cyberjack.rules-r1
deleted file mode 100644
index b7f6026100b3..000000000000
--- a/dev-libs/cyberjack/files/cyberjack.rules-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0c4b", GROUP="cyberjack", MODE="660"
-
-# 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"
-ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="c4b/400/*", RUN+="cyberjack.sh"
-ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="c4b/401/*", 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.sh b/dev-libs/cyberjack/files/cyberjack.sh
deleted file mode 100755
index 121e77d7197e..000000000000
--- a/dev-libs/cyberjack/files/cyberjack.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-dev_group=cyberjack
-dev_mode=0664
-
-# using the cyberJack libusb driver
-if [ -n "${DEVICE}" ]; then
-	dev="${DEVICE}"
-	# hack for >=dev-libs/libusb-0.1.12
-	# which uses /dev/bus/usb/NNN/MMM
-	# instead of /proc/bus/usb/NNN/MMM
-	case "${dev}" in
-		/proc/bus/usb/*)
-			dev="${dev} ${dev/proc/dev}"
-			;;
-	esac
-fi
-
-# using the cyberJack kernel module
-if [ -n "${DEVNAME}" ]; then
-	dev="${DEVNAME}"
-fi
-
-# set device group and permissions
-for d in ${dev}; do
-	/bin/chgrp "${dev_group}" "${d}"
-	/bin/chmod "${dev_mode}" "${d}"
-done