From c73492abad7fda89334afb4595a853cbc3465001 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 10 Jan 2016 11:52:08 +0000 Subject: sys-firmware/gnuk: Version bump Fix typo in udev rules Package-Manager: portage-2.2.26 --- metadata/md5-cache/sys-firmware/gnuk-1.1.7 | 12 ---- metadata/md5-cache/sys-firmware/gnuk-1.1.9 | 12 ++++ sys-firmware/gnuk/Manifest | 4 +- sys-firmware/gnuk/files/60-gnuk.rules | 2 +- sys-firmware/gnuk/gnuk-1.1.7.ebuild | 100 ----------------------------- sys-firmware/gnuk/gnuk-1.1.9.ebuild | 100 +++++++++++++++++++++++++++++ 6 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 metadata/md5-cache/sys-firmware/gnuk-1.1.7 create mode 100644 metadata/md5-cache/sys-firmware/gnuk-1.1.9 delete mode 100644 sys-firmware/gnuk/gnuk-1.1.7.ebuild create mode 100644 sys-firmware/gnuk/gnuk-1.1.9.ebuild diff --git a/metadata/md5-cache/sys-firmware/gnuk-1.1.7 b/metadata/md5-cache/sys-firmware/gnuk-1.1.7 deleted file mode 100644 index 1bb00720..00000000 --- a/metadata/md5-cache/sys-firmware/gnuk-1.1.7 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare pretend unpack -DEPEND=doc? ( dev-python/sphinx ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig -DESCRIPTION=An Implementation of USB Cryptographic Token for GnuPG -EAPI=5 -HOMEPAGE=http://www.fsij.org/category/gnuk.html -IUSE=debug doc tools python_targets_python2_7 python_targets_python3_4 -KEYWORDS=~amd64 -LICENSE=GPL-3 -RDEPEND=virtual/udev tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) -SLOT=0 -_eclasses_=eutils d9bd2ddd85a58e470b49ca997e255a4c git-r3 0961ca04f93a7ae0e4c4a0b2b8c3be99 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 30887c5e8630bbf27b5cf0fd74564323 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 37ef89be271b9ae8aa64be024ddb39b5 -_md5_=c16be7671c872ce02ad3ff2bd187862a diff --git a/metadata/md5-cache/sys-firmware/gnuk-1.1.9 b/metadata/md5-cache/sys-firmware/gnuk-1.1.9 new file mode 100644 index 00000000..1bb00720 --- /dev/null +++ b/metadata/md5-cache/sys-firmware/gnuk-1.1.9 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare pretend unpack +DEPEND=doc? ( dev-python/sphinx ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig +DESCRIPTION=An Implementation of USB Cryptographic Token for GnuPG +EAPI=5 +HOMEPAGE=http://www.fsij.org/category/gnuk.html +IUSE=debug doc tools python_targets_python2_7 python_targets_python3_4 +KEYWORDS=~amd64 +LICENSE=GPL-3 +RDEPEND=virtual/udev tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) +SLOT=0 +_eclasses_=eutils d9bd2ddd85a58e470b49ca997e255a4c git-r3 0961ca04f93a7ae0e4c4a0b2b8c3be99 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 30887c5e8630bbf27b5cf0fd74564323 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 37ef89be271b9ae8aa64be024ddb39b5 +_md5_=c16be7671c872ce02ad3ff2bd187862a diff --git a/sys-firmware/gnuk/Manifest b/sys-firmware/gnuk/Manifest index 1dfa8514..470e16b1 100644 --- a/sys-firmware/gnuk/Manifest +++ b/sys-firmware/gnuk/Manifest @@ -1,4 +1,4 @@ AUX 10-stlink.rules 179 SHA256 8a89aff84d192d270234c9b58229025cdcfd3f5384f864a298d3cfb19b081ea4 WHIRLPOOL 2fba2148444183945f93cd6a0baaccf7e09c887eef245a52c5c17e92e653759e0e66f3a5bd7abae2099d9f2e1f944dd30631f2c1f21356a9424628f92607ab52 -AUX 60-gnuk.rules 193 SHA256 f0077554ddd338a7f5975609c07f86132fc27a944b517c71cc8a60ee1a09fd42 WHIRLPOOL 40d0b3fb8476772251cd85e3b0d6a7b3a38b1bcb1ffe36868a634125bdd7bd51c06aaea9fc7bf2737a888817317973f88d7bc08a2894f900cd0574c653094c3b -EBUILD gnuk-1.1.7.ebuild 2760 SHA256 9b9356043f9a859cfdf7c1b808884f6fbaff7d1f9ad801bec73bbc8cc7653875 WHIRLPOOL 50b671577c3aa52b17e706d77b0fe587ea71f9637ad0439038f20cbb843c9e6b2d5231db8885ce6650daf71f1871d4781aea2c67a90b07d0fce7ac2eac61659e +AUX 60-gnuk.rules 191 SHA256 faf65731989732c533426ffdce2be2a86f722a0b72ebb450fd2b45b93687986c WHIRLPOOL 0afd5dd7b7b0d6c488b89d65c92897c77490a3f9760b54b5c48716fb78a722b75723f52de3be9c2e3a50ec3df6e525bd92a56de3d6d455cc1b1eb3796a2b82eb +EBUILD gnuk-1.1.9.ebuild 2760 SHA256 9b9356043f9a859cfdf7c1b808884f6fbaff7d1f9ad801bec73bbc8cc7653875 WHIRLPOOL 50b671577c3aa52b17e706d77b0fe587ea71f9637ad0439038f20cbb843c9e6b2d5231db8885ce6650daf71f1871d4781aea2c67a90b07d0fce7ac2eac61659e MISC metadata.xml 335 SHA256 9e5ed8f755bc49eb8a0e96b55585a0b5b8f9ee74e1b2d9b71db438d1878dd306 WHIRLPOOL 4b1e0bb69b7ab34954eeb5efa451fcbcb39236eee31d33f2738b36b773d514fffcb3593a00b9993c1e4fdb90b0564bc87391ab3bf3c10c179437873badec4a39 diff --git a/sys-firmware/gnuk/files/60-gnuk.rules b/sys-firmware/gnuk/files/60-gnuk.rules index 37c17ffb..8aca07ad 100644 --- a/sys-firmware/gnuk/files/60-gnuk.rules +++ b/sys-firmware/gnuk/files/60-gnuk.rules @@ -1,3 +1,3 @@ # From http://www.fsij.org/doc-gnuk/udev-rules.html -SUBSYSTEMS=="usb", ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" +SUBSYSTEMS=="usb", ATTR{idVendor}=="234b", ATTR{idProduct}=="0000", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" diff --git a/sys-firmware/gnuk/gnuk-1.1.7.ebuild b/sys-firmware/gnuk/gnuk-1.1.7.ebuild deleted file mode 100644 index be75dc29..00000000 --- a/sys-firmware/gnuk/gnuk-1.1.7.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4} ) -inherit git-r3 eutils python-r1 udev - -DESCRIPTION="An Implementation of USB Cryptographic Token for GnuPG" -HOMEPAGE="http://www.fsij.org/category/gnuk.html" -EGIT_REPO_URI="git://anonscm.debian.org/${PN}/${PN}/${PN}.git" -EGIT_COMMIT="release/${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug doc tools" - -DEPEND="doc? ( dev-python/sphinx )" -RDEPEND="virtual/udev - tools? ( - ${PYTHON_DEPS} - dev-python/pyusb[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - )" - -pkg_pretend() { - if type -p arm-none-eabi-gcc > /dev/null 2>&1 ; then - return 0 - fi - - eerror "Before you could build the firmware, you need to install arm-none-eabi toolchain" - eerror "Run the following commands:" - eerror " emerge -vat crossdev" - eerror " crossdev --stable -t arm-none-eabi" - die "arm-none-eabi toolchain is needed" -} - -src_prepare () { - mv tool/get_raw_public_key.py "tool/${PN}-get_raw_public_key.py" - mv tool/gnuk_put_binary_libusb.py "tool/${PN}-put_binary_libusb.py" - mv tool/gnuk_remove_keys_libusb.py "tool/${PN}-remove_keys_libusb.py" - mv tool/gnuk_upgrade.py "tool/${PN}-upgrade.py" - mv tool/stlinkv2.py "tool/${PN}-stlinkv2.py" - mv tool/upgrade_by_passwd.py "tool/${PN}-upgrade_by_passwd.py" - mv tool/usb_strings.py "tool/${PN}-usb_strings.py" -} - -src_configure() { - cd "${S}/src" - ./configure \ - --verbose \ - --target=FST_01 \ - --vidpid=234b:0000 \ - --enable-certdo \ - $(use_enable debug) \ - || die "configure failed" -} - -src_compile() { - cd "${S}/src" - emake CROSS="arm-none-eabi-" - - if use doc ; then - cd "${S}/doc" - emake html - emake man - fi -} - -src_install() { - insinto "/usr/share/${PN}/firmware" - doins "src/build/${PN}.bin" - - udev_dorules "${FILESDIR}/60-${PN}.rules" - - if use doc ; then - dohtml -r doc/_build/html/* - doman doc/_build/man/* - fi - - if use tools ; then - python_foreach_impl python_domodule tool/gnuk_token.py - python_foreach_impl python_domodule tool/gpg_agent.py - python_foreach_impl python_domodule tool/rsa.py - - python_foreach_impl python_doscript "tool/${PN}-get_raw_public_key.py" - python_foreach_impl python_doscript "tool/${PN}-put_binary_libusb.py" - python_foreach_impl python_doscript "tool/${PN}-remove_keys_libusb.py" - python_foreach_impl python_doscript "tool/${PN}-stlinkv2.py" - python_foreach_impl python_doscript "tool/${PN}-upgrade.py" - python_foreach_impl python_doscript "tool/${PN}-upgrade_by_passwd.py" - python_foreach_impl python_doscript "tool/${PN}-usb_strings.py" - - udev_dorules "${FILESDIR}/10-stlink.rules" - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - dodoc -r doc/note -} diff --git a/sys-firmware/gnuk/gnuk-1.1.9.ebuild b/sys-firmware/gnuk/gnuk-1.1.9.ebuild new file mode 100644 index 00000000..be75dc29 --- /dev/null +++ b/sys-firmware/gnuk/gnuk-1.1.9.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_4} ) +inherit git-r3 eutils python-r1 udev + +DESCRIPTION="An Implementation of USB Cryptographic Token for GnuPG" +HOMEPAGE="http://www.fsij.org/category/gnuk.html" +EGIT_REPO_URI="git://anonscm.debian.org/${PN}/${PN}/${PN}.git" +EGIT_COMMIT="release/${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug doc tools" + +DEPEND="doc? ( dev-python/sphinx )" +RDEPEND="virtual/udev + tools? ( + ${PYTHON_DEPS} + dev-python/pyusb[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + )" + +pkg_pretend() { + if type -p arm-none-eabi-gcc > /dev/null 2>&1 ; then + return 0 + fi + + eerror "Before you could build the firmware, you need to install arm-none-eabi toolchain" + eerror "Run the following commands:" + eerror " emerge -vat crossdev" + eerror " crossdev --stable -t arm-none-eabi" + die "arm-none-eabi toolchain is needed" +} + +src_prepare () { + mv tool/get_raw_public_key.py "tool/${PN}-get_raw_public_key.py" + mv tool/gnuk_put_binary_libusb.py "tool/${PN}-put_binary_libusb.py" + mv tool/gnuk_remove_keys_libusb.py "tool/${PN}-remove_keys_libusb.py" + mv tool/gnuk_upgrade.py "tool/${PN}-upgrade.py" + mv tool/stlinkv2.py "tool/${PN}-stlinkv2.py" + mv tool/upgrade_by_passwd.py "tool/${PN}-upgrade_by_passwd.py" + mv tool/usb_strings.py "tool/${PN}-usb_strings.py" +} + +src_configure() { + cd "${S}/src" + ./configure \ + --verbose \ + --target=FST_01 \ + --vidpid=234b:0000 \ + --enable-certdo \ + $(use_enable debug) \ + || die "configure failed" +} + +src_compile() { + cd "${S}/src" + emake CROSS="arm-none-eabi-" + + if use doc ; then + cd "${S}/doc" + emake html + emake man + fi +} + +src_install() { + insinto "/usr/share/${PN}/firmware" + doins "src/build/${PN}.bin" + + udev_dorules "${FILESDIR}/60-${PN}.rules" + + if use doc ; then + dohtml -r doc/_build/html/* + doman doc/_build/man/* + fi + + if use tools ; then + python_foreach_impl python_domodule tool/gnuk_token.py + python_foreach_impl python_domodule tool/gpg_agent.py + python_foreach_impl python_domodule tool/rsa.py + + python_foreach_impl python_doscript "tool/${PN}-get_raw_public_key.py" + python_foreach_impl python_doscript "tool/${PN}-put_binary_libusb.py" + python_foreach_impl python_doscript "tool/${PN}-remove_keys_libusb.py" + python_foreach_impl python_doscript "tool/${PN}-stlinkv2.py" + python_foreach_impl python_doscript "tool/${PN}-upgrade.py" + python_foreach_impl python_doscript "tool/${PN}-upgrade_by_passwd.py" + python_foreach_impl python_doscript "tool/${PN}-usb_strings.py" + + udev_dorules "${FILESDIR}/10-stlink.rules" + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS + dodoc -r doc/note +} -- cgit v1.2.3