[gentoo-commits] repo/proj/guru:dev commit in: dev-util/afdko/files/

[Anna Vyalkova]

commit:     d5bc6cde142a561f07e78d95287389f000a3940c
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Feb 28 23:39:42 2023 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Feb 28 23:39:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d5bc6cde

dev-util/afdko: clean up patches

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 dev-util/afdko/files/afdko-3.6.2-AR-fix.patch      | 22 ------------------
 .../afdko-3.6.2-_get_scripts-to-data_files.patch   | 11 ---------
 .../files/afdko-3.6.2-relax-hard-pinning.patch     | 26 ----------------------
 dev-util/afdko/files/afdko-3.8.1-antlr.patch       | 10 ++++-----
 dev-util/afdko/files/afdko-nowheel.diff            | 26 ----------------------
 5 files changed, 4 insertions(+), 91 deletions(-)

diff --git a/dev-util/afdko/files/afdko-3.6.2-AR-fix.patch b/dev-util/afdko/files/afdko-3.6.2-AR-fix.patch
deleted file mode 100644
index a42f9ca96..000000000
--- a/dev-util/afdko/files/afdko-3.6.2-AR-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/c/public/lib/config/linux/gcc/gcc.mak
-+++ b/c/public/lib/config/linux/gcc/gcc.mak
-@@ -27,7 +27,7 @@
- 
- $(LIB_TARGET): $(LIB_OBJS)
- 	mkdir -p $(LIB_DIR)
--	$(AR) -rvs $@ $?
-+	$(AR) rvs $@ $?
- 
- clean:
- 	if [ "$(LIB_OBJS)" ]; then \
---- a/c/public/lib/config/linux/gcc/gcc_tx.mak
-+++ b/c/public/lib/config/linux/gcc/gcc_tx.mak
-@@ -30,7 +30,7 @@
- 
- $(LIB_TARGET): $(LIB_OBJS)
- 	mkdir -p $(LIB_DIR)
--	$(AR) -rvs $@ $?
-+	$(AR) rvs $@ $?
- 
- clean:
- 	if [ "$(LIB_OBJS)" ]; then \

diff --git a/dev-util/afdko/files/afdko-3.6.2-_get_scripts-to-data_files.patch b/dev-util/afdko/files/afdko-3.6.2-_get_scripts-to-data_files.patch
deleted file mode 100644
index cff40e488..000000000
--- a/dev-util/afdko/files/afdko-3.6.2-_get_scripts-to-data_files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -234,7 +234,7 @@
-               'pytest',
-           ],
-           install_requires=_get_requirements(),
--          scripts=_get_scripts(),
-+          data_files=[("bin",_get_scripts())],
-           entry_points={
-               'console_scripts': _get_console_scripts(),
-           },

diff --git a/dev-util/afdko/files/afdko-3.6.2-relax-hard-pinning.patch b/dev-util/afdko/files/afdko-3.6.2-relax-hard-pinning.patch
deleted file mode 100644
index 4939f1a40..000000000
--- a/dev-util/afdko/files/afdko-3.6.2-relax-hard-pinning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,13 +1,13 @@
- # 'lxml' is not a primary requirement of afdko but it's listed here because
- # we want to have control over the version and guarantee that the XML output
- # of our tools is stable
--# NOTE: hard-pinning (==) here gets relaxed to >= in setup.py
--lxml==4.6.2
--booleanOperations==0.9.0
--defcon[pens,lxml]==0.7.2
--fontMath==0.6.0
--fontTools[woff,ufo,lxml,unicode]==4.21.1
--psautohint==2.3.0
--tqdm==4.58.0
--ufonormalizer==0.5.3
--ufoProcessor==1.9.0
-+# NOTE: hard-pinning (>=) here gets relaxed to >= in setup.py
-+lxml>=4.6.2
-+booleanOperations>=0.9.0
-+defcon[pens,lxml]>=0.7.2
-+fontMath>=0.6.0
-+fontTools[woff,ufo,lxml,unicode]>=4.21.1
-+psautohint>=2.3.0
-+tqdm>=4.58.0
-+ufonormalizer>=0.5.3
-+ufoProcessor>=1.9.0

diff --git a/dev-util/afdko/files/afdko-3.8.1-antlr.patch b/dev-util/afdko/files/afdko-3.8.1-antlr.patch
index 3db0bc93e..be7b25d9e 100644
--- a/dev-util/afdko/files/afdko-3.8.1-antlr.patch
+++ b/dev-util/afdko/files/afdko-3.8.1-antlr.patch
@@ -1,6 +1,5 @@
-diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt afdko-3.8.1/c/makeotf/lib/hotconv/CMakeLists.txt
---- a/c/makeotf/lib/hotconv/CMakeLists.txt	2022-04-16 18:04:34.060438876 +0200
-+++ b/c/makeotf/lib/hotconv/CMakeLists.txt	2022-04-16 18:11:51.280732567 +0200
+--- a/c/makeotf/lib/hotconv/CMakeLists.txt
++++ b/c/makeotf/lib/hotconv/CMakeLists.txt
 @@ -68,8 +68,8 @@
  )
  
@@ -12,9 +11,8 @@ diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt af
  
  if ( CMAKE_COMPILER_IS_GNUCC )
      target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
-diff '--color=auto' -ru afdko-3.8.1-orig/CMakeLists.txt afdko-3.8.1/CMakeLists.txt
---- a/CMakeLists.txt	2022-04-16 18:04:34.055438815 +0200
-+++ b/CMakeLists.txt	2022-04-16 18:05:14.656930402 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -27,23 +27,6 @@
  
  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

diff --git a/dev-util/afdko/files/afdko-nowheel.diff b/dev-util/afdko/files/afdko-nowheel.diff
deleted file mode 100644
index 14baff83c..000000000
--- a/dev-util/afdko/files/afdko-nowheel.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,6 @@ try:
- except ImportError:
-     print("afdko: setup.py requires that the Python package 'wheel' be "
-           "installed. Try the command 'pip install wheel'.")
--    sys.exit(1)
- 
- 
- class InstallPlatlib(setuptools.command.install.install):
-@@ -246,7 +245,6 @@ def main():
-           zip_safe=False,
-           python_requires='>=2.7',
-           setup_requires=[
--              'wheel',
-               'setuptools_scm',
-           ],
-           tests_require=[
-@@ -260,7 +258,6 @@ def main():
-           cmdclass={
-               'build_py': CustomBuild,
-               'build_scripts': CustomBuildScripts,
--              'bdist_wheel': CustomBDistWheel,
-               'install': InstallPlatlib,
-           },
-           )