gentoo resync : 29.12.2022

3 files changed, 36 insertions, 12 deletions

diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 34d6ed8ee204..99d53bf3ce3c 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,9 +1,10 @@
 AUX apache.webalizer 203 BLAKE2B fd92b85d0cd5a3bb0118ca3e47f616aa4f68cf3b954d1a8ad21ccc3cd229cc66e12e7f461497eb740c9a5ad5b34f8cf4c81d7e86e9725d6789568d15de10265c SHA512 19145c1d74322f2f6724bde7c5ef0c0111489566ba3ba8dcdeba38681332250e77e26652ccc2b6ff1a41f7dc7795c34a4c5e189cf92b24fe0ad544c4afac40b0
+AUX webalizer-2.23.08-broken-disable-static.patch 313 BLAKE2B c999dc91b3b5a97eef41f2cb568cda68dd07bb6ea6bfd1384c51224702922b46c59ad3b19ef41833c79c788bf5f590f4487183e55daab656c74ced978bb5cb52 SHA512 e585551b2b768c25dbe4b1fd2d9ffc31424da36a4bc1c250989e7de22bd42de36a74f7108091d044f53bc5581c9b9796f2cf1e7d0b9d45f68c487bbf104ac9f3
 AUX webalizer-2.23.08-gcc-10.patch 966 BLAKE2B 35794f4ac05fd05d8f7d66f87b4a2545ff80474cb1f7f11ce2a72aaa1916209788d347c66cb27b8d7dce6c2791657454ccc7f614e2aaace4d27c50271170f91b SHA512 d39fe25b95d0fce4d53bb26361ed23475fc7277935d0babeba5c052ddb4e287d43e50f9f952eb9704e1c4d63c13a6fd02ebe971bdb9874d17677c70b35fc564f
 AUX webalizer-language-list.txt 1520 BLAKE2B 303cffa208d2375c37b3f105a67d22cde6612219ddba20e816fb64ec4eee98b6dcbec0e534402587a108c805b0de3b67ad99d46103dae46f507b319f11ba117f SHA512 52abca2565a8d06d8bf538b8c168b32dbb065e655a4c849d6ff1e1299c4e84d6f9717b7e74ef730a9c68cd63f2d03232ae5c9d1ba391f68e3f1314444e41c29a
 DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e442184010edb0e2fbb7bb9738297c0689acd32e55a1720bdf7bcea3a21cc73aa8ecd0b9d0a8b1a7b336227003dee5abfff9d5288a5250d7 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949
 DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
 DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
-EBUILD webalizer-2.23.08.ebuild 4243 BLAKE2B 599db10a4fc4e500f0b7bc040fc9536bde4a8f2648d8803794dd07d222f66d33c802d3310b6b9d330a165bc9311140029f5240d587bc697618724900083521ca SHA512 297350866364416ed53fde0341cd2aa0a6d7b29a00074b0915612135b56b1f538383f1c6719ebeea7121ea29bd454201167dd8b5809850cf84f56bd0436787d8
+EBUILD webalizer-2.23.08-r1.ebuild 4331 BLAKE2B bf8335a4a4373a4aa499e5b0c2990ead70eff89ea9b52a4ded8e2083b1c2b8ebb352372b922942d2fad4d8b938c57b539ecbd07796bb1d9dc410461768f0d9ab SHA512 f0de18a656932d97fd3fd1e6bca6fe215b1e8aee1be4488b9e4ea7c01e181070d0db474f94619201af4fed5b56e821b6fa82e754bf78eebc150005f4df961d23
 MISC metadata.xml 435 BLAKE2B 7d2414d90bb013bac730ec1cf3e34f665ad6d061ffd1865d9292bf4d0e72acebb0483e20fab7f7d92ffb7b694bce3f5822a1be0e170f363e3c2428e2dc9bd6f7 SHA512 1e28b48cebf35afb2dfdf99192dcde92a6b9dc772b71f554221472217fe7292e5d7f73580ac91683af4cbf5d8bb026c1f9e7c9456548cd3e8028bf624eb579e5
diff --git a/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch b/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch
new file mode 100644
index 000000000000..109740a33ccb
--- /dev/null
+++ b/app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch
@@ -0,0 +1,16 @@
+--- a/configure
++++ b/configure
+@@ -3939,13 +3939,6 @@
+ 
+ 
+ if test "$GCC" = "yes"; then
+-
+-  # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval=$enable_static; LDFLAGS="--static ${LDFLAGS}"
+-fi
+-
+-
+   if test "$IN_CFLAGS" = ""; then
+     CFLAGS="-Wall -O2"
+   fi
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild
index dfa19a5d9eeb..4599eb628b61 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
 
-EAPI="5"
+EAPI=8
 
-inherit versionator epatch webapp db-use
+inherit flag-o-matic webapp db-use
 
 WEBAPP_MANUAL_SLOT="yes"
 XTENDED_VER="RB30"
 XTENDED_URL="rb30"
 
-MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_PV="$(ver_cut 1-2)-$(ver_cut 3)"
 MY_P="${PN}-${MY_PV}"
 
 GEODB_DATE="20140201"
@@ -21,17 +21,20 @@ GEODB_DIR="/usr/share/webalizer/geodb"
 
 DESCRIPTION="Webserver log file analyzer"
 HOMEPAGE="http://www.webalizer.org/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+SRC_URI="
+	ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
 	https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz
 	${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bzip2 xtended geoip nls"
-SLOT="0"
 
-DEPEND=">=sys-libs/db-4.2:*
+DEPEND="
+	>=sys-libs/db-4.2:*
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2:0=
 	>=media-libs/gd-1.8.3[png]
@@ -39,8 +42,6 @@ DEPEND=">=sys-libs/db-4.2:*
 	bzip2? ( app-arch/bzip2 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${MY_P}
-
 pkg_setup() {
 	webapp_pkg_setup
 
@@ -53,10 +54,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.23.08-gcc-10.patch
+	eapply "${FILESDIR}"/${PN}-2.23.08-broken-disable-static.patch
+	eapply "${FILESDIR}"/${PN}-2.23.08-gcc-10.patch
 	if use xtended; then
-		epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
+		eapply "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
 	fi
+
+	eapply_user
 }
 
 src_configure() {
@@ -71,6 +75,9 @@ src_configure() {
 		local myconf="${myconf} --with-language=english"
 	fi
 
+	# bug #779016 and bug #737694
+	append-flags -fcommon
+
 	econf --enable-dns \
 		--with-db=$(db_includedir) \
 		--with-dblib=$(db_libname) \