gentoo resync : 02.09.2020

4 files changed, 61 insertions, 5 deletions

diff --git a/net-irc/sic/Manifest b/net-irc/sic/Manifest
index f2813e5d40ee..cc31c5580e54 100644
--- a/net-irc/sic/Manifest
+++ b/net-irc/sic/Manifest
@@ -1,3 +1,5 @@
+AUX sic-1.2-include-path.patch 389 BLAKE2B 19db083e02aa4c287c4cc517f437bc73820bf9cf13c1f070174195c9492a4e406bd40b953d8a2e7d545cd04d0a622d2fd987a797f93690b57713d7b2e7ced6d7 SHA512 f2b53e187ab943f90d8340008d78aa2649c4e4be8da7319879cde89b8dc0961407a0887f3c6c7df0e30e7ce6ab9dce6fab3fe350f93bb25c6df0721e5c068951
+AUX sic-1.2-musl-time-include.patch 805 BLAKE2B 90f78b0d4ccca4030f00bf9edb82fe5de2acb4a9a4cfb5feb63943105b5ea91cf67bfeb0d7ec11b2e5232f6691fd95e8bd8cf1a568a673d2944925253465046d SHA512 90d7615d3e7e404b5788882b24edf85f9142c9f04ce986683f46ef798d5c1a4a6a1579f11cbc8ca44a19c55d1d4dea78dddf135c838782923a7a2e9c341c6d57
 DIST sic-1.2.tar.gz 4563 BLAKE2B 63c70aa6e6e9da4c7c0a282ca1a407b9b9c4d02e764490a8b7ff1967a848ffe78c52700e6e895252c0807212eb80e0baeca5b338ead8da4ea9a0946d81b8c5b8 SHA512 5659ed9d8a5986dda90dbe1155c27a5fd0ab4b1fcad2c1a20997c530bf03864e6c08bdeffc025c728629ab11872af6a1250761160b91f148dc37d77a49046dc9
-EBUILD sic-1.2-r1.ebuild 640 BLAKE2B f3a968fe055e12e76e17752c3e8d6bedd743f9569e2412f122190cb8e3f5f5ca8ec51567beb9a0f4fa80cecf9eab79d35080c02978c5938f56160f4bff30bab1 SHA512 847c391640e10767bddde501abec4312399135cef22c9661e3f900f960f333af1ca788179fc8e41f47ef0f79e4d9c8a3fadf96a9c6224854e5767e1695f83327
+EBUILD sic-1.2-r1.ebuild 746 BLAKE2B a6d3bcbc76225bcb1bb616d683b93a85cfcbcd366f9912f310290ad81572b1866b9ab98df0bb1bb60943af9c71e18e90d47387c2c63932c5b14e0388d64ee60d SHA512 f1ca4836633a27a35bfe1807f6851237a0af264ceee18eedee07cd7dd46e794e372344a13e325751e714c431372b37608be8b0943ad9584c113567d8f22769c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/sic/files/sic-1.2-include-path.patch b/net-irc/sic/files/sic-1.2-include-path.patch
new file mode 100644
index 000000000000..3f8296097496
--- /dev/null
+++ b/net-irc/sic/files/sic-1.2-include-path.patch
@@ -0,0 +1,16 @@
+Drop unnecessary include path to workaround possible ldd bug
+https://bugs.gentoo.org/731168
+----
+diff --git a/config.mk b/config.mk
+index 5d42b38..61d085a 100644
+--- a/config.mk
++++ b/config.mk
+@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
+ 
+ # includes and libs
+ INCS = -I. -I/usr/include
+-LIBS = -L/usr/lib -lc
++LIBS = -lc
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
diff --git a/net-irc/sic/files/sic-1.2-musl-time-include.patch b/net-irc/sic/files/sic-1.2-musl-time-include.patch
new file mode 100644
index 000000000000..bbeaed72a571
--- /dev/null
+++ b/net-irc/sic/files/sic-1.2-musl-time-include.patch
@@ -0,0 +1,32 @@
+https://git.alpinelinux.org/aports/plain/main/sic/musl-fix.patch?id=4b6138a5f4f5cd11d49d7f96e13da661fd37655e
+https://bugs.gentoo.org/712732
+----
+From d8e9e4a013196b98576a3a759b4b27c3edb2a0d2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 4 Feb 2014 10:06:53 +0000
+Subject: [PATCH] build fix for musl libc
+
+It fixes the following compile error with musl libc:
+sic.c:137:17: error: storage size of 'tv' isn't known
+  struct timeval tv;
+                 ^
+---
+ sic.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sic.c b/sic.c
+index d93c2ec..e4bdb74 100644
+--- a/sic.c
++++ b/sic.c
+@@ -8,6 +8,8 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++#include <sys/time.h>
++
+ static char *host = "irc.oftc.net";
+ static char *port = "6667";
+ static char *password;
+-- 
+1.8.5.3
+
diff --git a/net-irc/sic/sic-1.2-r1.ebuild b/net-irc/sic/sic-1.2-r1.ebuild
index 42dfb660ec7b..8ca301bc99ac 100644
--- a/net-irc/sic/sic-1.2-r1.ebuild
+++ b/net-irc/sic/sic-1.2-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="An extremly simple IRC client"
+DESCRIPTION="An extremely simple IRC client"
 HOMEPAGE="https://tools.suckless.org/sic"
 SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
@@ -12,6 +13,11 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2-include-path.patch"
+	"${FILESDIR}/${PN}-1.2-musl-time-include.patch"
+)
+
 src_prepare() {
 	default
 
@@ -30,5 +36,5 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" PREFIX="/usr" install
 }