[gentoo-commits] repo/gentoo:master commit in: net-libs/librouteros/files/, net-libs/librouteros/

[gentoo-commits] repo/gentoo:master commit in: net-libs/librouteros/files/, net-libs/librouteros/

[David Seifert]

commit:     d6abd790f7931624d968f6a2e74e9e358ddcfee1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 18:49:39 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 18:49:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6abd790

net-libs/librouteros: Port to EAPI 7

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...patch => librouteros-1.1.2-remove-Werror.patch} |  4 +--
 net-libs/librouteros/librouteros-1.1.2.ebuild      | 30 ++++++++++++++--------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/net-libs/librouteros/files/disable_werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
similarity index 61%
rename from net-libs/librouteros/files/disable_werror.patch
rename to net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
index 599e85b74d0..b3f005a4be3 100644
--- a/net-libs/librouteros/files/disable_werror.patch
+++ b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	2011-12-30 21:17:04.233158203 +0200
-+++ src/Makefile.am	2011-12-30 21:18:42.186354842 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  

diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild
index 9e89899c90e..a6be5fce280 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/librouteros/files/, net-libs/librouteros/

[Conrad Kostecki]

commit:     7560f7f8272639ac6b09398dadf33ad5d0cce838
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 15:04:54 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 15:04:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7560f7f8

net-libs/librouteros: EAPI 7 -> 8

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/librouteros-1.1.2-remove-Werror.patch           | 11 -----------
 ...brouteros-1.1.2.ebuild => librouteros-1.1.2-r1.ebuild} | 15 ++++++---------
 2 files changed, 6 insertions(+), 20 deletions(-)

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
deleted file mode 100644
index b3f005a4be3a..000000000000
--- a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-r1.ebuild
similarity index 59%
rename from net-libs/librouteros/librouteros-1.1.2.ebuild
rename to net-libs/librouteros/librouteros-1.1.2-r1.ebuild
index a6be5fce2804..1dcb908abd88 100644
--- a/net-libs/librouteros/librouteros-1.1.2.ebuild
+++ b/net-libs/librouteros/librouteros-1.1.2-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
-HOMEPAGE="http://verplant.org/librouteros/"
-SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
+HOMEPAGE="https://verplant.org/librouteros/"
+SRC_URI="https://verplant.org/librouteros/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,10 +17,9 @@ IUSE="debug"
 RDEPEND="dev-libs/libgcrypt:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch )
-
 src_prepare() {
 	default
+	sed -e 's/-Werror//g' -i src/Makefile.am || die
 	eautoreconf
 }
 
@@ -30,7 +29,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }