gentoo resync : 10.11.2019

3 files changed, 8 insertions, 52 deletions

diff --git a/dev-util/objconv/Manifest b/dev-util/objconv/Manifest
index 2d49a0d2e7b5..365af0176441 100644
--- a/dev-util/objconv/Manifest
+++ b/dev-util/objconv/Manifest
@@ -1,5 +1,3 @@
-DIST objconv-2.32_pre20131127.zip 814334 BLAKE2B 2d0d548d54b7868d29d892fc7512a7ec50ec768d4d3f023b08fd1a69a722418d675a5d578313868195dc13822c5710d3e3fe8eb9db6404a0ebd240296289f989 SHA512 9be8f6e7f33794ade3340604508a996139c3f7a3a620efc634919e20ad29c5510b25a88df469769862d969375eefaed39c4e200b1ef25d9eff8abb1936027f7b
-DIST objconv-2.42.zip 1016499 BLAKE2B fec4a386b3d8e0e870066098353c33d78e6b027de1f0183d568479ce508b2c10b020ab3de47d1d24481ddc785be5ee1d0b8053ec354bb23dd317a6e08de8c1a4 SHA512 9ccc49ddfe5a6d353c746917832419478335e73d1cb85762cad314f918532bd20844b9812e392d57789a4a6cb8764945a6b1894884b50d5486bdf635fe58d35f
-EBUILD objconv-2.32_pre20131127.ebuild 936 BLAKE2B 8eb2ea4b82a92a929dabb85203bdff30439b97b51f505f0febc8af83cb991088a1b26f58bc623faf7f3f13e995506e956e07645a76bf5ad23f324d5a15cfad20 SHA512 a83b95ec7cc666d6824209a69308962192a5ef99afe8bc517a11184a535952ec6bf974f8e47d1b05d02fd2b1948e59e34f8b65cef0b119a1d1bf4d25d2c5dce5
-EBUILD objconv-2.42.ebuild 949 BLAKE2B f95d329c5aa43d77a7e4289ab547ce55624dc6b22e01387ecdca86ca1c5606e84fc3f53c250bfedb25db757b191e9ebf9c4745f07f11be516d5e5e5a46d235ae SHA512 069c496238aa3b511101216399a86c18e914d7d8b1d95dbde134a7d7097d5aadbed75732ed75915f5c141eff82cf3c74a37e58b1da9f1a34732649c984cdbc17
+DIST objconv-2.51.zip 1033450 BLAKE2B 1029e8001bee969f177e7e47e735dc132dbf640bb472ae148cd2a33af522c190066f226a55da3bb3b47902a68eecf437edc025622781bda691a10956c84561c3 SHA512 12991b98fafbb5fad709471b25bf8acd2944f862ca1f3cbae5a6f7fd53a6009dbb6e67a2fcfa180965b519a2d6010d9b2f7585748ea58d36b28d86c0981f13d8
+EBUILD objconv-2.51.ebuild 1009 BLAKE2B cc900b6349efbda5b863d1e9c3494c1b6b2e69381903b99527b4caff9e03d94b23e68b5f847fa3a420ac65dcdac7440cec3e2c1513a019429896dd133a0f8099 SHA512 332a3dc50871b7f0dd7dc47b98f3f8f554435244ec120a3ca1d2ff95ea22619faa7eb5dbb52ba92723e1a91277a81641c6921b4e2f688496209fedab9eb8eb52
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/dev-util/objconv/objconv-2.32_pre20131127.ebuild b/dev-util/objconv/objconv-2.32_pre20131127.ebuild
deleted file mode 100644
index e9288020b183..000000000000
--- a/dev-util/objconv/objconv-2.32_pre20131127.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
-HOMEPAGE="http://agner.org/optimize/#objconv"
-# original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
-# I copy those to distfiles time to time
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpacker_src_unpack
-	mkdir "${S}" || die
-	pushd "${S}" || die
-	unpack_zip ../source.zip
-}
-
-src_prepare() {
-	# project has extremenly poor build system (see build.sh)
-	local sources=$(echo *.cpp)
-
-	{
-		echo "objconv: ${sources//.cpp/.o}"
-		echo "	\$(CXX) -o \$@ \$^ \$(LDFLAGS)"
-	} > Makefile || die
-
-	tc-export CXX
-}
-
-src_install() {
-	dobin objconv
-	dodoc ../objconv-instructions.pdf
-}
diff --git a/dev-util/objconv/objconv-2.42.ebuild b/dev-util/objconv/objconv-2.51.ebuild
index f4aa2421d778..c4d8fb209631 100644
--- a/dev-util/objconv/objconv-2.42.ebuild
+++ b/dev-util/objconv/objconv-2.51.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs unpacker
 
 DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
 HOMEPAGE="http://agner.org/optimize/#objconv"
 # original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
-# I copy those to distfiles time to time
+# I copy those to distfiles time to time. last modified: 2018-Oct-07
 SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
 LICENSE="GPL-2"
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND=""
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${P}
 
@@ -28,6 +29,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	# project has extremenly poor build system (see build.sh)
 	local sources=$(echo *.cpp)