From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 10 Feb 2020 21:05:55 +0000
Subject: gentoo resync : 10.02.2020

---
 net-libs/librouteros/Manifest                      |  4 +--
 net-libs/librouteros/files/disable_werror.patch    | 11 --------
 .../files/librouteros-1.1.2-remove-Werror.patch    | 11 ++++++++
 net-libs/librouteros/librouteros-1.1.2.ebuild      | 30 ++++++++++++++--------
 4 files changed, 33 insertions(+), 23 deletions(-)
 delete mode 100644 net-libs/librouteros/files/disable_werror.patch
 create mode 100644 net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch

(limited to 'net-libs/librouteros')

diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index 0c099d12d13d..edfa1325c766 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1,4 +1,4 @@
-AUX disable_werror.patch 302 BLAKE2B 147e312a34ce604bb86e8d7048f1f715bc430df2dc7464e3da230c9033af9248c82627fbf656b5ee0dc5767ad996ff16e0064124b25d247c782a8f26d67608f5 SHA512 13cb3d720814cc9a8a6b975cf1bbf13aab5a177e05e95c8c80de637a04119045bbaf5e91d0a8b1664137be6adfa710a7d061ac8309be27657c6ba1e6593a6400
+AUX librouteros-1.1.2-remove-Werror.patch 229 BLAKE2B c1a10b121c1bd835fc97aa864af5fae7350c8c4af77ca475f7ad4a8bdf1368410fcfc7cdcdacb65ebd1e51cd6f60bdde1b0ddb054f12927e4809edede74e0091 SHA512 e46dfec5344978595de438ed210a238c9380db4b74c26d31f55bbaac75d694ddece70a60196071ebc821fa6363ec52356d39892408cf5675c29aa3a239fcc58f
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
-EBUILD librouteros-1.1.2.ebuild 569 BLAKE2B 12f6063b83b944e68e933739116b5c549be0b6a48eb68ea3d6c94dfb5e4c4034d0d37ef67e3f8da2ca2cf20b142d3b57ca0f99314560433eb03c02d3e2f5e60c SHA512 8a5b1a28f74ab625fd63cb4bc8bff5a8f391a035e4e2deb44abfa481891e24c61b49197b8298b52bec7bf973b14fafd0b1500f58b447a9ff80be8e140766328d
+EBUILD librouteros-1.1.2.ebuild 648 BLAKE2B e1a786e84787c9a6088b329705db0e3f5cac8f6c6df4655212b8a3ad52cbeeab743e9e45de3135473ff5dc47435b52e94902178675fcf589ee4f73c02c403539 SHA512 0fd3017e5510aa77db1b710c1e3e54c75e135e2bbbd9d4d7f5f536151d39dd29e1b6f07d589acb88f6e0dd476dbb4aea628b67ebd70a98451bfc601d918f32a6
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/net-libs/librouteros/files/disable_werror.patch b/net-libs/librouteros/files/disable_werror.patch
deleted file mode 100644
index 599e85b74d00..000000000000
--- a/net-libs/librouteros/files/disable_werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2011-12-30 21:17:04.233158203 +0200
-+++ src/Makefile.am	2011-12-30 21:18:42.186354842 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- if BUILD_WITH_DEBUG
- AM_CFLAGS += -Wextra -g -O0
- endif
diff --git a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
new file mode 100644
index 000000000000..b3f005a4be3a
--- /dev/null
+++ b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ if BUILD_WITH_DEBUG
+ AM_CFLAGS += -Wextra -g -O0
+ endif
diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild
index 9e89899c90e7..a6be5fce2804 100644
--- a/net-libs/librouteros/librouteros-1.1.2.ebuild
+++ b/net-libs/librouteros/librouteros-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base autotools-utils autotools
+inherit autotools
 
 DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
 HOMEPAGE="http://verplant.org/librouteros/"
@@ -12,15 +12,25 @@ SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
-DEPEND="dev-libs/libgcrypt:0"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
 
-DOCS=(README AUTHORS)
-PATCHES=("${FILESDIR}"/disable_werror.patch)
+PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch )
 
-src_prepare(){
-	base_src_prepare
+src_prepare() {
+	default
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3