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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

3 files changed, 17 insertions, 51 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/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
 }