[gentoo-commits] repo/gentoo:master commit in: dev-libs/cyberjack/, dev-libs/cyberjack/files/

["Wolfram Schlich" <wschlich@gentoo.org>]

commit:     f340f8456f677206d71bf8ffc218bc48f743aa0d
Author:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 08:40:35 2016 +0000
Commit:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 08:55:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f340f845

dev-libs/cyberjack: version bump. upstream removed /usr/bin/fxcyberjack and /usr/bin/cyberjack.

Package-Manager: portage-2.2.28

 dev-libs/cyberjack/Manifest                        |  2 +-
 ...99.5_p08.ebuild => cyberjack-3.99.5_p09.ebuild} | 13 +++--------
 .../files/cyberjack-3.99.5_p08-install.patch       | 26 ----------------------
 ...s.patch => cyberjack-3.99.5_p09-manpages.patch} |  0
 ...atch => cyberjack-3.99.5_p09-returnvalue.patch} |  0
 5 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index cf65619..c730592 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,2 +1,2 @@
-DIST pcsc-cyberjack-3.99.5final.SP08.tar.bz2 786514 SHA256 ab42b81ad685302c89763faaf0d90e23f804134e020d653323ad9f95a43655fc SHA512 8630297b48e578d47e90cc3e216ff0daebfadee783f338588a5ad99132b5260901cf6545d292d312e054bcdd4a6e2d377a6c881d68e6c6bc062b0a435287181d WHIRLPOOL 0fb4de26b6f7a117d648ebabf7f7b4c1ec68a261a454728ccacbb37b15c07764a0f85d441e06c7627ae891dadab0fcbee61cd31063069b7aeeca8f02241a4ee6
+DIST pcsc-cyberjack-3.99.5final.SP09.tar.bz2 956808 SHA256 1f8cb8da18aae3b39f7c972d06c3221d08e870119bc871a2eb198a09b01139d4 SHA512 e0e324a2b0251cc28512e87799c7408f2d008c07a463ff36478de0547b701b5523ff78bd4cffb388b02254eed5fe88fb2769e38da625f6040003d8858d6c5b3b WHIRLPOOL b2abc2f7edfcf28bb28264072741e156e336e892f4b8730fcd4784998d5f95f192adcd877315fb46ce9fca8fdfffc02269293d25c215c97fe115f25f7cd1cb41
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05 WHIRLPOOL 51429512a9037e6ec4a98cc33576176cafda5fe3a3b33c56b2d928c7a7bc06135ac93e92a713836e4dc20e90f6106f9ca3643de5baed7c25672c26f6fc4a6368

diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p09.ebuild
similarity index 87%
rename from dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild
rename to dev-libs/cyberjack/cyberjack-3.99.5_p09.ebuild
index 134aa2d..2adc316 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p09.ebuild
@@ -17,17 +17,13 @@ SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fox static-libs threads +udev +usb"
+IUSE="static-libs threads +udev +usb"
 
 # FIXME:
 # xml is actually optional but the code is still used anyway. We'll have to wait
 # until upstream fixed it.
 COMMON_DEPEND="sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
-	fox? (
-		>=x11-libs/fox-1.6:=
-		dev-libs/libxml2
-		)"
+	usb? ( virtual/libusb:1 )"
 RDEPEND="${COMMON_DEPEND}
 	udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}
@@ -36,7 +32,7 @@ DEPEND="${COMMON_DEPEND}
 #S=${WORKDIR}/${MY_P2}
 S=${WORKDIR}/${MY_P}
 
-DOCS="ChangeLog NEWS doc/README.txt"
+DOCS="debian/changelog doc/README.txt"
 
 pkg_setup() {
 	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
@@ -44,7 +40,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-install.patch"
 	epatch "${FILESDIR}/${P}-manpages.patch"
 	epatch "${FILESDIR}/${P}-returnvalue.patch"
 	eautoreconf
@@ -58,8 +53,6 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable usb nonserial) \
 		$(use_enable threads) \
-		$(use_enable fox xml2) \
-		$(use_enable fox) \
 		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
 }
 

diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p08-install.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p08-install.patch
deleted file mode 100644
index f0a2f0a..0000000
--- a/dev-libs/cyberjack/files/cyberjack-3.99.5_p08-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c107dd6db4967a04297eab120500a7fc5c93f221 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 13 Feb 2014 23:10:37 +0100
-Subject: [PATCH 3/3] Do not install pcscd_init.diff
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- tools/cyberjack/scripts/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/cyberjack/scripts/Makefile.am b/tools/cyberjack/scripts/Makefile.am
-index e9cc408..e2098d2 100644
---- a/tools/cyberjack/scripts/Makefile.am
-+++ b/tools/cyberjack/scripts/Makefile.am
-@@ -1,6 +1,6 @@
- 
- cdscriptdir=$(libdir)/cyberjack
--cdscript_SCRIPTS=getdist.sh pcscd_init.diff
-+cdscript_SCRIPTS=getdist.sh
- 
--EXTRA_DIST=$(cdscript_SCRIPTS)
-+EXTRA_DIST=$(cdscript_SCRIPTS) pcscd_init.diff
- 
--- 
-1.8.3.2
-

diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p08-manpages.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p09-manpages.patch
similarity index 100%
rename from dev-libs/cyberjack/files/cyberjack-3.99.5_p08-manpages.patch
rename to dev-libs/cyberjack/files/cyberjack-3.99.5_p09-manpages.patch

diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p08-returnvalue.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p09-returnvalue.patch
similarity index 100%
rename from dev-libs/cyberjack/files/cyberjack-3.99.5_p08-returnvalue.patch
rename to dev-libs/cyberjack/files/cyberjack-3.99.5_p09-returnvalue.patch