gentoo resync : 23.06.2018

6 files changed, 32 insertions, 6 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 0f5b0ef68726..c84464a7a41c 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/cmospwd/Manifest b/app-forensics/cmospwd/Manifest
index 2cbf3f73f6de..2f306dc629d0 100644
--- a/app-forensics/cmospwd/Manifest
+++ b/app-forensics/cmospwd/Manifest
@@ -1,3 +1,4 @@
 DIST cmospwd-5.1.tar.bz2 36792 BLAKE2B 763bf04af7591843190570d7084e16c2a4490319bc4a3aba9b4a32e440c66ee981f8d90749dca9df69f963294a29500da4641b51e74c7bb6f0f0e4f23a165d63 SHA512 eb76bbab2e686b54421556c5228b90a35c2883d59b31815ab04494df8e2d03e7193abdd83c4a7fa5915abdff1f189eb69bd29fc02ea9d84565ea8767e2c455a8
-EBUILD cmospwd-5.1.ebuild 523 BLAKE2B de4d378a0a8429a00b8888fbc82cc6d9ca92d22ce9be06160769f2546933e2e5a5e0e6846eac523991b9995ef83e0d92075df8b25ab0df60e7fd5cebf69fd830 SHA512 5ec19956ad8ba47f5c9e1b9444bf15cb0573a92f04b32fa9efe853bf77591a077f63c286509d527190f6e2ecf2334155b5362b8bdfe4e2db16b0199b5a9c3d5d
+EBUILD cmospwd-5.1-r1.ebuild 534 BLAKE2B 7c2e98cd5856915f616218eff0143810d330a689f6ff0b5e0331ea4aa55866311680931d75887a18bb85ffdc2909035b077dc44a5818bc347c8ec05136b51bd2 SHA512 b11de18eb59cd438bc64794315730fe6bb12d306c16999464b3f928dc72128d4a0c6349c7e18e663844139d9339d3a2d677c93ba860e5e25b0680228c146778a
+EBUILD cmospwd-5.1.ebuild 525 BLAKE2B aacc16565496c67f20b8c7ec394cddfda840f8d34b240d962128c6b74252e25e87b226225db4d71f5e716eb23b95739bd1a171a7cf553c5d885841cf63e2c3f4 SHA512 aba354443e4bd2aea621a045ffd93ce074a40588ea99131a5a451fa13c3d0dd3e75472091fb2707de1030813f03ce1d77bf0773ec09d5b662a6145c30b860314
 MISC metadata.xml 675 BLAKE2B e1dec7335653927acf2ffbe7bfded2d55711d7df2585c4458c2e26e9f5a8d43f9943bae98f12554e669ba6b5438345024df2b11a9bbd161885436377a036e2ed SHA512 4caf9543690502df3320fcd85b841a2a17cad7d4a309bc40d539b23fcc260ffaf25ae3b0d62f7dd84319251bf65cd2e2fc997e9f8a196a15e016b795efc5f0ff
diff --git a/app-forensics/cmospwd/cmospwd-5.1-r1.ebuild b/app-forensics/cmospwd/cmospwd-5.1-r1.ebuild
new file mode 100644
index 000000000000..bf9611e3fd0d
--- /dev/null
+++ b/app-forensics/cmospwd/cmospwd-5.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="CmosPwd decrypts password stored in cmos used to access BIOS SETUP"
+HOMEPAGE="https://www.cgsecurity.org/wiki/CmosPwd"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	cd src || die
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} cmospwd.c -o cmospwd || die
+}
+
+src_install() {
+	dosbin src/cmospwd
+	dodoc cmospwd.txt
+}
diff --git a/app-forensics/cmospwd/cmospwd-5.1.ebuild b/app-forensics/cmospwd/cmospwd-5.1.ebuild
index 1fbc8925130b..5d8abd99a5cd 100644
--- a/app-forensics/cmospwd/cmospwd-5.1.ebuild
+++ b/app-forensics/cmospwd/cmospwd-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="CmosPwd decrypts password stored in cmos used to access BIOS SETUP"
-HOMEPAGE="http://www.cgsecurity.org/wiki/CmosPwd"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+HOMEPAGE="https://www.cgsecurity.org/wiki/CmosPwd"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index bdb3a28117a2..687c6463a697 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -5,5 +5,5 @@ DIST libewf-20140608.tar.gz 2129518 BLAKE2B aaa8e95f243e887494c5a50c1706864b4613
 DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
 EBUILD libewf-20130416.ebuild 1390 BLAKE2B f86f0370dcabe7fa02fe745ee3864fb9fcb45d47832ab5112219a30c4c13e49fce18e8d7df3be1957bc7ae2c79447c9f8b7659eff35bfac2676c834c35e798fa SHA512 98b8718ec6f1b25f2b33b8a73973906197cff2f505583270d4bcf301223bbfe0aceafe55395e795c7d173c27dd00ed47b2570234d5bff1a07bbd2385151369a7
 EBUILD libewf-20140608-r1.ebuild 1601 BLAKE2B a31475c4f6f3195b90092f5baa0d80d691f8ad07a4ee410fd06070d56366c77ad2bfa947b99aa32e59e8e7c00cad172efadd52efe74a35369da0fa82eb616e7b SHA512 2bf8916b14c71a5685915954d4864ab8b375ee8d09944958b3f47699a78316f45c417d67ffebdf4066e8671f3693dc5563e9246ac9a46134fde85c6c37604d3d
-EBUILD libewf-20171104.ebuild 1362 BLAKE2B 8879db8255861c21f345abbdc3d2474da327464e41a51a00f8bf7d513d1bb4bc541c70bf406e01c0be6f1711a3fa489a5cdad8592481d288974de3f109554658 SHA512 869935cea5b53d802ae2ebb31bf5e8aeabf8f0480e9d01d13ffbbedfc90d4f43707000760844bf83065971fdaefad973d0d12522ccde9fc5dc42ef6d187140bd
+EBUILD libewf-20171104.ebuild 1361 BLAKE2B 532ffe685d099b76be7da4ade0df475e86b7dcf97e698c6452a0f3033d17a95e63153865e81339800173972c72a1c6e81b20b6e9547cffa978f5adf2a722f3cf SHA512 cd199ea39ead51ed7fd8126ff999475bbef41f58a0fff677e745753a31ce2af18f99a7519fe80a5f0969fde85eb05cdd75edded36a6b1e0c5187a42084a22fce
 MISC metadata.xml 637 BLAKE2B c3d42f901c29baa52deae9745e42960cd5d3f8fc0dd01f530c9948806231ec2a8ef6f3fbd8f5fcaaee877167225db542af2ef0b84a6f1bb1a65db7ef617752c6 SHA512 ece6655919f7bd0dc6b2d8189e04f60114428f3ff2bc7ee6859abfa0e73527e5a37dc0816d85b368f2f0a0f139351924b9b800d680115b9a158bce9f665a9ec3
diff --git a/app-forensics/libewf/libewf-20171104.ebuild b/app-forensics/libewf/libewf-20171104.ebuild
index 010f601384f9..768759f5e0f6 100644
--- a/app-forensics/libewf/libewf-20171104.ebuild
+++ b/app-forensics/libewf/libewf-20171104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python unicode"
 IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"