gentoo auto-resync : 19:03:2023 - 06:33:49

3 files changed, 10 insertions, 93 deletions

diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 1b3046b32fca..c71f4cf62ec6 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -1,4 +1,4 @@
-AUX bopm-3.1.3-autotools.patch 7563 BLAKE2B f13d0facb422642be0faf6f638f905c839667a7a3e32456c867f5eaf00315c1a6389107b87f8e271bbb8b29b4b67bd7c6475feec97866065a183a705032f94d2 SHA512 1a44edcc1c9bf154e3d5763bb8e7937050781623d2311bd404efbea96c9949e9bc1472d5c22ab598152195a933146585a3efaaf28a5e7fb369e471167e571d8c
+AUX bopm-3.1.3-autotools.patch 4452 BLAKE2B cd90ea087765c5c5820a18886b7b279a24e0215e2602ad632bee20ef6ddf89af62b617c1c203b5d07d149e7cf266bcb91cf451bab4a126430112a10e156f8b0a SHA512 2a788e3c5bfed1472f4926edb6d005fbb3a14b2988e2d9dec0ba3dabc08159abe60c3b74a77d361933f2ea01c1629126a350c849c4dc7eedd9956525e6d73c19
 AUX bopm-3.1.3-quarantine-bad-pid-file.patch 472 BLAKE2B de420b1240eb29fbca226e33a9b59083b59043a2de8db81220080dedf3578a29efa63ce56541ff28955ae08b045ea1529ba84a1f5d3c2e22f4c43303e611e9f7 SHA512 a255fa27d3dcc1c4ef547ba28af58e4e25f4e94b36c10b954274e49a7dbc776a1da5772afcd1b91f918e704c60de5bc3d451f8b9073123ed3f32aaa8ccc7948c
 AUX bopm-3.1.3-remove-njabl.patch 816 BLAKE2B 9065ad4a26d9a57aba17dfa695166e0ebc761b78359fc80f7a0a4e7eee6780e77d5b4d1167f6e3f540e3e214d06e38e0878dedba1fda65a55428c28ef3310932 SHA512 d74ccfa25c5f70b852647e90e8d9a80d8d848cf0e488004fc8dc0fdc196271659c7b53d47bfa79321f159ec374ecb7626b98b91de82aa62649c3a3c449c4aef3
 AUX bopm.conf.d 158 BLAKE2B 00888b5a199d4c2c2bd9480d97c978955ae0f91c1fe70a75eb60de3dc43219fdb59e1f0f87c13dab12f482e4771b3fe3b65241b007e0f1cbcaefd057a2fd8c51 SHA512 f47dbcc6c46b9bc4269ebfa0015e3827360f8e78f2485a3217a5b4775d2890b31fb0d6bb56815547aa91208c412079f81bff8c086a0f947ef48171fee1caeb6d
@@ -6,5 +6,5 @@ AUX bopm.conf.d-r1 221 BLAKE2B ca4f3eb206dfc18d5714d1e5530bc1d562d1e6262ce26cc93
 AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5e3dafe264fb043c0a15c0531042e0c0fcaf068f74ff15d5b93f85b07a5793c9e0dbaf191ab7e SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
-EBUILD bopm-3.1.3-r6.ebuild 1650 BLAKE2B 5b9e970140edbd3abd7d7a24ab8b37e7e31ea7bd3dd50be82bc411bff616fee6199aac9cb983a793fe88580ee75d1d7d4bf50be618a0ad1e5c9d3788f8684f8d SHA512 cb4cb072c6586fcea5be1b2c10b86d9c61bf11e03d7393031ebfc8e50b8763f2c533d2765201e96df8ee0a482519a1629efe1cfca951fb4967ec12d5133a1cc7
+EBUILD bopm-3.1.3-r7.ebuild 1929 BLAKE2B 7c24132aa99ab7a53546f7bb22c7db001f73ed4c748b7f59c23682b79f52111d028dc4e5080883584ba0387fb3d5dc6b71c6b2901aa8891503d08f67c136c029 SHA512 857dd0167b9c50074f2fdfd7770bbd8756dd78d3066a8d8d2a4058901579eb91616871e9a1ac334ea5d22516212867621cda44bece7e32b4e7543bd5c232dc4a
 MISC metadata.xml 321 BLAKE2B af5f8f528acdd3b4a88d140b726a6db6c48327991ebb09d1ddceec667381a5395907fb8991903a1a82283a4bb66ea6b3cbfb35fc035823e0a922eadd01442c3b SHA512 11db57a6b5416cf0a41f6294533fa4b8b938359f3e4135b0673f7959aac2dd524292594ad5b936687de288847574472b0988e9979b1895fa51d7571a9c00785e
