gentoo resync : 19.01.2018

4 files changed, 2 insertions, 70 deletions

diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index e18afa498001..854c41c39c4b 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,8 +1,5 @@
-AUX destdir.patch 249 BLAKE2B a205994e5479462323612dd45293473e54d23a7472faf7211ed5a30d4046305c179573312435a12ee8fdbd7a063f9bb61584065209432de0758a879c291f9b65 SHA512 dc35c71d6143c164d17723bfbb5f899c863abb4ca46a96356054e46fcedf9d708f9f4ef3345bd5966b9e492cbfa9dd5e3e85545853799859315ed57640c03ee4
 AUX pesign-0.112-fix-cli-opts.patch 2228 BLAKE2B 6037340b1bc0c659ec2be5358d781b29f0fe755a17e7c17f612ef7c8dc514dc5d5ed2c49121463caa269e01a206a160ec725f7545a004fe10ffc35841f23625a SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695
 AUX pesign-0.112-fix-initializer.patch 388 BLAKE2B e5beacd2503dbde5c6e4ba748c4dc5151747028b3448e91fcb2e52f6e2622ba5f84cb29a816c67979dcf7ab40b9f3d2ea10ff31033027c18b68c863ab2eed86e SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84
-DIST pesign-0.108.tar.gz 96838 BLAKE2B ae17d48af15f031ef982d915c61c9c0b647c3a01beb106e9f0dbdcc9c47f2a56b211fd2c23dc0e1131c52b4a12034227bfeeddb0ecb9531201b7762374d8b787 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918
 DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018
-EBUILD pesign-0.108.ebuild 1209 BLAKE2B 43aae1edcdbd1c1de35594edfb0d2aa6cf2f93de915c82d3fdb1a5a1673b7b004cf833cfbb2ffa0f58defc292b3bc53e41071acef610dc936d7e744642fd5409 SHA512 db47d7a32a93460ed56c49607c5f5a2d42775dc799fec79f19fe0ab2dcc70bb11448dc7266a41dd4c1c9c586ad36d77d678baf4cb5a089e36da7825cacfbf673
-EBUILD pesign-0.112.ebuild 1029 BLAKE2B b70d6b85323d5a0700f80a93c8cfa2cba037ce3f1b2cf6dd9f68fa1aa21d33624d217ff3c2dbb4a31bb47c1aeb4e33d94e852ab04c85d3095d6bade51ab5db19 SHA512 8c19ec52ca3894113e5c65cf75f2a1f184d737872f8c8d37b3112f4521ed7ad172f5d44947307c8ac5c346da6cfead236eadd2622e1c0589446aa41fcf6ad148
+EBUILD pesign-0.112.ebuild 1029 BLAKE2B 283075f097aa4a37aca9bd3b153044b9fd543f301774d926754fc6283d8d08c76c2953f790911bda0acf825dd0c543fc92a4e53eaa20d2ae0cb2dce7c4b91d2a SHA512 afaa06b5fb7c416b314d62dfcf98e9677d72c38ad18b9d9b4318d4362c94991b409d7fc5dcabc29111766ddba158309ec5d3ad41194ade0959dac99dc81159d6
 MISC metadata.xml 466 BLAKE2B f7c15efd0e75918931fb23acd033a3273820cd449e397af5dd1195e3de85e9b5b9510ac22fef9bcc3be820cfc2f09f61cb5e4fd8742797aa28d915cb275c098f SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364
diff --git a/app-crypt/pesign/files/destdir.patch b/app-crypt/pesign/files/destdir.patch
deleted file mode 100644
index 70332410a3c8..000000000000
--- a/app-crypt/pesign/files/destdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index 864f98b..e2c967b 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -1,4 +1,4 @@
--INSTALLROOT:= /
-+INSTALLROOT:= $(DESTDIR)
- PREFIX := /usr
- 
- HOSTARCH   = $(shell uname -m | sed s,i[3456789]86,ia32,)
diff --git a/app-crypt/pesign/pesign-0.108.ebuild b/app-crypt/pesign/pesign-0.108.ebuild
deleted file mode 100644
index 6413ee2491d5..000000000000
--- a/app-crypt/pesign/pesign-0.108.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
-HOMEPAGE="https://github.com/vathpela/pesign"
-SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RDEPEND="
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/popt
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/destdir.patch
-}
-
-src_install() {
-	default
-
-	# remove some files that don't make sense for Gentoo installs
-	rm -rf "${ED}/etc/" "${ED}/usr/share/doc/pesign/" || die
-
-	# create .so symlink
-	ln -s libdpe.so "${ED}/usr/$(get_libdir)/libdpe.so.0"
-}
-#
-#src_prepare() {
-#	local iarch
-#	case ${ARCH} in
-#		ia64)  iarch=ia64 ;;
-#		x86)   iarch=ia32 ;;
-#		amd64) iarch=x86_64 ;;
-#		*)     die "unsupported architecture: ${ARCH}" ;;
-#	esac
-#	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
-#	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
-#}
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
index a5d5bac847a7..314dcb7d8cd1 100644
--- a/app-crypt/pesign/pesign-0.112.ebuild
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -21,11 +21,11 @@ RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
+	sys-libs/efivar
 "
 DEPEND="${RDEPEND}
 	sys-apps/help2man
 	sys-boot/gnu-efi
-	sys-libs/efivar
 	virtual/pkgconfig
 "