From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:52:04 +0100
Subject: gentoo resync : 14.07.2018

---
 www-misc/Manifest.gz                       | Bin 3585 -> 3580 bytes
 www-misc/multisort/Manifest                |   3 ++-
 www-misc/multisort/multisort-1.1-r1.ebuild |   4 ++--
 www-misc/multisort/multisort-1.1-r2.ebuild |  29 +++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 www-misc/multisort/multisort-1.1-r2.ebuild

(limited to 'www-misc')

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 357d68855184..1eb3613c6c21 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/multisort/Manifest b/www-misc/multisort/Manifest
index 359fbed97367..24d953204e4b 100644
--- a/www-misc/multisort/Manifest
+++ b/www-misc/multisort/Manifest
@@ -1,3 +1,4 @@
 DIST multisort-1.1.tar.gz 3520 BLAKE2B 8fcd797abb9649b21d80bd964a2f82b05f0bbf4b5b0f263b156d8b90ab36f87009199aecbf19b495e7c56415e707cd675cb7b73346a233a6a52b9b66ea223a21 SHA512 346be785a223814086536bfc8aacb11122ca91cf6cb63c8bbe2ae70f323bd36812f25575114c1422c431f658328bbb7fc75b839e74b7f37c12c4a3f179e05e1b
-EBUILD multisort-1.1-r1.ebuild 601 BLAKE2B 1c7b293b69e72b7e39e63e12295795b9984b606c9d71f85144e1fd06ed3801f24ef60c8e4eabea18fc4edd50b920c91d6ee65dcf2b1c1b498898595ecea77689 SHA512 161769135f8db803012ea97a1758e95dea391f05354440fffcb9cab9d83c0cbdc2528c1e101ccd8aa53b768fe1c694f2954dc1ac77cbe08eba55b0e00e6284fc
+EBUILD multisort-1.1-r1.ebuild 603 BLAKE2B 768cfd4805c32ddcc00134ac03c5e220d6041c962e8905b0544984cc243a33b5384b45a54a0bbdb7f58160094938f583c2c1380f9bc498f54ab114cadbc5dfc2 SHA512 bfe9d2d2603b5aa909a9209129aed78c6bfec6ce6c90b9329186c7031d8f3de1b11bda1f53259b6855e916cb5a5834b227c2e8431b2692a233a72b949c2f2062
+EBUILD multisort-1.1-r2.ebuild 601 BLAKE2B 3c8f5f2d1aa0ffa717f3d0e4c9d9df0a1c3a601311424afb2c72d0a1ce034220e456b5333bb347a384db9898e2a2c8fc9f17e3b9cd1125e4381def8cd0fc9d3e SHA512 2054e3055d1fe1b69af55b862398a42069908562e803660d73cf28b4658825a50f67e072b054670f5d401d7923a820727e6282606776378cf025560a4aea0b7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-misc/multisort/multisort-1.1-r1.ebuild b/www-misc/multisort/multisort-1.1-r1.ebuild
index b64e30c6c887..7a1f5d15fff7 100644
--- a/www-misc/multisort/multisort-1.1-r1.ebuild
+++ b/www-misc/multisort/multisort-1.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="Merges httpd logfiles in the Common Log Format"
-HOMEPAGE="http://www.xach.com/multisort/"
-SRC_URI="http://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
+HOMEPAGE="https://www.xach.com/multisort/"
+SRC_URI="https://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-misc/multisort/multisort-1.1-r2.ebuild b/www-misc/multisort/multisort-1.1-r2.ebuild
new file mode 100644
index 000000000000..2e91afe31e88
--- /dev/null
+++ b/www-misc/multisort/multisort-1.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Merges httpd logfiles in the Common Log Format"
+HOMEPAGE="https://www.xach.com/multisort/"
+SRC_URI="https://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+	# respect LDFLAGS wrt bug #337359
+	sed -i -e 's/$(CFLAGS)/& \$(LDFLAGS)/' Makefile || die 'sed on Makefile failed'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin multisort
+}
-- 
cgit v1.2.3