diff --git a/net-misc/bopm/bopm-3.1.3-r6.ebuild b/net-misc/bopm/bopm-3.1.3-r7.ebuild
index ae8dd5a2d897..d42d9a0d0a54 100644
--- a/net-misc/bopm/bopm-3.1.3-r6.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
 RDEPEND="acct-user/opm"
+BDEPEND="acct-user/opm"
+BDEPEND="sys-devel/autoconf-archive"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-njabl.patch
@@ -29,6 +31,8 @@ src_prepare() {
 
 	mv configure.{in,ac} || die
 	mv src/libopm/configure.{in,ac} || die
+	mkdir src/libopm/m4 || die
+	cp "${BROOT}"/usr/share/aclocal/ax_func_snprintf.m4 src/libopm/m4/ax_func_snprintf.m4 || die
 
 	default
 	cp bopm.conf{.sample,} || die
@@ -37,7 +41,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --localstatedir="${EPREFIX}"/var/log/${PN}
+	# We need --enable-static to build libopm.a. We don't install it so it's fine.
+	econf --localstatedir="${EPREFIX}"/var/log/${PN} --enable-static
 }
 
 src_install() {
diff --git a/net-misc/bopm/files/bopm-3.1.3-autotools.patch b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
index e2927b0b74b6..e336150f430c 100644
--- a/net-misc/bopm/files/bopm-3.1.3-autotools.patch
+++ b/net-misc/bopm/files/bopm-3.1.3-autotools.patch
@@ -44,94 +44,6 @@
  AC_CONFIG_SRCDIR(src/libopm.h)
  AM_CONFIG_HEADER(src/setup.h)
  AM_INIT_AUTOMAKE()
---- bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4
-+++ bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4
-@@ -0,0 +1,85 @@
-+# ===========================================================================
-+#     http://www.gnu.org/software/autoconf-archive/ax_func_snprintf.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_FUNC_SNPRINTF
-+#
-+# DESCRIPTION
-+#
-+#   Checks for a fully C99 compliant snprintf, in particular checks whether
-+#   it does bounds checking and returns the correct string length; does the
-+#   same check for vsnprintf. If no working snprintf or vsnprintf is found,
-+#   request a replacement and warn the user about it. Note: the mentioned
-+#   replacement is freely available and may be used in any project
-+#   regardless of it's license.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Ruediger Kuhlmann <info@ruediger-kuhlmann.de>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 5
-+
-+AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
-+AC_DEFUN([AX_FUNC_SNPRINTF],
-+[AC_CHECK_FUNCS(snprintf vsnprintf)
-+AC_MSG_CHECKING(for working snprintf)
-+AC_CACHE_VAL(ac_cv_have_working_snprintf,
-+[AC_TRY_RUN(
-+[#include <stdio.h>
-+
-+int main(void)
-+{
-+    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
-+    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
-+    int i;
-+    i = snprintf (bufs, 2, "%s", "111");
-+    if (strcmp (bufs, "1")) exit (1);
-+    if (i != 3) exit (1);
-+    i = snprintf (bufd, 2, "%d", 111);
-+    if (strcmp (bufd, "1")) exit (1);
-+    if (i != 3) exit (1);
-+    exit(0);
-+}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)])
-+AC_MSG_RESULT([$ac_cv_have_working_snprintf])
-+AC_MSG_CHECKING(for working vsnprintf)
-+AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
-+[AC_TRY_RUN(
-+[#include <stdio.h>
-+#include <stdarg.h>
-+
-+int my_vsnprintf (char *buf, const char *tmpl, ...)
-+{
-+    int i;
-+    va_list args;
-+    va_start (args, tmpl);
-+    i = vsnprintf (buf, 2, tmpl, args);
-+    va_end (args);
-+    return i;
-+}
-+
-+int main(void)
-+{
-+    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
-+    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
-+    int i;
-+    i = my_vsnprintf (bufs, "%s", "111");
-+    if (strcmp (bufs, "1")) exit (1);
-+    if (i != 3) exit (1);
-+    i = my_vsnprintf (bufd, "%d", 111);
-+    if (strcmp (bufd, "1")) exit (1);
-+    if (i != 3) exit (1);
-+    exit(0);
-+}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)])
-+AC_MSG_RESULT([$ac_cv_have_working_vsnprintf])
-+if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
-+  AC_LIBOBJ(snprintf)
-+  AC_MSG_WARN([Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/.])
-+  AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken")
-+fi])
 --- bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4
 +++ bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4
 @@ -0,0 +1,81 @@