old

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

6 files changed, 7 insertions, 211 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/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