diff options
89 files changed, 596 insertions, 499 deletions
diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild index 14866c580ca2..6d8cf1681815 100644 --- a/app-admin/ranpwd/ranpwd-1.2.ebuild +++ b/app-admin/ranpwd/ranpwd-1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Generate random passwords using the in-kernel cryptographically" HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/" @@ -10,10 +10,6 @@ SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ia64 ppc ppc64 x86" -IUSE="" - -DEPEND="" -RDEPEND="" src_test() { einfo "generating random passwords" diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild index a75e10f43dcf..db32da26fb14 100644 --- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild +++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools ltprune versionator toolchain-funcs udev +inherit autotools toolchain-funcs udev -MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P +MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P SLOT="0" LICENSE="LGPL-2.1" @@ -25,12 +25,10 @@ HOMEPAGE="https://www.acs.com.hk" # libusb-compat is marked stable and primary in the virtual. -ssuominen RDEPEND=">=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/${MY_P} - -IUSE="" +S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${P}-build.patch @@ -43,8 +41,8 @@ src_prepare() { src_install() { default - prune_libtool_files --modules + find "${D}" -name '*.la' -delete || die # note: for eudev support this pkg may always need to install rules to /usr - udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules + udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules } diff --git a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild index 73d76b66a2db..39d2ef7cf78a 100644 --- a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild +++ b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs flag-o-matic @@ -14,9 +14,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="static" -DEPEND="" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}/${P}-build.patch" "${FILESDIR}/${P}-iconv.patch" diff --git a/app-crypt/aespipe/aespipe-2.4e.ebuild b/app-crypt/aespipe/aespipe-2.4e.ebuild index 56384993c289..87bdf7b19a31 100644 --- a/app-crypt/aespipe/aespipe-2.4e.ebuild +++ b/app-crypt/aespipe/aespipe-2.4e.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic diff --git a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild index f4fe0e818025..adf75de12b06 100644 --- a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild +++ b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="ASEDriveIIIe Serial Card Reader" HOMEPAGE="http://www.athena-scs.com" SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" RDEPEND=">=sys-apps/pcsc-lite-1.3.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_install() { default diff --git a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild index 6eb55016bf55..29c177665a45 100644 --- a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild +++ b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="ASEDriveIIIe USB Card Reader" HOMEPAGE="http://www.athena-scs.com" @@ -12,8 +12,8 @@ IUSE="" KEYWORDS="~amd64 ~x86" RDEPEND=">=sys-apps/pcsc-lite-1.3.0 virtual/libusb:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" pkg_postinst() { elog "NOTICE:" diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild index 4c35c71eb638..93d6dd55328d 100644 --- a/app-crypt/asekey/asekey-3.7.ebuild +++ b/app-crypt/asekey/asekey-3.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit udev @@ -11,14 +11,12 @@ SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2 LICENSE="BSD LGPL-2.1" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" -RDEPEND="sys-apps/pcsc-lite[udev]" -RDEPEND="${RDEPEND} +RDEPEND="sys-apps/pcsc-lite[udev] virtual/libusb:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-bundle.patch" diff --git a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild index 21e09193785c..c879aa885721 100644 --- a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild +++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit versionator - -MY_PV="$(replace_version_separator 2 -)" +MY_PV="$(ver_rs 2- -)" DESCRIPTION="Secure file removal utility" HOMEPAGE="http://www.jetico.com/" @@ -17,9 +15,6 @@ SLOT="0" IUSE="doc" KEYWORDS="amd64 ~arm ppc x86" -DEPEND="" -RDEPEND="" - PATCHES=( "${FILESDIR}/${PN}-1.9.7-fix_warnings.patch" "${FILESDIR}/${PN}-1.9.8-fix-flags.patch" diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild index 350edde96ef8..73ee43d0d035 100644 --- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild +++ b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit linux-mod toolchain-funcs versionator +inherit linux-mod toolchain-funcs MY_PN="BestCrypt" DESCRIPTION="commercially licensed transparent filesystem encryption" @@ -12,12 +12,10 @@ SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz" LICENSE="bestcrypt" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" DEPEND="virtual/linux-sources app-shells/bash" -RDEPEND="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/app-crypt/bsign/bsign-0.4.5-r1.ebuild b/app-crypt/bsign/bsign-0.4.5-r1.ebuild index 11ef50052dbb..9da81524e628 100644 --- a/app-crypt/bsign/bsign-0.4.5-r1.ebuild +++ b/app-crypt/bsign/bsign-0.4.5-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools flag-o-matic DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files" -HOMEPAGE="http://packages.debian.org/sid/bsign" +HOMEPAGE="https://packages.debian.org/jessie/bsign" SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz" LICENSE="GPL-2" diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild index 9bae2cd41839..9148963c4c4a 100644 --- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild +++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Tool to read the contents of smartcards" HOMEPAGE="http://pannetrat.com/Cardpeek" @@ -17,6 +17,5 @@ RDEPEND=">=x11-libs/gtk+-2.12:2 dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild index e7fbff7caac9..ad134c9f6598 100644 --- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild +++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Tool to read the contents of smartcards" HOMEPAGE="http://pannetrat.com/Cardpeek" @@ -18,6 +18,5 @@ RDEPEND="sys-apps/pcsc-lite net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/app-crypt/ccid/ccid-1.4.29.ebuild b/app-crypt/ccid/ccid-1.4.29.ebuild index cb96feb53855..55071f600633 100644 --- a/app-crypt/ccid/ccid-1.4.29.ebuild +++ b/app-crypt/ccid/ccid-1.4.29.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs udev @@ -16,8 +16,8 @@ IUSE="twinserial kobil-midentity +usb" RDEPEND=">=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )" -DEPEND="${RDEPEND} - kernel_linux? ( virtual/pkgconfig )" +DEPEND="${RDEPEND}" +BDEPEND="kernel_linux? ( virtual/pkgconfig )" DOCS=( README AUTHORS ) diff --git a/app-crypt/ccrypt/ccrypt-1.10.ebuild b/app-crypt/ccrypt/ccrypt-1.10.ebuild index 169bce5ebc2b..1b3edd99dceb 100644 --- a/app-crypt/ccrypt/ccrypt-1.10.ebuild +++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" DESCRIPTION="Encryption and decryption" -HOMEPAGE="http://ccrypt.sourceforge.net" +HOMEPAGE="https://ccrypt.sourceforge.net" SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" diff --git a/app-crypt/chntpw/chntpw-140201.ebuild b/app-crypt/chntpw/chntpw-140201.ebuild index f6c8a6b06250..6ac48f86b515 100644 --- a/app-crypt/chntpw/chntpw-140201.ebuild +++ b/app-crypt/chntpw/chntpw-140201.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -21,7 +21,10 @@ DEPEND="${RDEPEND} static? ( dev-libs/openssl:0[static-libs] )" DOCS=( - HISTORY.txt README.txt regedit.txt WinReg.txt + HISTORY.txt + README.txt + WinReg.txt + regedit.txt ) src_prepare() { diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild index 79c08285e155..cbb3e7161b80 100644 --- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild +++ b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PATCHVER="003" @@ -18,10 +18,9 @@ IUSE="debug" RDEPEND=">=sys-apps/pcsc-lite-1.6.4 dev-libs/nss[utils] sys-libs/zlib" - DEPEND="${RDEPEND} - >=app-crypt/ccid-1.4.0 - virtual/pkgconfig" + >=app-crypt/ccid-1.4.0" +BDEPEND="virtual/pkgconfig" PATCHES=( "${WORKDIR}/${PN}-patches" diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild index 7a783bb23e83..cf12a7824f6d 100644 --- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild +++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="An advanced suite for testing the randomness of RNG's" HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php" diff --git a/app-crypt/fcrackzip/fcrackzip-1.0.ebuild b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild index a874133ce6a6..696cdae5bdf0 100644 --- a/app-crypt/fcrackzip/fcrackzip-1.0.ebuild +++ b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="a zip password cracker" HOMEPAGE="http://oldhome.schmorp.de/marc/fcrackzip.html" @@ -10,10 +10,8 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="app-arch/unzip" -DEPEND="" src_prepare() { default diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild index 2a66c188bd0c..10f220d75363 100644 --- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild +++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit user @@ -21,8 +21,8 @@ RDEPEND=" >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" pkg_setup() { if use proxy; then diff --git a/app-crypt/gpa/gpa-0.9.10.ebuild b/app-crypt/gpa/gpa-0.9.10.ebuild index 9fe3efefc9b8..c75d84bdf0b1 100644 --- a/app-crypt/gpa/gpa-0.9.10.ebuild +++ b/app-crypt/gpa/gpa-0.9.10.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG" HOMEPAGE="http://gpa.wald.intevation.org" @@ -19,8 +19,8 @@ RDEPEND=" >=dev-libs/libgpg-error-1.4 >=x11-libs/gtk+-2.10.0:2 " -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext )" src_prepare() { diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild index fff6fce3f72a..423fb4af7e91 100644 --- a/app-crypt/gpgme/gpgme-1.11.1.ebuild +++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) DISTUTILS_OPTIONAL=1 -inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs +inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" HOMEPAGE="http://www.gnupg.org/related_software/gpgme" @@ -24,7 +24,6 @@ COMMON_DEPEND=">=app-crypt/gnupg-2 qt5? ( dev-qt/qtcore:5 )" #doc? ( app-doc/doxygen[dot] ) DEPEND="${COMMON_DEPEND} - python? ( dev-lang/swig ) qt5? ( dev-qt/qttest:5 )" RDEPEND="${COMMON_DEPEND} cxx? ( @@ -33,6 +32,7 @@ RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )" +BDEPEND="python? ( dev-lang/swig )" REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -108,7 +108,7 @@ src_test() { src_install() { default do_python - prune_libtool_files + find "${D}" -name '*.la' -delete || die # backward compatibility for gentoo # in the past we had slots diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild index 3c528ef3e7a2..aaf6c2ee7add 100644 --- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild +++ b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs @@ -11,7 +11,6 @@ SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="app-crypt/gpgme" DEPEND="${RDEPEND}" diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild index 08448ab7923e..b094e1169982 100644 --- a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild +++ b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit multilib-minimal DESCRIPTION="Tools for computing and checking HMAC values for files" diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild index b4d60a13decb..b8eed231b1b6 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib @@ -27,7 +27,7 @@ REQUIRED_USE="openmp? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )" -DEPEND="sys-libs/zlib +RDEPEND="sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -37,7 +37,7 @@ DEPEND="sys-libs/zlib dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild index 129a3f8c98c1..dacb7651b18d 100644 --- a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild +++ b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info udev user @@ -14,13 +14,11 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="kernel_linux static-libs systemd" -RDEPEND=" - dev-libs/hidapi +DEPEND="dev-libs/hidapi dev-libs/json-c:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} +RDEPEND="${DEPEND} systemd? ( sys-apps/systemd[acl] )" +BDEPEND="virtual/pkgconfig" CONFIG_CHECK="~HIDRAW" diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild index 89281dfd83a1..06befd824408 100644 --- a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild +++ b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit udev @@ -14,12 +14,11 @@ SLOT="0" KEYWORDS="~amd64" IUSE="kernel_linux" -RDEPEND="sys-apps/pcsc-lite +DEPEND="sys-apps/pcsc-lite dev-libs/libzip" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} +RDEPEND="${DEPEND} >=app-crypt/ccid-1.4.18[usb]" +BDEPEND="virtual/pkgconfig" src_configure() { econf \ diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild index abeaf0b775d7..51ab7bc27529 100644 --- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild +++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -inherit autotools toolchain-funcs libtool flag-o-matic +inherit autotools toolchain-funcs flag-o-matic MY_PV="${PV/_/-}" MY_P="util-linux-${MY_PV}" diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild index 03b77bb3afb3..4db26ac6ea89 100644 --- a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild +++ b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 DESCRIPTION="replacement of the old unix crypt(1)" HOMEPAGE="http://mcrypt.sourceforge.net/" @@ -12,10 +12,10 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~x86-macos" IUSE="nls" -DEPEND=">=dev-libs/libmcrypt-2.5.8 +RDEPEND=">=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.6.7-qa.patch" diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild index 93020816bfd6..631b65b9a6e8 100644 --- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild +++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 DESCRIPTION="A C implementation of MD6" HOMEPAGE="https://groups.csail.mit.edu/cis/md6" @@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" PATCHES=( "${FILESDIR}/${P}-ldflags.patch" diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild index 0c3993c9d67e..17078b15f18e 100644 --- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild +++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="library providing a uniform interface to a large number of hash algorithms" HOMEPAGE="http://mhash.sourceforge.net/" @@ -12,8 +12,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" -RDEPEND="" -DEPEND="dev-lang/perl" # pod2html +BDEPEND="dev-lang/perl" # pod2html PATCHES=( "${FILESDIR}/${PN}-0.9.9-fix-mem-leak.patch" diff --git a/app-crypt/nasty/nasty-0.6-r1.ebuild b/app-crypt/nasty/nasty-0.6-r1.ebuild index 8cfa34f4d007..574cd87cb1de 100644 --- a/app-crypt/nasty/nasty-0.6-r1.ebuild +++ b/app-crypt/nasty/nasty-0.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs @@ -11,7 +11,6 @@ SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="app-crypt/gpgme" DEPEND="${RDEPEND}" diff --git a/app-crypt/nwipe/nwipe-0.21.ebuild b/app-crypt/nwipe/nwipe-0.21.ebuild index 91818423c6c6..2a2860c392f2 100644 --- a/app-crypt/nwipe/nwipe-0.21.ebuild +++ b/app-crypt/nwipe/nwipe-0.21.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -16,8 +16,8 @@ IUSE="" RDEPEND=">=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/app-crypt/onak/onak-0.5.0.ebuild b/app-crypt/onak/onak-0.5.0.ebuild index f17d1f50f816..258e3d778a1e 100644 --- a/app-crypt/onak/onak-0.5.0.ebuild +++ b/app-crypt/onak/onak-0.5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild index 964c21f365bf..b82881e034e4 100644 --- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild +++ b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools ltprune +inherit autotools MY_P="${P/-tpm-/_tpm_}" @@ -38,5 +38,5 @@ src_prepare() { src_install() { default - prune_libtool_files --modules + find "${D}" -name '*.la' -delete || die } diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild index 0d0080c1232c..b38707419541 100644 --- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild +++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit ltprune multilib-minimal +inherit multilib-minimal DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit" @@ -18,8 +18,8 @@ REQUIRED_USE="trust? ( asn1 )" RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] ) libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] ) trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" pkg_setup() { # disable unsafe tests, bug#502088 @@ -56,5 +56,5 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - prune_libtool_files --modules + find "${D}" -name '*.la' -delete || die } diff --git a/app-crypt/pdfcrack/pdfcrack-0.16.ebuild b/app-crypt/pdfcrack/pdfcrack-0.16.ebuild index 206b6b4510de..8ce1ecdada43 100644 --- a/app-crypt/pdfcrack/pdfcrack-0.16.ebuild +++ b/app-crypt/pdfcrack/pdfcrack-0.16.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" PATCHES=( "${FILESDIR}/${PN}-0.14-cflags.patch" diff --git a/app-crypt/pius/pius-2.2.4.ebuild b/app-crypt/pius/pius-2.2.4.ebuild index 927947b3642a..ff4114878a2b 100644 --- a/app-crypt/pius/pius-2.2.4.ebuild +++ b/app-crypt/pius/pius-2.2.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 diff --git a/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch b/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch new file mode 100644 index 000000000000..d9e160decc2c --- /dev/null +++ b/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch @@ -0,0 +1,102 @@ +From 7bcbfd712044a5455f03d607a60c557f90d16671 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <alon.barlev@gmail.com> +Date: Sun, 23 Sep 2018 15:49:32 +0300 +Subject: [PATCH] build + +--- + src/extract.c | 2 +- + src/findkey.c | 2 +- + src/main.c | 2 +- + src/makekey.c | 3 ++- + src/mktmptbl.c | 1 + + src/zdmain.c | 2 +- + 6 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/extract.c b/src/extract.c +index 6cb7800..58e740d 100644 +--- a/src/extract.c ++++ b/src/extract.c +@@ -90,7 +90,7 @@ static void usage( char *prg ) + fprintf( stderr, " -s <size>\textract only specified number of bytes\n" ); + } + +-void main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + char *ret, *outname; + int outfile, err=0, i, caseflg=0, size=0; +diff --git a/src/findkey.c b/src/findkey.c +index 0de9dd3..ab2094a 100644 +--- a/src/findkey.c ++++ b/src/findkey.c +@@ -56,7 +56,7 @@ static void usage( char *name ) + exit( 1 ); + } + +-void main( int argc, char **argv ) ++int main( int argc, char **argv ) + { + uword key0, key1, key2; + int pwdLen=0; +diff --git a/src/main.c b/src/main.c +index 8e58072..d84b339 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -128,7 +128,7 @@ static void usage( char *myself ) + fprintf( stderr, " -n\tno progress indicator\n" ); + } + +-void main( int argc, char **argv ) ++int main( int argc, char **argv ) + { + int crypt, plain, cryptlength, plainlength; + struct stat filestat; +diff --git a/src/makekey.c b/src/makekey.c +index 271fab3..f28029c 100644 +--- a/src/makekey.c ++++ b/src/makekey.c +@@ -12,6 +12,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + #include "pkcrack.h" + #include "keystuff.h" + #include "crc.h" +@@ -24,7 +25,7 @@ static void usage( char *name ) + exit( 1 ); + } + +-void main( int argc, char **argv ) ++int main( int argc, char **argv ) + { + char * pwd; + int pwdLen, i; +diff --git a/src/mktmptbl.c b/src/mktmptbl.c +index 46f1402..848f171 100644 +--- a/src/mktmptbl.c ++++ b/src/mktmptbl.c +@@ -43,6 +43,7 @@ + static char RCSID[]="$Id: mktmptbl.c,v 1.9 2002/11/02 15:12:06 lucifer Exp $"; + + #include <stdio.h> ++#include <string.h> + #include "mktmptbl.h" + + ushort tempTable[256][64]; +diff --git a/src/zdmain.c b/src/zdmain.c +index bfb1f6b..6909b2d 100644 +--- a/src/zdmain.c ++++ b/src/zdmain.c +@@ -35,7 +35,7 @@ static char RCSID[]="$Id: zdmain.c,v 1.4 2002/12/28 17:01:42 lucifer Exp $"; + + extern void zipdecrypt( char*infile, char*outfile, int k0, int k1, int k2 ); + +-void main( int argc, char **argv ) ++int main( int argc, char **argv ) + { + char *c; + +-- +2.16.4 + diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild index 251eb649d276..862cdd7871b6 100644 --- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild +++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs DESCRIPTION="PkZip cipher breaker" @@ -13,38 +13,37 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="test" -DEPEND="test? ( app-arch/zip[crypt] )" RDEPEND="!<app-text/html-xml-utils-5.3" +BDEPEND="test? ( app-arch/zip[crypt] )" DOCS=( - ../doc/KNOWN_BUGS - ../doc/appnote.iz.txt - ../doc/README.W32 - ../doc/pkzip.ps.gz - ../doc/CHANGES - ../doc/LIESMICH - ../doc/README.html - ../doc/README + doc/KNOWN_BUGS + doc/appnote.iz.txt + doc/README.W32 + doc/pkzip.ps.gz + doc/CHANGES + doc/LIESMICH + doc/README.html + doc/README ) -S="${WORKDIR}/${P}/src" +PATCHES=( + "${FILESDIR}/${P}-build.patch" +) -src_prepare() { - default - sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \ - -e "/^CFLAGS=.*/d" \ - -e "s/CFLAGS/LDFLAGS/" \ - Makefile - sed -i -e "s:void main:int main:" *.c +src_compile() { + cd src + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all } src_test() { - cd "${S}/../test" - make CC="$(tc-getCC)" all + cd test + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all } src_install() { einstalldocs + cd src dobin pkcrack zipdecrypt findkey makekey newbin extract "$PN-extract" } diff --git a/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild b/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild index 2a9e79a40f44..7cebd67d062c 100644 --- a/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild +++ b/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Utilities for PKCS#11 data object manipulation in" HOMEPAGE="https://github.com/alonbl/pkcs11-data" @@ -12,8 +12,6 @@ SLOT="0" KEYWORDS="~amd64" -IUSE="" - RDEPEND=">=dev-libs/pkcs11-helper-1.02" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild index 183662606ba5..03d0686f84ff 100644 --- a/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild +++ b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Utilities for PKCS#11 token content dump" HOMEPAGE="https://github.com/alonbl/pkcs11-dump" @@ -17,5 +17,5 @@ IUSE="libressl" RDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild index 0714052cedd3..0d8edb759c19 100644 --- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild +++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 MY_P=${P/-/_} S=${WORKDIR}/${MY_P} @@ -12,7 +12,6 @@ SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86" -IUSE="" DEPEND=">=dev-lang/perl-5.6 virtual/perl-Digest-MD5" diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild index 214401f6c347..ec95cda05ca4 100644 --- a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild +++ b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils @@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip ) LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="~amd64 ~x86 -*" +KEYWORDS="-* ~amd64 ~x86" IUSE="" RESTRICT="bindist mirror" #444426 diff --git a/app-crypt/scrypt/scrypt-1.2.0.ebuild b/app-crypt/scrypt/scrypt-1.2.0.ebuild index e3cc79551451..31b749d7d257 100644 --- a/app-crypt/scrypt/scrypt-1.2.0.ebuild +++ b/app-crypt/scrypt/scrypt-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-crypt/scute/scute-1.5.0.ebuild b/app-crypt/scute/scute-1.5.0.ebuild index 85adede2192a..9403b7ae9644 100644 --- a/app-crypt/scute/scute-1.5.0.ebuild +++ b/app-crypt/scute/scute-1.5.0.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit ltprune +EAPI=7 DESCRIPTION="A PKCS #11 module for OpenPGP smartcards" HOMEPAGE="http://www.scute.org/" @@ -12,18 +10,17 @@ SRC_URI="mirror://gnupg/scute/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="" # configure script try to check the version of gpgsm and gpg-agent when # non-crosscompiling so we need to have them as build-time dependency as # well as runtime. Require a version of gnupg that is patched to have # gpgsm-gencert.sh working (as that's what the documentation describe). -DEPEND=" - >=dev-libs/libgpg-error-1.4 - >=dev-libs/libassuan-2.0.0 - >=app-crypt/pinentry-0.7.0 +BDEPEND=">=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard]" -RDEPEND="${DEPEND}" +DEPEND=">=dev-libs/libgpg-error-1.4 + >=dev-libs/libassuan-2.0.0" +RDEPEND="${DEPEND} + ${BDEPEND}" src_configure() { econf \ @@ -33,5 +30,5 @@ src_configure() { src_install() { default - prune_libtool_files --modules + find "${D}" -name '*.la' -delete || die } diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild index f2044bcb3a12..80217c2b8abd 100644 --- a/app-crypt/signing-party/signing-party-2.7.ebuild +++ b/app-crypt/signing-party/signing-party-2.7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs autotools @@ -12,12 +12,9 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND=" - dev-lang/perl - app-crypt/libmd -" +DEPEND="dev-lang/perl + app-crypt/libmd" RDEPEND="${DEPEND} >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface diff --git a/app-crypt/ssdeep/ssdeep-2.13.ebuild b/app-crypt/ssdeep/ssdeep-2.13.ebuild index 386169e63a0e..982b953c49d2 100644 --- a/app-crypt/ssdeep/ssdeep-2.13.ebuild +++ b/app-crypt/ssdeep/ssdeep-2.13.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools multilib-minimal @@ -15,7 +15,12 @@ KEYWORDS="~amd64 ~x86" IUSE="static-libs" DOCS=( - AUTHORS ChangeLog FILEFORMAT NEWS README TODO + AUTHORS + ChangeLog + FILEFORMAT + NEWS + README + TODO ) PATCHES=( diff --git a/app-crypt/stan/stan-0.4.1-r1.ebuild b/app-crypt/stan/stan-0.4.1-r1.ebuild index 91952b99aec5..2d9a98e30c57 100644 --- a/app-crypt/stan/stan-0.4.1-r1.ebuild +++ b/app-crypt/stan/stan-0.4.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools DESCRIPTION="Stan analyzes binary streams and calculates statistical information" @@ -11,7 +12,6 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" PATCHES=( "${FILESDIR}/${P}-errno.patch" diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r1.ebuild index 16df65d19d06..e0576be90fa5 100644 --- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild +++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs multilib-minimal diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild index 274da28fc848..cdc5f577e854 100644 --- a/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild +++ b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild index eac3a3944abd..3be16cf93ed1 100644 --- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild +++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools flag-o-matic ltprune +inherit autotools flag-o-matic DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules" HOMEPAGE="http://trousers.sourceforge.net" @@ -14,16 +14,12 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86" IUSE="libressl nls pkcs11 debug" -COMMON_DEPEND=" - >=app-crypt/trousers-0.3.0 +DEPEND=">=app-crypt/trousers-0.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - pkcs11? ( dev-libs/opencryptoki ) - " -RDEPEND="${COMMON_DEPEND} - nls? ( virtual/libintl )" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext )" + pkcs11? ( dev-libs/opencryptoki )" +RDEPEND="${DEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" S="${WORKDIR}" @@ -47,5 +43,5 @@ src_configure() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -delete || die } diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd index 19278c5658d3..c9c050cb06d9 100644 --- a/app-crypt/trousers/files/tcsd.initd +++ b/app-crypt/trousers/files/tcsd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild index 0709846429a1..e852005fcd55 100644 --- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild +++ b/app-crypt/trousers/trousers-0.3.14-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools linux-info ltprune readme.gentoo-r1 systemd user udev +inherit autotools linux-info readme.gentoo-r1 systemd user udev DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation" HOMEPAGE="http://trousers.sf.net" @@ -17,14 +17,12 @@ IUSE="doc libressl selinux" # gtk # gtk support presently does NOT compile. # gtk? ( >=x11-libs/gtk+-2 ) -CDEPEND=">=dev-libs/glib-2 +DEPEND=">=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) - libressl? ( dev-libs/libressl ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} + libressl? ( dev-libs/libressl )" +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-tcsd )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-0.3.13-nouseradd.patch" @@ -93,6 +91,8 @@ src_configure() { src_install() { default + find "${D}" -name '*.la' -delete || die + keepdir /var/lib/tpm use doc && dodoc doc/* newinitd "${FILESDIR}"/tcsd.initd tcsd @@ -100,6 +100,5 @@ src_install() { systemd_dounit "${FILESDIR}"/tcsd.service udev_dorules "${FILESDIR}"/61-trousers.rules fowners tss:tss /var/lib/tpm - prune_libtool_files readme.gentoo_create_doc } diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild index 61474039114b..377ef7626928 100644 --- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild +++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Manage /usr/bin/pinentry symlink" HOMEPAGE="https://www.gentoo.org/proj/en/eselect/" diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17.ebuild index 76f17bc19eef..3288e91d07f7 100644 --- a/dev-libs/botan/botan-1.10.17.ebuild +++ b/dev-libs/botan/botan-1.10.17.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit multilib python-r1 toolchain-funcs @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND} + bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) gmp? ( >=dev-libs/gmp-4.2.2:* ) @@ -28,7 +30,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) !libressl? ( <dev-libs/openssl-1.1:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) )" -DEPEND="${RDEPEND} +BDEPEND="dev-lang/python:* doc? ( dev-python/sphinx )" PATCHES=( diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild index 9ff13b7881c5..9763cbe67a68 100644 --- a/dev-libs/botan/botan-2.7.0.ebuild +++ b/dev-libs/botan/botan-2.7.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit multilib python-r1 toolchain-funcs versionator +inherit multilib python-r1 toolchain-funcs MY_PN="Botan" MY_P="${MY_PN}-${PV}" @@ -13,13 +13,16 @@ HOMEPAGE="https://botan.randombit.net/" SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz" KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -SLOT="2/$(get_version_component_range 2)" # soname version +SLOT="2/$(ver_cut 1-2)" # soname version LICENSE="BSD" IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND} + bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) boost? ( >=dev-libs/boost-1.48 ) lzma? ( app-arch/xz-utils ) @@ -28,8 +31,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) )" -DEPEND="${RDEPEND} - dev-lang/python:* +BDEPEND="dev-lang/python:* doc? ( dev-python/sphinx )" src_configure() { diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild index ca9bfbc1c080..03281fc62859 100644 --- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild +++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs @@ -14,7 +14,7 @@ SLOT="0/5.6" # subslot is so version KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos" IUSE="static-libs" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S="${WORKDIR}" diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild index 0a748f1e54be..ca2ab2b9648c 100644 --- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild +++ b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs @@ -14,7 +14,7 @@ SLOT="0/7" # subslot is so version KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~x64-macos" IUSE="+asm static-libs" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" S="${WORKDIR}" diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild index b5bbdb50890b..328252c5ac32 100644 --- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit autotools @@ -12,10 +12,6 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -DEPEND="" -RDEPEND="" DOCS=( AUTHORS NEWS README THANKS TODO ChangeLog diff --git a/dev-libs/libp11/libp11-0.4.7.ebuild b/dev-libs/libp11/libp11-0.4.7.ebuild index ef1ce17e2ae0..1feb03bf57e5 100644 --- a/dev-libs/libp11/libp11-0.4.7.ebuild +++ b/dev-libs/libp11/libp11-0.4.7.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" - -inherit ltprune +EAPI=7 DESCRIPTION="Abstraction layer to simplify PKCS#11 API" HOMEPAGE="https://github.com/opensc/libp11/wiki" @@ -30,5 +28,5 @@ src_configure() { src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild index ee1a03c88a85..40a536e8736b 100644 --- a/dev-libs/nettle/nettle-3.4.ebuild +++ b/dev-libs/nettle/nettle-3.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools multilib-build multilib-minimal multilib toolchain-funcs @@ -25,8 +25,6 @@ MULTILIB_WRAPPED_HEADERS=( DOCS=() HTML_DOCS=() -S="${WORKDIR}/${PN}-3.4" - pkg_setup() { use doc && DOCS+=( nettle.pdf diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild index c2724bc8d3ed..da43888b4524 100644 --- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild +++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit autotools multilib flag-o-matic user @@ -21,18 +21,24 @@ RDEPEND="tpm? ( app-crypt/trousers ) libressl? ( dev-libs/libressl:0= )" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" +DOCS=( + README AUTHORS FAQ TODO + doc/openCryptoki-HOWTO.pdf +) # tests right now basically don't exist; the only available thing would # test against an installed copy and would kill a running pcscd, all # things that we're not interested to. RESTRICT=test +S="${WORKDIR}/${PN}" + pkg_setup() { enewgroup pkcs11 } src_prepare() { + default mv configure.in configure.ac || die eautoreconf } @@ -68,23 +74,21 @@ src_configure() { } src_install() { - emake install DESTDIR="${ED}" + default + find "${ED}" -name '*.la' -delete || die # Install libopencryptoki in the standard directory for libraries. - mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die - rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so + mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die + rm "${ED}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so # Remove compatibility symlinks as we _never_ required those and # they seem unused even upstream. - find "${D}" -name 'PKCS11_*' -delete - - # doesn't use libltdl; only dlopen()-based interfaces - find "${D}" -name '*.la' -delete + find "${ED}" -name 'PKCS11_*' -delete # We replace their ld.so and init files (mostly designed for RedHat # as far as I can tell) with our own replacements. - rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d + rm -rf "${ED}"/etc/ld.so.conf.d "${ED}"/etc/rc.d # make sure that we don't modify the init script if the USE flags # are enabled for the needed services. @@ -94,7 +98,5 @@ src_install() { # We create /var dirs at runtime as needed, so don't bother installing # our own. - rm -r "${D}"/var/{lib,lock} || die - - dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf + rm -r "${ED}"/var/{lib,lock} || die } diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild index 4f6f1383102a..c07161fde52a 100644 --- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild +++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools multilib ltprune flag-o-matic user +inherit autotools multilib flag-o-matic user DESCRIPTION="PKCS#11 provider cryptographic hardware" HOMEPAGE="https://sourceforge.net/projects/opencryptoki" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz" # token sources are under CPL-1.0 already. LICENSE="CPL-0.5" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~s390 ~x86" IUSE="debug libressl +tpm" RDEPEND="tpm? ( app-crypt/trousers ) @@ -74,7 +74,7 @@ src_configure() { src_install() { default - prune_libtool_files --all + find "${ED}" -name '*.la' -delete || die # Install libopencryptoki in the standard directory for libraries. mv "${ED}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${ED}"/usr/$(get_libdir) || die diff --git a/dev-libs/openct/files/openct.rc.2 b/dev-libs/openct/files/openct.initd index d07cc6116262..ecf574f2e31c 100644 --- a/dev-libs/openct/files/openct.rc.2 +++ b/dev-libs/openct/files/openct.initd @@ -1,24 +1,20 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { need localmount } -checkconfig() { +start_pre() { if [ ! -e /etc/openct.conf ] ; then eerror "You need an /etc/openct.conf file to run OpenCT" return 1 fi - return 0 + checkpath -d -m 0750 -o openctd:openct /var/run/openct } start() { - checkconfig || return 1 - - checkpath -d -m 0750 -o openctd:openct /var/run/openct - ebegin "Starting OpenCT" /usr/sbin/openct-control init eend $? diff --git a/dev-libs/openct/files/openct.rc b/dev-libs/openct/files/openct.rc deleted file mode 100644 index b3ff33e974eb..000000000000 --- a/dev-libs/openct/files/openct.rc +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount -} - -checkconfig() { - if [ ! -e /etc/openct.conf ] ; then - eerror "You need an /etc/openct.conf file to run OpenCT" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting OpenCT" - /usr/sbin/openct-control init - eend $? -} - -stop() { - ebegin "Stopping OpenCT" - /usr/sbin/openct-control shutdown - eend $? -} diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml index 38be29df0b18..769c5bd3d17e 100644 --- a/dev-libs/openct/metadata.xml +++ b/dev-libs/openct/metadata.xml @@ -13,9 +13,6 @@ <flag name="debug"> Add debug output to the driver library for pcsc-lite. </flag> - <flag name="udev"> - Install rules for <pkg>sys-fs/udev</pkg> to auto-start openct. - </flag> </use> <upstream> <remote-id type="github">OpenSC/openct</remote-id> diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild index b675d41066d2..cb39d7698bf9 100644 --- a/dev-libs/openct/openct-0.6.20-r4.ebuild +++ b/dev-libs/openct/openct-0.6.20-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit flag-o-matic ltprune multilib udev user +inherit flag-o-matic multilib udev user DESCRIPTION="library for accessing smart card terminals" HOMEPAGE="https://github.com/OpenSC/openct/wiki" @@ -13,22 +13,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" LICENSE="LGPL-2.1" SLOT="0" -IUSE="doc pcsc-lite usb debug +udev" +IUSE="doc pcsc-lite usb debug" -# Drop the libtool dep once libltdl goes stable. RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -# udev is not required at all at build-time as it's only a matter of -# installing the rules; add openrc for the checkpath used in the new -# init script -RDEPEND="${RDEPEND} - udev? ( virtual/udev ) - sys-apps/openrc" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" pkg_setup() { enewgroup openct @@ -56,12 +47,12 @@ src_configure() { src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die rm "${D}"/usr/$(get_libdir)/openct-ifd.* - use udev && udev_newrules etc/openct.udev 70-openct.rules + udev_newrules etc/openct.udev 70-openct.rules - newinitd "${FILESDIR}"/openct.rc.2 openct + newinitd "${FILESDIR}"/openct.initd openct } pkg_postinst() { diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild index 5a08f4453a68..8e68f0328789 100644 --- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild +++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit bash-completion-r1 ltprune +inherit bash-completion-r1 DESCRIPTION="Libraries and applications to access smartcards" HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki" @@ -24,10 +24,10 @@ RDEPEND="zlib? ( sys-libs/zlib ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= )" DEPEND="${RDEPEND} - virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( dev-util/cmocka )" +BDEPEND="virtual/pkgconfig" REQUIRED_USE=" pcsc-lite? ( !openct !ctapi ) @@ -60,5 +60,5 @@ src_configure() { src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild index 9443a93a491d..d291393a8190 100644 --- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild +++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit multilib-minimal @@ -14,9 +14,6 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="nls" -DEPEND="" -RDEPEND="" - multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable nls) diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild index 9020a02da000..0be43f28eb84 100644 --- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild +++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" - -inherit ltprune +EAPI=7 DESCRIPTION="PKCS#11 helper library" HOMEPAGE="https://github.com/OpenSC/pkcs11-helper" @@ -19,8 +17,8 @@ RDEPEND=" libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )" -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )" PATCHES=( @@ -39,5 +37,5 @@ src_configure() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild index 419485df8258..ec4f819aecca 100644 --- a/dev-libs/softhsm/softhsm-2.4.0.ebuild +++ b/dev-libs/softhsm/softhsm-2.4.0.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit ltprune +EAPI=7 DESCRIPTION="A software PKCS#11 implementation" HOMEPAGE="https://www.opendnssec.org/" @@ -14,17 +12,14 @@ IUSE="bindist libressl migration-tool test" SLOT="2" LICENSE="BSD" -RDEPEND=" - sys-devel/gcc:=[cxx] - migration-tool? ( dev-db/sqlite:3 ) +RDEPEND="migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) - !=dev-libs/softhsm-2.0.0:0 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cppunit ) -" + !~dev-libs/softhsm-2.0.0:0" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + sys-devel/gcc:=[cxx] + test? ( dev-util/cppunit )" DOCS=( NEWS @@ -34,9 +29,9 @@ DOCS=( src_configure() { econf \ --disable-static \ - --localstatedir="${EROOT}var" \ --with-crypto-backend=openssl \ --disable-p11-kit \ + --localstatedir="${EROOT}/var" \ $(use_enable !bindist ecc) \ $(use_enable !libressl gost) \ $(use_with migration-tool migrate) @@ -44,6 +39,7 @@ src_configure() { src_install() { default + find "${D}" -name '*.la' -delete || die + keepdir "${EROOT}/var/lib/softhsm/tokens" - prune_libtool_files --modules } diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild index e4393747d0bd..51d54fb37527 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools ltprune +inherit autotools DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" HOMEPAGE="https://www.aleksey.com/xmlsec" @@ -28,8 +28,8 @@ RDEPEND=">=dev-libs/libxml2-2.7.4 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${PN}1-${PV}" @@ -61,5 +61,5 @@ src_test() { src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die } diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild index 38dc29b9b670..4cf0792d4dee 100644 --- a/dev-python/pyscard/pyscard-1.9.5.ebuild +++ b/dev-python/pyscard/pyscard-1.9.5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) @@ -16,11 +16,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="" -RDEPEND="sys-apps/pcsc-lite" +RDEPEND="${PYTHON_DEP} + sys-apps/pcsc-lite" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" +BDEPEND="${PYTHON_DEP} dev-lang/swig" # Fails diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 350b6f949d12..393f0db073c3 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -351,9 +351,10 @@ multilib_env() { ;; esac ;; - mips64*) + mips64*|mipsisa64*) export CFLAGS_o32=${CFLAGS_o32--mabi=32} export CHOST_o32=${CTARGET/mips64/mips} + export CHOST_o32=${CHOST_o32/mipsisa64/mipsisa32} export CTARGET_o32=${CHOST_o32} export LIBDIR_o32="lib" diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild new file mode 100644 index 000000000000..f9231e34b263 --- /dev/null +++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal + +DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" +HOMEPAGE="http://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="GPL-3 LGPL-2.1" +SLOT="0/30" # libgnutls.so number +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" + +REQUIRED_USE=" + test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" + +# NOTICE: sys-devel/autogen is required at runtime as we +# use system libopts +RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + app-misc/datefudge + dev-libs/softhsm:2[-bindist] + net-dialup/ppp + net-misc/socat + )" + +DOCS=( + README.md + doc/certtool.cfg +) + +HTML_DOCS=() + +pkg_setup() { + # bug#520818 + export TZ=UTC + + use doc && HTML_DOCS+=( + doc/gnutls.html + ) +} + +src_prepare() { + default + + # force regeneration of autogen-ed files + local file + for file in $(grep -l AutoGen-ed src/*.c) ; do + rm src/$(basename ${file} .c).{c,h} || die + done + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + # remove magic of library detection + # bug#438222 + local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) + + # TPM needs to be tested before being enabled + libconf+=( --without-tpm ) + + # hardware-accell is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + + ECONF_SOURCE=${S} econf \ + $(multilib_native_enable manpages) \ + $(multilib_native_use_enable doc gtk-doc) \ + $(multilib_native_use_enable doc) \ + $(multilib_native_use_enable guile) \ + $(multilib_native_use_enable seccomp seccomp-tests) \ + $(multilib_native_use_enable test tests) \ + $(multilib_native_use_enable test-full full-test-suite) \ + $(multilib_native_use_enable tools) \ + $(multilib_native_use_enable valgrind valgrind-tests) \ + $(use_enable cxx) \ + $(use_enable dane libdane) \ + $(use_enable nls) \ + $(use_enable openpgp openpgp-authentication) \ + $(use_enable openssl openssl-compatibility) \ + $(use_enable sslv2 ssl2-support) \ + $(use_enable sslv3 ssl3-support) \ + $(use_enable static-libs static) \ + $(use_enable tls-heartbeat heartbeat-support) \ + $(use_with idn libidn2) \ + $(use_with idn) \ + $(use_with pkcs11 p11-kit) \ + $(use_with zlib) \ + --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ + --without-included-libtasn1 \ + "${libconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild index fd1664469d06..f5e8e131dfae 100644 --- a/net-libs/gnutls/gnutls-3.6.3.ebuild +++ b/net-libs/gnutls/gnutls-3.6.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit libtool ltprune multilib-minimal versionator +inherit libtool multilib-minimal DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/30" # libgnutls.so number @@ -25,20 +25,19 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-1.8:=[networking] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) - ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) test-full? ( - guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] @@ -120,7 +119,7 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die if use examples; then docinto examples diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild index e5103942e69c..40e884028410 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 @@ -47,8 +47,7 @@ PDEPEND="kernel_linux? ( REQUIRED_USE=" airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) - airgraph-ng? ( ${PYTHON_REQUIRED_USE} ) -" + airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( "${FILESDIR}/${P}-8812au.patch" diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild index 82a54cb816c4..9c0c449c9577 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 @@ -47,8 +47,7 @@ PDEPEND="kernel_linux? ( REQUIRED_USE=" airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) - airgraph-ng? ( ${PYTHON_REQUIRED_USE} ) -" + airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" src_prepare() { default diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild index d4bd59a028f0..c7c1c62bc348 100644 --- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild +++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys" HOMEPAGE="http://wepdecrypt.sourceforge.net/" diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild index 7f79a7f93797..2ce84f5f3eae 100644 --- a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild +++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -14,11 +14,13 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz" IUSE="" RDEPEND=">=sys-apps/pcsc-lite-1.2.9_beta7 virtual/libusb:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( - README README.410 README.430 + README + README.410 + README.430 ) src_compile() { diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild index 2136aebdae3f..485d618a3a1f 100644 --- a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild +++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit python-single-r1 systemd udev user multilib-minimal @@ -27,18 +27,16 @@ REQUIRED_USE="^^ ( udev libusb ) \ # No dependencies need the MULTILIB_DEPS because the libraries are actually # standalone, the deps are only needed for the daemon itself. -CDEPEND="libusb? ( virtual/libusb:1 ) +DEPEND="libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( ${PYTHON_DEPS} )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 - selinux? ( sec-policy/selinux-pcscd ) -" + selinux? ( sec-policy/selinux-pcscd )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild index 2ef864e624f7..17644f426dfc 100644 --- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild +++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs @@ -11,17 +11,17 @@ DESCRIPTION="Schlumberger Reflex 72 Serial Smartcard Reader" HOMEPAGE="http://www.linuxnet.com/sourcedrivers.html" LICENSE="all-rights-reserved BSD LGPL-2.1+" KEYWORDS="~amd64 ~x86" -IUSE="" SLOT="0" SRC_URI="mirror://gentoo/${MY_P}-drv-${PV}.tar.gz" RDEPEND="sys-apps/pcsc-lite dev-libs/openct" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( - ERRATA README + ERRATA + README ) PATCHES=( diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest index d8ab3e835ed5..28ba0d4c49aa 100644 --- a/sys-apps/pcsc-tools/Manifest +++ b/sys-apps/pcsc-tools/Manifest @@ -1,2 +1 @@ -DIST pcsc-tools-1.4.27.tar.gz 192342 BLAKE2B c17fa151afd6064bc15dda156248799bffaa08118b65fe57690a7a6e4697e0f44c31abc7e1b03f3eb6a3c551bec86b853b944b693f5b9242d649563fb64a2cd4 SHA512 f4532e6deab799c96fb344a8b3d07768b4c13d8800a486cf0bfe6200794e2b49dcd1c761dec86dca3c350d88577ec2bba420298c693449fddeeff93672449836 DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793acf2979f2410c92857cce7483ebbb59db07657bc27be6d5a799f7f85da45782c4f1a9bbf7c450b43d533dce54755e7 SHA512 da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0 diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.27.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.27.ebuild deleted file mode 100644 index 3c46092e3b4d..000000000000 --- a/sys-apps/pcsc-tools/pcsc-tools-1.4.27.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils fdo-mime multilib toolchain-funcs - -DESCRIPTION="PC/SC Architecture smartcard tools" -HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" -SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="gtk network-cron" - -RDEPEND=">=sys-apps/pcsc-lite-1.4.14" - -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - dev-perl/pcsc-perl - gtk? ( dev-perl/Gtk2 )" - -DOCS=( - README Changelog -) - -src_prepare() { - default - sed -i -e 's:-Wall -O2:$(CFLAGS):g' Makefile -} - -src_compile() { - # explicitly only build the pcsc_scan application, or the man - # pages will be gzipped first, and then unpacked. - emake pcsc_scan CC=$(tc-getCC) -} - -src_install() { - einstalldocs - - # install manually, makes it much easier since the Makefile - # requires fiddling with - dobin ATR_analysis scriptor pcsc_scan - doman pcsc_scan.1 scriptor.1p ATR_analysis.1p - - if use gtk; then - domenu gscriptor.desktop - dobin gscriptor - doman gscriptor.1p - fi - - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/smartcard.cron update-smartcard_list - fi - - insinto /usr/share/pcsc - doins smartcard_list.txt -} - -pkg_postinst() { - use gtk && fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild index 216e4232f41e..9bbbd54dd2a9 100644 --- a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild +++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils fdo-mime multilib toolchain-funcs @@ -14,13 +14,11 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="gtk network-cron" -RDEPEND=">=sys-apps/pcsc-lite-1.4.14" - -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} +DEPEND=">=sys-apps/pcsc-lite-1.4.14" +RDEPEND="${DEPEND} dev-perl/pcsc-perl gtk? ( dev-perl/Gtk2 )" +BDEPEND="virtual/pkgconfig" DOCS=( README Changelog diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild index 012b53a32b65..cc81b3a08cbf 100644 --- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild +++ b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit ltprune pam +inherit pam DESCRIPTION="PAM module for authenticating against PKCS#11 tokens" HOMEPAGE="https://github.com/opensc/pam_p11/wiki" @@ -17,8 +17,8 @@ IUSE="" RDEPEND="virtual/pam dev-libs/libp11 dev-libs/openssl:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-build.patch" @@ -30,5 +30,5 @@ src_configure() { src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die } diff --git a/sys-fs/loop-aes/loop-aes-3.7m.ebuild b/sys-fs/loop-aes/loop-aes-3.7m.ebuild index b548d0430472..426c9f5d7fd7 100644 --- a/sys-fs/loop-aes/loop-aes-3.7m.ebuild +++ b/sys-fs/loop-aes/loop-aes-3.7m.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit linux-mod @@ -16,8 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock" -DEPEND="app-crypt/loop-aes-losetup" -RDEPEND="" +REPEND="app-crypt/loop-aes-losetup" S="${WORKDIR}/${MY_P}" diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index c85f18342454..27670dcf5ae8 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -118,6 +118,9 @@ DIST genpatches-4.9-131.extras.tar.xz 17352 BLAKE2B 3ccbf15172183ef1ecc0e54fcdce DIST genpatches-4.9-132.base.tar.xz 2441816 BLAKE2B 53a8675afe92c3821aca2251aa7e4cb5ccd5bd007871ddb6bbeeea9cf9ff7953505e67e4bc91685598734451bd2c470250bfc3ce4e2bfb749adbf0c606f89cd0 SHA512 f43ed194035db4eabdfd7c29113faaf6605d56e64613771011793fc7740fa06db0727328eaef33f847f6fbba6a7f8830f5d3b9c70b7268c7cf6974ce2afe2243 DIST genpatches-4.9-132.experimental.tar.xz 106392 BLAKE2B e37bc8e9b99c2afdd0e57606d8a8f5eeeeda93013e6219801c3e9d14d91a6d70dfa4f7830a54293eabb81e821138432d18ef96ec98e3070a46b4b11680165ded SHA512 7fa9bba8c07d5cf861bf7dac0e8261e90c3ef834acca4768606d3292d664ed46cd790df7ab6f82fcaf83861ff9395a1a32da9122d99074c851aafade9cbbbde0 DIST genpatches-4.9-132.extras.tar.xz 17356 BLAKE2B b7cbf6b4fb753c8b2155d61e86357a41978f9a218daedc016a1e11f2917294a82e1bca3915db80de9f6120e214869f7ae90b647b95fdd674b10eae651576affd SHA512 6e0777f4a57dd7e2f2771fd2416858a40f130cd110f1458debfad66a2ef6847969fda59ffa8f796a6f2736a3ccdd0f41b5fc1c66e3a507ff2b0b48ee6f291fbc +DIST genpatches-4.9-133.base.tar.xz 2461436 BLAKE2B b558db80f864cfbbd46e842f925d882c877d8f1da5187483384ba7ca1713fff9db6815be114e169b69002bee3459a132ee30904c17c3c4bec9e99212cf67224c SHA512 9bd16c0141ee360101c60bbd2e77bee5bb8de3c881acb7ab3693329b6539728461509cac4f234d4581effc582f60c21b85ea3f09c273941a610e2fa5c2745b2e +DIST genpatches-4.9-133.experimental.tar.xz 106376 BLAKE2B 69a24533ce6e1d2e1104f2964ab33013ca942fadb88916790d042eb246e8f40fb70af112aacd2828553ed68252ca687998052c46c1dd19af65af266bc59b3d69 SHA512 b645a3a470b99b4454f886d43172eb6d9ed2fff14632fb0259eac8c6019809ab1aac8af0003d392932ede01c9f1953f4c3ecb88a2b1506e8f384769d2c5625e1 +DIST genpatches-4.9-133.extras.tar.xz 17360 BLAKE2B 047b135d3c06e48c80eb84d75ccae69fbf624414263d3ce8caeb0be30070e810b58f0b4af9100d10489430b6f12f59195c0e794239ab35ad76cb58b8ab54edde SHA512 95f9f69b3c1de4f7f9c9d7838d4ca2e26d23390bcd5218ff2ea29bade40ff3bc6eb80c55036f12047aa6b1b3e09328a55bb3e80d0443c6ad802ed057d720fdbf DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.129.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.129.ebuild new file mode 100644 index 000000000000..6bb78759671e --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.129.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="133" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} |