gentoo auto-resync : 03:03:2024 - 23:42:57

5 files changed, 11 insertions, 40 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3a416cdd84d9..781e2f6f962f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/httpstat/Manifest b/net-misc/httpstat/Manifest
index a03c09d2a85e..47ecd946e9e5 100644
--- a/net-misc/httpstat/Manifest
+++ b/net-misc/httpstat/Manifest
@@ -1,6 +1,4 @@
-AUX httpstat-1.2.1-gentoo-tests.patch 840 BLAKE2B 478fc8c29c816be383def1d2f2194fe7d0fb888487c45afeba9b3a7808bbc01cbf1c836ee14b5f57115e19a1f63537736d137e19b3e1eac9b8af65f3519d5142 SHA512 6e904552c42e8d5cc9f6b298902601cb7ce1304ba2c85f0910f508ac09e5257562e7ed94fb0462512f02caff2a83fa2bb6ec35045a720e25c4f91e976cd1c99b
+AUX httpstat-1.2.1-gentoo-tests.patch 839 BLAKE2B 4877b22ecd27ab24bfbc2c3b4ecba6db31e2daf07c087cd555607c4c7e7193748639ca18a1bdf93218ec8f7b1e6e64318352a92578fa2c5ecb8cd1d7c8a6adb5 SHA512 e6c58bf77c85a06ad71a5f82faa7bc3eb69861ce6c6d933dc8a8db086556a47f7a8683fd7074d259d8cf642cfefed032c4707502b0efb59ebc543ffdeaedec7a
 DIST httpstat-1.3.1.gh.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
-DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
-EBUILD httpstat-1.3.1-r1.ebuild 692 BLAKE2B b7a446a13fe39c2e8aea2cba3e9ac502cf4a7ea200aba6d1d502be8ecec889da5a61cda3ca3a990bed33f49c1b35fb41eb81c3b1ed032733e59fd49f6d2191e7 SHA512 14d9fe06ce0e773b5b64a5ab8136e41a322b9fb1e33df752d0d98b63ac8e1dba58d232a6f8c074dd394e7cade3f47e00867eda1402959c2b66161038d095d4e8
-EBUILD httpstat-1.3.1.ebuild 650 BLAKE2B 3544466383b4f602a0dcc269b2912733529dcb093cbeac44d031767ec1c0e434d720f6166e011b59c48b62b1c59ccb88d928d66082921b4bf6727a98b66fbd50 SHA512 d523477dfabcca81c68eeefd51673c72a6c7bf3c97ee70c0cf5ecfdf5988636693cfc0c548e97e4efeb1652f7f67b07ca224f5affea58450011d70cfb152430c
+EBUILD httpstat-1.3.1-r1.ebuild 724 BLAKE2B 33b073d77eda3d34c844f178e45b6b765649d72546bcfdbd9e02905d82cb0587996b33e03ff52fc639a2e9af90bd193666fb3120991292ff7349b61a836f5ec1 SHA512 1d6f4be384414f6cd8e7551cc2c8db9b7f033ab3abb0c932919f7441ab05c8d02ed2aab537fe71abfab11ce59d18d8e36ee50be1250d364ed7a025634be9a6d1
 MISC metadata.xml 379 BLAKE2B 2bf8e348f9314b52a7229deeee8552e1a60e7942b078548f4ad5cc6b80ac6736f9e4564b617ca76788f948615074c409cd23603e73644b60b91b197aefeffaca SHA512 d1f896253bd8562247f3799f32f28d7408faff5d6e598ebc34e4b781691b2a5b2c61e3eabc3e01f0ad55d80660ce0501e8a95d3795f27d14d70de9f727ab5295
diff --git a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
index 0fcb6523e6e1..37985a3241a0 100644
--- a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
+++ b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
@@ -8,24 +8,24 @@
 @@ -19,8 +19,7 @@ function title() {
  http_url="google.com"
  https_url="https://http2.akamai.com"
- 
+
 -for pybin in python python3; do
 -#for pybin in python; do
-+for pybin in python; do
++for pybin in ${EPYTHON}; do
      echo
      echo "# Test in $pybin"
- 
+
 @@ -40,9 +39,9 @@ for pybin in python python3; do
      main_silent $https_url
      assert_exit 0
- 
+
 -    title "comma decimal language (ru_RU)"
 -    LC_ALL=ru_RU main_silent $http_url
 -    assert_exit 0
 +    #title "comma decimal language (ru_RU)"
 +    #LC_ALL=ru_RU main_silent $http_url
 +    #assert_exit 0
- 
+
      title "HTTPSTAT_DEBUG"
      HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true'
- 
+
diff --git a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
index cdd345b94cba..7c8ead845af8 100644
--- a/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
+++ b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
@@ -24,5 +24,5 @@ PROPERTIES="test_network"
 PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
 
 python_test() {
-	./httpstat_test.sh || die
+	./httpstat_test.sh || die "Tests failed with ${EPYTHON}"
 }
diff --git a/net-misc/httpstat/httpstat-1.3.1.ebuild b/net-misc/httpstat/httpstat-1.3.1.ebuild
deleted file mode 100644
index 381ef2db3345..000000000000
--- a/net-misc/httpstat/httpstat-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
-HOMEPAGE="https://github.com/reorx/httpstat"
-SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="net-misc/curl:*"
-
-# Requires access to google.com and http2.akamai.com
-RESTRICT="test"
-PROPERTIES="test_network"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
-
-python_test() {
-	./httpstat_test.sh || die
-}