Install the .desktop file and icons. Thanks to BT in bug #528552.

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

4 files changed, 21 insertions, 63 deletions

diff --git a/app-crypt/yubikey-neo-manager/ChangeLog b/app-crypt/yubikey-neo-manager/ChangeLog
index 9afc6d39e0a1..92515123befe 100644
--- a/app-crypt/yubikey-neo-manager/ChangeLog
+++ b/app-crypt/yubikey-neo-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/yubikey-neo-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/ChangeLog,v 1.4 2014/11/05 16:23:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/ChangeLog,v 1.5 2014/11/10 17:47:10 flameeyes Exp $
+
+*yubikey-neo-manager-0.2.5-r1 (10 Nov 2014)
+
+  10 Nov 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  +yubikey-neo-manager-0.2.5-r1.ebuild, -yubikey-neo-manager-0.2.3.ebuild,
+  -yubikey-neo-manager-0.2.4.ebuild, -yubikey-neo-manager-0.2.5.ebuild:
+  Install the .desktop file and icons. Thanks to BT in bug #528552.
 
 *yubikey-neo-manager-0.2.5 (05 Nov 2014)
 
diff --git a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.4.ebuild b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.4.ebuild
deleted file mode 100644
index b2d97a5a8734..000000000000
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.4.ebuild
+++ /dev/null
@@ -1,30 +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/yubikey-neo-manager/yubikey-neo-manager-0.2.4.ebuild,v 1.1 2014/10/29 02:35:12 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
diff --git a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.3.ebuild b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5-r1.ebuild
index 53ad3067f1df..67696c010a78 100644
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.3.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5-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/yubikey-neo-manager/yubikey-neo-manager-0.2.3.ebuild,v 1.2 2014/10/25 15:58:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5-r1.ebuild,v 1.1 2014/11/10 17:47:10 flameeyes Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -11,7 +11,7 @@ DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
 HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
 SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -28,3 +28,14 @@ DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
 	${CDEPEND}"
 
 RDEPEND="${CDEPEND}"
+
+DOCS=( NEWS README )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman scripts/neoman.1
+	domenu resources/neoman.desktop
+	doicon resources/neoman.xpm
+	newicon -s 128 resources/neoman-large.png neoman.png
+}
diff --git a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5.ebuild b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5.ebuild
deleted file mode 100644
index fe0bf6d65376..000000000000
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5.ebuild
+++ /dev/null
@@ -1,30 +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/yubikey-neo-manager/yubikey-neo-manager-0.2.5.ebuild,v 1.1 2014/11/05 16:23:58 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"