Remove old versions; fix double-configure runs; fix udev/systemd rules. Thanks to BT in bug #528280.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 27 insertions, 69 deletions

diff --git a/app-crypt/libu2f-host/ChangeLog b/app-crypt/libu2f-host/ChangeLog
index 1dd0c1b8bea6..473969140efd 100644
--- a/app-crypt/libu2f-host/ChangeLog
+++ b/app-crypt/libu2f-host/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/libu2f-host
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/ChangeLog,v 1.6 2014/11/05 16:57:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/ChangeLog,v 1.7 2014/11/10 02:24:20 flameeyes Exp $
+
+*libu2f-host-0.0.1-r1 (10 Nov 2014)
+
+  10 Nov 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libu2f-host-0.0.1-r1.ebuild, -libu2f-host-0.0-r1.ebuild,
+  -libu2f-host-0.0.1.ebuild:
+  Remove old versions; fix double-configure runs; fix udev/systemd rules. Thanks
+  to BT in bug #528280.
 
 *libu2f-host-0.0.1 (05 Nov 2014)
 
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index dd42366739e7..94261164ad0e 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST libu2f-host-0.0.1.tar.xz 444056 SHA256 ae126dce04ac9af048eb36770471f3bac26c3b31f07e25efc9a94627e0da0fb3 SHA512 3461d54460513ce3fba02d7789eeadd1c45ea9b2989552bf0b69dd4a3a9f01a08150eca74b84073e45200b340d6ad38064fa63dc91820ae5b1235212132383f6 WHIRLPOOL 6c1bc60f6ac4723a456e7b6ae8e8eb81dd50ce343dc45fe249b80b99c8a28192ab5ce69a4864b6aeb8d40373c395e37b720288ab97cb49acfee02734d77031df
-DIST libu2f-host-0.0.tar.xz 443308 SHA256 05e711ff9db74ea73237f05bba2040ecdc0bf165fdeb5b6adf5e1b291a55f20a SHA512 b0b85ee65c7900cf72744573cf35abf53a30d11f217f1ebef086ed89343b185d284e60124b225471dfa581c87741c311340728a2bf0f3cde5c5c2d3872180061 WHIRLPOOL 626908e9c154250d9b44dcb7f28ea23110562cf5435d5e6b2cc6535a64e541a3fb2bba024ff4bdba6560d7f71b4c75b9e2d0986185b9527a1bda9a3879fdf8a0
-EBUILD libu2f-host-0.0-r1.ebuild 1086 SHA256 b9f7a0f730454ebfabc07d4cd9213a1c11da693cdbeabc304256ee8ac1d2e06e SHA512 64319dbb949ac511d6f39ddd6e1d51666c7f952557c483152b2c0c69d86fc23edd84f4237780170e8a417b72c72d1235a448b9ec709fb2ec899e3c0f2c97a3ca WHIRLPOOL 9ab70eba759e7a2f372049e36705e09a2d51319157857fc2263285ec71e64d4734220b36f0bf12388e66d202f83d33c5bede23e409153ff53f591ee2139ad0cc
-EBUILD libu2f-host-0.0.1.ebuild 1189 SHA256 6fa796e036ce280a75edc9453e9355ea58846d942219da8ca2bb4e9d031af8cc SHA512 990d0f16ab4c5acabd5aeec0d5cea17c2d0c8fcc98285e6f8ae3626495502af1cdf4bc036ca4db0e824c6405ebf92d2ff06d9a37d4b21e80685926838a9f6c01 WHIRLPOOL 0daa204e15ed7bf179839567cf2501f533cd696ce288d33e5fbe4bcaa80a1a53ff6a781139651b5df8e9dfd20bb1229ccffc31b8f5c290ee9a08aa430116ebd4
-MISC ChangeLog 1338 SHA256 00628a6304140e895b96d715063ade1c8129ec43f4b633bb912139448de44ffd SHA512 8fe10f901414f244ec3d1eade0ea7bae0dcc8255d65f51e898994eff98984511c9dc39331aa6a3b30492817bb9bbca13bd40ad25da608140ddab94bdb2ec7ea5 WHIRLPOOL dc0deac50f2b2fc3170542fb2168c8094d6ac1479d967558be5d654bf55331d25e8d401a5594fa01995700fb1ab1ec3fd9d124862000311850d7c5e79105cd62
+EBUILD libu2f-host-0.0.1-r1.ebuild 1173 SHA256 696b9a38c436c246d50accadf3aaedfe1004de77b388a8754eac06f2273fc0b5 SHA512 ae24f94228ad584fcc0899baba1f23e212e6304f5661e8690af475eac18daf71aee873c1321bc14b78385aa10ca13a5a6e511c7fed636f91630fd5b1a877ea42 WHIRLPOOL 2991ddeebbbbd19d1cfb7e5543230bc3e55a7a3506ad2ae73866c9c0ee32e1f9b698dcfaa3c221c18a50393d4af76248b93483e2b1bc69700bdada2eecdba6da
+MISC ChangeLog 1626 SHA256 72de4406d048fcdbb5f0e93d05925ce025011da0168b1c29391614de875ecdcb SHA512 42a34dbf1ee946855938f61a61a16eac9ea643b05e38fb28ead7ed06885429307d6ead021296d3535c43ca614eaba11a2d1cac257063fa34417677f80864446a WHIRLPOOL d8be01a137a1f2a9fa3c1102ce26825ba496fae24f992a318ac13b7a996803df96fbf7f98f89ce2279fc34d4ad83718fe1bee0fd76e29f2fae3b56ab1a1c2d53
 MISC metadata.xml 536 SHA256 fdb17906956cfbaaad06130cb491dabe0d244ae304e89a9f40c8bd2cf4b98bcc SHA512 4e586a27faddcf7f5634fb89ab60b73d7861e4ad77a3844ef063887523eeae6d66135de3b2f0c04cb9c56a92212610dc18a991010c21c7e8df4300cb95c13456 WHIRLPOOL 056971eb15922384a7ca0ce5c6a3f789963c2b23eaea3a775b956510fcda4fb44050e6bd8cf585d40f1fe3b912fda709f94fc5ac897b6e045084b31593977688
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUWlbyAAoJEKXdFCfdEflKCAwP/A2JzKxveZG6Ww93FGifv4ax
-wgCa6qc+D6QvcSu0cC2pq5GvE8Z0cBcgVmGHICDPaHwsQh4JtILMGH387QIQQGfB
-sa6oBYAMVLFSd1jQ7SrPtzGUl2A8Cm4HCi53c4FS7lR3Q2tnazkVV5QRbIdcDDMw
-Jyj89Nx5pC19UDfmLMCnRKu6XL/yh++nFPeyUkA0ASYRXh/INL4fHbZlrQIp0y0u
-DDPNQbAPFI3zX2NUIwy6C+6tsOT1TkncjYjAbD72RtmLKYkzvg5KcbMlZBj+drgp
-Rtn6AC0Gz+mTBcJY3pliT6QFNF0KjhPCd5Yuog/9/FxRdqEtcYUeDTgmLkud4LbP
-pDeQ3m4UuAF1LsJkvAmdZYMI9j8Fc4DgylH1Sy+G81msG/028MWHdwd8el+492SR
-oP9uurXHoJYnIQ0VIgf387opOBvf3PmF3wbTw9aWi3RW1RRB94+pcP8KOe4a3TcC
-nTAW/NaW384YY0dYUaTMPyPl7ZG+IEr0aZZXZLG3aFQF+z/zVy/0WW7OVmrDNMWD
-W9hj0VgYlcGWal6WlohetMJwwzql7lIoAH1YLX32NvMUE5Guy5kLnbC62ftm8wrp
-CyF2+NwWA+9aNi+5YwsXK4ij6GxNeaCdskDGbEqV6t8Lm8AR5D5aCMcoLFmGpz+W
-1hXZaZ7z5g/RYdGBsQqW
-=MxFK
+iQEcBAEBCAAGBQJUYCHiAAoJEBzRPIrUMBNCuIQH/2TxPAKtMadkqBpwD0fFLZrD
+tuEJWM0ZTMRHG/JyqreyhMu3aCY0SngT+qlHsTDDMWLcBHhwHu8OgjilYZIIBVu9
+IQyrPyBbphShsOoEcj858kUPh1T1MRRiDk42vtWjsreYVNpg7EcJamO0j18+ZJEx
+rtlitt0lf0y8hpoYf3nnkHLF0vfFsD07QV4hWtXb9obdNBtZ+LwMGRKl3fU8zddH
+K1uaLfLGwJ1xrWhgAySO51cK8CI9AY1pEJMVE4p5JC+mQRijdhn80vVbAZip3kKu
+5mrgVDQAhifwIBz80JlML+6chvHPZJywYczfsuqhHbiyZUcsRrI+/Dl+1haYP8A=
+=yVrW
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0-r1.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0-r1.ebuild
deleted file mode 100644
index 88534b49acba..000000000000
--- a/app-crypt/libu2f-host/libu2f-host-0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/libu2f-host-0.0-r1.ebuild,v 1.3 2014/10/25 17:36:45 flameeyes Exp $
-
-EAPI=5
-
-inherit autotools-utils linux-info udev
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-host/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kernel_linux systemd"
-
-RDEPEND="dev-libs/hidapi
-	dev-libs/json-c"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	systemd? ( sys-apps/systemd[acl] )"
-
-CONFIG_CHECK="~HIDRAW"
-
-src_prepare() {
-	autotools-utils_src_prepare
-	sed -i -e 's:|\([^0]\):|0\1:g' 70-u2f.rules || die
-
-	sed -e 's:GROUP="plugdev":TAG+="uaccess":g' 70-u2f.rules > 70-u2f-systemd.rules || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use kernel_linux; then
-		if use systemd; then
-			udev_newrules 70-u2f-systemd.rules 70-u2f.rules
-		else
-			udev_dorules 70-u2f.rules
-		fi
-	fi
-}
diff --git a/app-crypt/libu2f-host/libu2f-host-0.0.1.ebuild b/app-crypt/libu2f-host/libu2f-host-0.0.1-r1.ebuild
index 5d8557174b92..f47a423d50bc 100644
--- a/app-crypt/libu2f-host/libu2f-host-0.0.1.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-0.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/libu2f-host-0.0.1.ebuild,v 1.1 2014/11/05 16:57:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/libu2f-host-0.0.1-r1.ebuild,v 1.1 2014/11/10 02:24:20 flameeyes Exp $
 
 EAPI=5
 
@@ -26,14 +26,16 @@ CONFIG_CHECK="~HIDRAW"
 
 src_prepare() {
 	autotools-utils_src_prepare
-	sed -i -e 's:|\([^0]\):|0\1:g' 70-u2f.rules || die
 
-	sed -e 's:GROUP="plugdev":TAG+="uaccess":g' 70-u2f.rules > 70-u2f-systemd.rules || die
+	sed -i -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
 }
 
 src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
 	autotools-utils_src_configure
-	econf $(use_enable static-libs static)
 }
 
 src_install() {
@@ -41,9 +43,9 @@ src_install() {
 
 	if use kernel_linux; then
 		if use systemd; then
-			udev_newrules 70-u2f-systemd.rules 70-u2f.rules
-		else
 			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
 		fi
 	fi
 }