[gentoo-commits] repo/gentoo:master commit in: dev-python/pkgconfig/, dev-python/pkgconfig/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pkgconfig/, dev-python/pkgconfig/files/

[David Seifert]

commit:     22e842e727e7ca3827b79f22eb7b8bed5bc59eae
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 08:22:56 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 08:22:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e842e7

dev-python/pkgconfig: Fix brittle test sorting order

Closes: https://bugs.gentoo.org/799290
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch    | 14 ++++++++++++++
 dev-python/pkgconfig/pkgconfig-1.5.4.ebuild                |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
new file mode 100644
index 00000000000..05ba21f22ac
--- /dev/null
+++ b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
@@ -0,0 +1,14 @@
+--- a/test_pkgconfig.py
++++ b/test_pkgconfig.py
+@@ -138,9 +138,9 @@
+ def test_configure_extension():
+     ext = Extension('foo', ['foo.c'])
+     pkgconfig.configure_extension(ext, 'fake-gtk+-3.0 fake-python')
+-    assert ext.extra_compile_args == [
++    assert sorted(ext.extra_compile_args) == [
+          '-DGSEAL_ENABLE', '-I/usr/include/gtk-3.0','-I/usr/include/python2.7']
+-    assert ext.extra_link_args == [
++    assert sorted(ext.extra_link_args) == [
+         '-L/usr/lib_gtk_foo', '-L/usr/lib_python_foo', '-lgtk-3', '-lpython2.7']
+ 
+ 

diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
index 086dfe2434c..d4c0fd9d2b3 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
@@ -18,3 +18,5 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="virtual/pkgconfig"
 
 distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${P}-brittle-tests.patch )

[gentoo-commits] repo/gentoo:master commit in: dev-python/pkgconfig/, dev-python/pkgconfig/files/

[Michał Górny]

commit:     c1d6624600ae4a26b1f2ddd8790861e868796670
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 08:17:14 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 08:17:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d66246

dev-python/pkgconfig: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pkgconfig/Manifest                      |  1 -
 .../files/pkgconfig-1.5.4-brittle-tests.patch      | 14 --------------
 dev-python/pkgconfig/pkgconfig-1.5.4.ebuild        | 22 ----------------------
 3 files changed, 37 deletions(-)

diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 5388f729925..9d325e81da5 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,2 +1 @@
-DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
 DIST pkgconfig-1.5.5.tar.gz 7331 BLAKE2B ef93a712198c1da5a38aec59f52d325b3d7cb25deef799bb006ba1f1d16b673b21d8c837475839e659f62eea9571a50476e38d3c8f95551fb5512a61a155334d SHA512 dfdd0a6ba0d9f37b6d504dc9bea8b19b18a3431ae54bb5fe061911bd1c6a20452f30ea66f67acc6c13c06123247036de7442bba3a7b0eb1af4ebb62d84df64f5

diff --git a/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
deleted file mode 100644
index 05ba21f22ac..00000000000
--- a/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/test_pkgconfig.py
-+++ b/test_pkgconfig.py
-@@ -138,9 +138,9 @@
- def test_configure_extension():
-     ext = Extension('foo', ['foo.c'])
-     pkgconfig.configure_extension(ext, 'fake-gtk+-3.0 fake-python')
--    assert ext.extra_compile_args == [
-+    assert sorted(ext.extra_compile_args) == [
-          '-DGSEAL_ENABLE', '-I/usr/include/gtk-3.0','-I/usr/include/python2.7']
--    assert ext.extra_link_args == [
-+    assert sorted(ext.extra_link_args) == [
-         '-L/usr/lib_gtk_foo', '-L/usr/lib_python_foo', '-lgtk-3', '-lpython2.7']
- 
- 

diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
deleted file mode 100644
index 6a2f42edda3..00000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${P}-brittle-tests.patch )