app-admin/mongo-tools: version bump, drop old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

4 files changed, 32 insertions, 25 deletions

diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index c86934b15465..c09ca90578f0 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,8 +1,8 @@
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
-DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
-DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
+DIST mongo-tools-3.6.16.tar.gz 4990806 BLAKE2B 743c24fe55a0353e3ce31a82a53c94560408725f9fa35d93d5bc136d2b6e465e081c8ad4b00d63826ea45db4431124cdf2b66341eba9be24db890fd80941b728 SHA512 ebb356690c2aeb7d47435ea05f977e9319c915e1af48b89fc9941f72871baabb5faac238b59281330fb46e7340ee354f56f438ea3d0abd97b859e2321b719038
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
 DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
-DIST mongo-tools-4.2.0.tar.gz 14402906 BLAKE2B 535a9a0e49f4288e63c905f7bd98c1f1b8e38eef562cb5c40a0c09500a18eb7fd401f05df2261c92db3e8a126cc03902fa3c61177b50a3e18f2d33bee7590f52 SHA512 f937a9f2b4ccfe262ca1a09e7bd103ffbdd45eae7c6deed8c1453f4499935f526f513749422e3215071ef465291c3f0544bf1e9510bbaf8dd9fa1edcf22f887a
+DIST mongo-tools-4.0.14.tar.gz 11134659 BLAKE2B 9caf119901d528079bb9aefce78d702dc3196cb105ac623137f8ffceffef4f8f6e61c8134470abe11f0bd422df9a6bef0e15331ee71065450b97220431458fc1 SHA512 6a0c39cbca0d51cd42518bb68a36fb7f0ed1e7b1ecf4dcd41256c8ab5c23505ca189b81a88c2a783ad81788bcab81d7e3c69f4788366e10dea744a03a2f3cf1e
 DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
+DIST mongo-tools-4.2.2.tar.gz 14433618 BLAKE2B 7610bd6b386684836e91b6bb7f73e24267fac56ce975263ac2aaeebe51d37123baa8eb2009cf4478af89e6dcc596c9c07126224ad4bd80aee47d03fde9413eca SHA512 661813c70bf891f0a834ac9970cbe390a8616f9e89e4f33918e479ba3f3ce3851edecd63c1e35e65a4dee47419e3ce0fa3186c7ee2326bef11fce3bac8bed0c7
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.16.ebuild
index 092d770686fb..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.16.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.14.ebuild
index 11f797e129c7..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.2.ebuild
index 81268b0dd2fa..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.2.ebuild
@@ -12,37 +12,31 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="sasl ssl"
 
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
+DEPEND="dev-lang/go:=
 	net-libs/libpcap
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:0= )"
 
-S=${WORKDIR}/${MY_P}
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
 
-src_prepare() {
-	default
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
 
-	# 1) ensure we use bash wrt #582906
-	# 2) do not substitute version because it uses git
-	sed -e 's@/bin/sh@/bin/bash@g' \
-		-e '/^sed/,+3d' \
-		-e '/^stty/d' \
-		-e '/^mv/d' \
-		-i build.sh || die
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
 
-	# build pie to avoid text relocations wrt #582854
-	# skip on ppc64 wrt #610984
-	if ! use ppc64; then
-		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
-	fi
+src_prepare() {
+	default
 
 	# allow building with go 1.12 #678924
-	sed -i 's/_Ctype_struct_/C.struct_/' vendor/src/github.com/google/gopacket/pcap/pcap.go || die
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
 }
 
 src_compile() {
@@ -56,7 +50,20 @@ src_compile() {
 		myconf+=(ssl)
 	fi
 
-	./build.sh "${myconf[@]}" || die "build failed"
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
 }
 
 src_install() {